Changes in src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py [e20870bc:b764ae5] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py
re20870bc rb764ae5 79 79 self.weightingGroup.buttonClicked.connect(self.onWeightingChoice) 80 80 81 self.qmin = QMIN_DEFAULT 82 self.qmax = QMAX_DEFAULT 83 self.npts = NPTS_DEFAULT 84 if self.logic.data_is_loaded: 85 self.qmin, self.qmax, self.npts = self.logic.computeDataRange() 81 86 self.initModel() 82 87 self.initMapper() 83 88 self.model.blockSignals(True) 84 self.updateQRange( QMIN_DEFAULT, QMAX_DEFAULT, NPTS_DEFAULT)85 self.txtMaxRange.setText(str( QMAX_DEFAULT))86 self.txtMinRange.setText(str( QMIN_DEFAULT))87 self.txtNpts.setText(str( NPTS_DEFAULT))88 self.txtNptsFit.setText(str( NPTS_DEFAULT))89 self.updateQRange(self.qmin, self.qmax, self.npts) 90 self.txtMaxRange.setText(str(self.qmax)) 91 self.txtMinRange.setText(str(self.qmin)) 92 self.txtNpts.setText(str(self.npts)) 93 self.txtNptsFit.setText(str(self.npts)) 89 94 self.model.blockSignals(False) 90 95 … … 127 132 Callback for running the mask editor 128 133 """ 129 self.parent.communicate.maskEditorSignal.emit(self.logic.data)130 pass134 if isinstance(self.logic.data, Data2D): 135 self.parent.communicate.maskEditorSignal.emit(self.logic.data) 131 136 132 137 def onRangeReset(self): … … 134 139 Callback for resetting qmin/qmax 135 140 """ 136 self.updateQRange( QMIN_DEFAULT, QMAX_DEFAULT, NPTS_DEFAULT)141 self.updateQRange(self.qmin, self.qmax, self.npts) 137 142 138 143 def onWeightingChoice(self, button): … … 157 162 Enable/disable various UI elements based on data loaded 158 163 """ 164 is2Ddata = isinstance(self.logic.data, Data2D) 159 165 self.boxWeighting.setEnabled(True) 160 self.cmdMaskEdit.setEnabled( True)166 self.cmdMaskEdit.setEnabled(is2Ddata) 161 167 # Switch off txtNpts related controls 162 168 self.txtNpts.setEnabled(False) … … 178 184 self.model.item(MODEL.index('MAX_RANGE')).setText(str(q_range_max)) 179 185 self.model.item(MODEL.index('NPTS')).setText(str(npts)) 186 self.qmin, self.qmax, self.npts = q_range_min, q_range_max, npts 180 187 181 188 def state(self):
Note: See TracChangeset
for help on using the changeset viewer.