Changeset b764ae5 in sasview for src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py

Timestamp:

Sep 5, 2018 8:53:00 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

444c221c

Parents:

f6c19cf

git-author:

Piotr Rozyczko <rozyczko@…> (09/05/18 08:48:38)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/05/18 08:53:00)

Message:

processEvents() helps with proper chart generation. - SASVIEW-890
Fixed weighing in fitting - SASVIEW-1017
Fixed error bars after fitting - SASVIEW-1004

File:

• src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py (modified) (3 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(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.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.model.blockSignals(False)
 
@@ -134 +139 @@
         Callback for resetting qmin/qmax
         """
-        self.updateQRange(QMIN_DEFAULT, QMAX_DEFAULT, NPTS_DEFAULT)
+        self.updateQRange(self.qmin, self.qmax, self.npts)
 
     def onWeightingChoice(self, button):
@@ -179 +184 @@
         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):