Changeset b685c7b in sasview

Timestamp:

Mar 28, 2018 1:29:47 PM (7 years ago)

Author:

krzywon

Branches:

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

Children:

441a03f

Parents:

ba4e3ba

Message:

More changes to P(r) remove to reset window to base state when no data left.

File:

• src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (6 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -221 +221 @@
         Update boxes with initial values
         """
-        item = QtGui.QStandardItem("")
-        self.model.setItem(WIDGETS.W_FILENAME, item)
         item = QtGui.QStandardItem(str(BACKGROUND_INPUT))
         self.model.setItem(WIDGETS.W_BACKGROUND_INPUT, item)
@@ -282 +280 @@
         self.removeButton.setEnabled(self.logic.data_is_loaded)
         self.explorerButton.setEnabled(self.logic.data_is_loaded)
+        self.regConstantSuggestionButton.setEnabled(
+            self._calculator.suggested_alpha != self._calculator.alpha)
+        self.noOfTermsSuggestionButton.setEnabled(
+            self._calculator.nfunc != self.nTermsSuggested)
 
     def populateDataComboBox(self, filename, data_ref):
@@ -400 +402 @@
             # Estimate initial values from data
             self.performEstimate()
-        self.enableButtons()
         self.updateGuiValues()
 
@@ -460 +461 @@
         self.model.setItem(WIDGETS.W_COMP_TIME,
                            QtGui.QStandardItem("{:.4g}".format(elapsed)))
-        if alpha != 0:
-            self.regConstantSuggestionButton.setText("{:-3.2g}".format(alpha))
-        self.regConstantSuggestionButton.setEnabled(alpha != self._calculator.alpha)
-        if nterms != self.nTermsSuggested:
-            self.noOfTermsSuggestionButton.setText(
-                "{:n}".format(self.nTermsSuggested))
-        self.noOfTermsSuggestionButton.setEnabled(nterms != self.nTermsSuggested)
+        self.regConstantSuggestionButton.setText("{:-3.2g}".format(alpha))
+        self.noOfTermsSuggestionButton.setText(
+            "{:n}".format(self.nTermsSuggested))
         self.model.setItem(WIDGETS.W_COMP_TIME,
                            QtGui.QStandardItem("{:.2g}".format(elapsed)))
@@ -488 +485 @@
                                        "{:.3g}".format(
                                            pr.get_pos_err(out, cov))))
+        self.enableButtons()
 
     def removeData(self):
         """Remove the existing data reference from the P(r) Persepective"""
         if self.dmaxWindow is not None:
+            self.dmaxWindow.done()
             self.dmaxWindow = None
         self.dataList.removeItem(self.dataList.currentIndex())
@@ -498 +497 @@
         if len(self._data_list) == 0:
             self._data = None
+            self._data_set = None
             self.pr_plot = None
-            self._data_set = None
+            self.data_plot = None
             self._calculator = Invertor()
-            self.logic.data = None
+            self.logic.data = self._data_set
+            self.nTermsSuggested = NUMBER_OF_TERMS
+            self.noOfTermsSuggestionButton.setText("{:n}".format(
+                self.nTermsSuggested))
+            self.regConstantSuggestionButton.setText("{:-3.2g}".format(
+                REGULARIZATION))
             self.enableButtons()
+            self.setupModel()
         else:
             self.dataList.setCurrentIndex(0)