Changes in src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py [b764ae5:e20870bc] in sasview

File:

• src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py

@@ -79 +79 @@
         self.weightingGroup.buttonClicked.connect(self.onWeightingChoice)
 
-        self.qmin = QMIN_DEFAULT
-        self.qmax = QMAX_DEFAULT
-        self.npts = NPTS_DEFAULT
-        if self.logic.data_is_loaded:
-            self.qmin, self.qmax, self.npts = self.logic.computeDataRange()
         self.initModel()
         self.initMapper()
         self.model.blockSignals(True)
-        self.updateQRange(self.qmin, self.qmax, self.npts)
-        self.txtMaxRange.setText(str(self.qmax))
-        self.txtMinRange.setText(str(self.qmin))
-        self.txtNpts.setText(str(self.npts))
-        self.txtNptsFit.setText(str(self.npts))
+        self.updateQRange(QMIN_DEFAULT, QMAX_DEFAULT, NPTS_DEFAULT)
+        self.txtMaxRange.setText(str(QMAX_DEFAULT))
+        self.txtMinRange.setText(str(QMIN_DEFAULT))
+        self.txtNpts.setText(str(NPTS_DEFAULT))
+        self.txtNptsFit.setText(str(NPTS_DEFAULT))
         self.model.blockSignals(False)
 
@@ -132 +127 @@
         Callback for running the mask editor
         """
-        if isinstance(self.logic.data, Data2D):
-            self.parent.communicate.maskEditorSignal.emit(self.logic.data)
+        self.parent.communicate.maskEditorSignal.emit(self.logic.data)
+        pass
 
     def onRangeReset(self):
@@ -139 +134 @@
         Callback for resetting qmin/qmax
         """
-        self.updateQRange(self.qmin, self.qmax, self.npts)
+        self.updateQRange(QMIN_DEFAULT, QMAX_DEFAULT, NPTS_DEFAULT)
 
     def onWeightingChoice(self, button):
@@ -162 +157 @@
         Enable/disable various UI elements based on data loaded
         """
-        is2Ddata = isinstance(self.logic.data, Data2D)
         self.boxWeighting.setEnabled(True)
-        self.cmdMaskEdit.setEnabled(is2Ddata)
+        self.cmdMaskEdit.setEnabled(True)
         # Switch off txtNpts related controls
         self.txtNpts.setEnabled(False)
@@ -184 +178 @@
         self.model.item(MODEL.index('MAX_RANGE')).setText(str(q_range_max))
         self.model.item(MODEL.index('NPTS')).setText(str(npts))
-        self.qmin, self.qmax, self.npts = q_range_min, q_range_max, npts
 
     def state(self):