Changeset a6f60e3 in sasview


Ignore:
Timestamp:
Aug 9, 2018 8:59:24 AM (12 days ago)
Author:
tcbennun
Branches:
ESS_GUI_beta_approx
Children:
e3d481a
Parents:
cc0556d
Message:

Revert "mixture type combobox (SASVIEW-973, trac ##1153)"

We don't want a sum of form and structure factors, that isn't useful. We
want to be able to add form factors easily.

This reverts commit cc0556db98032238320e42f468ba8700ed567fc4.

Location:
src/sas/qtgui/Perspectives/Fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    rcc0556d ra6f60e3  
    484484        self.updateQRange() 
    485485        # Structure factor options 
    486         self.cbMixtureType.addItems(["product", "sum"]) 
    487         self.cbMixtureType.setCurrentIndex(0) 
    488         self.cbMixtureType.setEnabled(False) 
    489486        self.cbCalculationMode.setEnabled(False) 
    490487 
     
    498495        self.cbModel.currentIndexChanged.connect(self.onSelectModel) 
    499496        self.cbFileNames.currentIndexChanged.connect(self.onSelectBatchFilename) 
    500         self.cbMixtureType.currentIndexChanged[str].connect(self.onSelectMixtureType) 
    501497        self.cbCalculationMode.currentIndexChanged.connect(self.onSelectCalculationMode) 
    502498        # Checkboxes 
     
    993989        # Reset structure factor 
    994990        self.cbStructureFactor.setCurrentIndex(0) 
    995         self.cbMixtureType.setEnabled(False) 
    996991 
    997992        # Reset parameters to fit 
     
    10191014            model = None 
    10201015        self.respondToModelStructure(model=model, structure_factor=structure) 
    1021         self.cbMixtureType.setEnabled(True) 
    1022  
    1023     def onSelectMixtureType(self, text): 
    1024         """Mixture type (product/sum) was selected on model tab.""" 
    1025         if text != "product": 
    1026             logger.warning("Mixture type '{}' is not implemented here! Reverting.".format(text)) 
    1027             self.cbMixtureType.setCurrentIndex(0) 
    10281016 
    10291017    def onSelectCalculationMode(self): 
  • src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

    rcc0556d ra6f60e3  
    88    <y>0</y> 
    99    <width>521</width> 
    10     <height>611</height> 
     10    <height>603</height> 
    1111   </rect> 
    1212  </property> 
     
    347347         <layout class="QVBoxLayout" name="verticalLayout_2"> 
    348348          <item> 
    349            <widget class="QLabel" name="label_4"> 
    350             <property name="text"> 
    351              <string>Mixture type</string> 
    352             </property> 
    353            </widget> 
    354           </item> 
    355           <item> 
    356            <widget class="QComboBox" name="cbMixtureType"/> 
    357           </item> 
    358           <item> 
    359349           <widget class="QLabel" name="label_3"> 
    360350            <property name="text"> 
     
    375365            </property> 
    376366           </widget> 
     367          </item> 
     368          <item> 
     369           <spacer name="verticalSpacer"> 
     370            <property name="orientation"> 
     371             <enum>Qt::Vertical</enum> 
     372            </property> 
     373            <property name="sizeType"> 
     374             <enum>QSizePolicy::Fixed</enum> 
     375            </property> 
     376            <property name="sizeHint" stdset="0"> 
     377             <size> 
     378              <width>20</width> 
     379              <height>40</height> 
     380             </size> 
     381            </property> 
     382           </spacer> 
    377383          </item> 
    378384         </layout> 
Note: See TracChangeset for help on using the changeset viewer.