Changeset d79bb7e in sasview for src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

Timestamp:

Apr 26, 2018 2:43:31 PM (6 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:

6bd0d81

Parents:

0662f53

Message:

Penultimate group of working unit tests for qtgui P(r)

File:

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

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

@@ -89 +89 @@
         self.dataDeleted = False
 
-        self.enableButtons()
-
         self.model = QtGui.QStandardItemModel(self)
         self.mapper = QtWidgets.QDataWidgetMapper(self)
@@ -175 +173 @@
         self.explorerButton.clicked.connect(self.openExplorerWindow)
 
-        self.backgroundInput.editingFinished.connect(
+        self.backgroundInput.textChanged.connect(
             lambda: self.set_background(self.backgroundInput.text()))
-        self.minQInput.editingFinished.connect(
+        self.minQInput.textChanged.connect(
             lambda: self._calculator.set_qmin(is_float(self.minQInput.text())))
-        self.regularizationConstantInput.editingFinished.connect(
+        self.regularizationConstantInput.textChanged.connect(
             lambda: self._calculator.set_alpha(is_float(self.regularizationConstantInput.text())))
-        self.maxDistanceInput.editingFinished.connect(
+        self.maxDistanceInput.textChanged.connect(
             lambda: self._calculator.set_dmax(is_float(self.maxDistanceInput.text())))
-        self.maxQInput.editingFinished.connect(
+        self.maxQInput.textChanged.connect(
             lambda: self._calculator.set_qmax(is_float(self.maxQInput.text())))
-        self.slitHeightInput.editingFinished.connect(
+        self.slitHeightInput.textChanged.connect(
             lambda: self._calculator.set_slit_height(is_float(self.slitHeightInput.text())))
-        self.slitWidthInput.editingFinished.connect(
-            lambda: self._calculator.set_slit_width(is_float(self.slitHeightInput.text())))
+        self.slitWidthInput.textChanged.connect(
+            lambda: self._calculator.set_slit_width(is_float(self.slitWidthInput.text())))
 
         self.model.itemChanged.connect(self.model_changed)
@@ -245 +243 @@
         Update boxes with initial values
         """
-        blank_item = QtGui.QStandardItem("")
+        bgd_item = QtGui.QStandardItem(str(BACKGROUND_INPUT))
+        self.model.setItem(WIDGETS.W_BACKGROUND_INPUT, bgd_item)
+        blank_item = QtGui.QStandardItem("")
+        self.model.setItem(WIDGETS.W_QMIN, blank_item)
+        blank_item = QtGui.QStandardItem("")
+        self.model.setItem(WIDGETS.W_QMAX, blank_item)
+        blank_item = QtGui.QStandardItem("")
+        self.model.setItem(WIDGETS.W_SLIT_WIDTH, blank_item)
+        blank_item = QtGui.QStandardItem("")
+        self.model.setItem(WIDGETS.W_SLIT_HEIGHT, blank_item)
         no_terms_item = QtGui.QStandardItem(str(NUMBER_OF_TERMS))
+        self.model.setItem(WIDGETS.W_NO_TERMS, no_terms_item)
+        reg_item = QtGui.QStandardItem(str(REGULARIZATION))
+        self.model.setItem(WIDGETS.W_REGULARIZATION, reg_item)
+        max_dist_item = QtGui.QStandardItem(str(MAX_DIST))
+        self.model.setItem(WIDGETS.W_MAX_DIST, max_dist_item)
+        blank_item = QtGui.QStandardItem("")
+        self.model.setItem(WIDGETS.W_RG, blank_item)
+        blank_item = QtGui.QStandardItem("")
+        self.model.setItem(WIDGETS.W_I_ZERO, blank_item)
         bgd_item = QtGui.QStandardItem(str(BACKGROUND_INPUT))
-        reg_item = QtGui.QStandardItem(str(REGULARIZATION))
-        max_dist_item = QtGui.QStandardItem(str(MAX_DIST))
-        self.model.setItem(WIDGETS.W_BACKGROUND_INPUT, bgd_item)
-        self.model.setItem(WIDGETS.W_QMIN, blank_item)
-        self.model.setItem(WIDGETS.W_QMAX, blank_item)
-        self.model.setItem(WIDGETS.W_SLIT_WIDTH, blank_item)
-        self.model.setItem(WIDGETS.W_SLIT_HEIGHT, blank_item)
-        self.model.setItem(WIDGETS.W_NO_TERMS, no_terms_item)
-        self.model.setItem(WIDGETS.W_REGULARIZATION, reg_item)
-        self.model.setItem(WIDGETS.W_MAX_DIST, max_dist_item)
-        self.model.setItem(WIDGETS.W_RG, blank_item)
-        self.model.setItem(WIDGETS.W_I_ZERO, blank_item)
         self.model.setItem(WIDGETS.W_BACKGROUND_OUTPUT, bgd_item)
+        blank_item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_COMP_TIME, blank_item)
+        blank_item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_CHI_SQUARED, blank_item)
+        blank_item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_OSCILLATION, blank_item)
+        blank_item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_POS_FRACTION, blank_item)
+        blank_item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_SIGMA_POS_FRACTION, blank_item)
 
@@ -296 +305 @@
         self.explorerButton.setEnabled(self.logic.data_is_loaded)
         self.regConstantSuggestionButton.setEnabled(
+            self.logic.data_is_loaded and
             self._calculator.suggested_alpha != self._calculator.alpha)
         self.noOfTermsSuggestionButton.setEnabled(
+            self.logic.data_is_loaded and
             self._calculator.nfunc != self.nTermsSuggested)
 
@@ -522 +533 @@
         """Remove the existing data reference from the P(r) Persepective"""
         self.dataDeleted = True
+        self.batchResults = {}
         if not data_list:
             data_list = [self._data]
@@ -555 +567 @@
 
     def startThreadAll(self):
+        self.isBatch = True
+        self.batchComplete = []
         self.calculateAllButton.setText("Calculating...")
-        self.batchComplete = []
-        self.isBatch = True
+        self.enableButtons()
+        self.batchResultsWindow = BatchInversionOutputPanel(
+            parent=self, output_data=self.batchResults)
         self.performEstimate()
 
@@ -571 +586 @@
         else:
             # If no data sets left, end batch calculation
+            self.batchComplete = []
             self.calculateAllButton.setText("Calculate All")
             self.showBatchOutput()