Changeset 712db9e in sasview for src/sas

Timestamp:

Sep 24, 2018 8:17:36 AM (6 years ago)

Author:

rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

ee22241

Parents:

7879745

Message:

Set pointer to the correct set of data in batch fitting.

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (1 diff)
• Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (2 diffs)

src/sas/qtgui/GUITests.py

@@ -211 +211 @@
                 print("\nAll tests successful")
 
-        except KeyError:
+        except KeyError as ex:
             print("Failure : %s "%str(ex))
             print("ERROR: Incorrect suite name: %s " % suite)

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

@@ -549 +549 @@
                       "Data2D": residualsData2D}
 
-    residuals = residuals_dict[method_name](reference_data, data_copy)
+    try:
+        residuals = residuals_dict[method_name](reference_data, data_copy)
+    except ValueError:
+        return None
 
     theory_name = str(current_data.name.split()[0])

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

@@ -2494 +2494 @@
         fitted_data = self.logic.new1DPlot(return_data, self.tab_id)
 
+        # assure the current index is set properly for batch
+        if len(self._logic) > 1:
+            for i, logic in enumerate(self._logic):
+                if logic.data.name in fitted_data.name:
+                    self.data_index = i
+
         residuals = self.calculateResiduals(fitted_data)
         self.model_data = fitted_data
@@ -2558 +2564 @@
 
         self.createNewIndex(weighted_data)
+
         # Calculate difference between return_data and logic.data
-        self.chi2 = FittingUtilities.calculateChi2(weighted_data, self.logic.data)
+        self.chi2 = FittingUtilities.calculateChi2(weighted_data, self.data)
         # Update the control
         chi2_repr = "---" if self.chi2 is None else GuiUtils.formatNumber(self.chi2, high=True)
@@ -2569 +2576 @@
 
         residuals_plot = FittingUtilities.plotResiduals(self.data, weighted_data)
+        if residuals_plot is None:
+            return
         residuals_plot.id = "Residual " + residuals_plot.id
         residuals_plot.plot_role = Data1D.ROLE_RESIDUAL

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -393 +393 @@
 
         # Test tooltips
-        self.assertEqual(len(self.widget._poly_model.header_tooltips), 9)
+        self.assertEqual(len(self.widget._poly_model.header_tooltips), 8)
 
         header_tooltips = ['Select parameter for fitting',
@@ -702 +702 @@
         # Force same data into logic
         self.widget.data = item
+
         category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)
-
-        self.widget.show()
 
         # Test no fitting params