Changeset 6964d44 in sasview

Timestamp:

May 22, 2017 7:25:30 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

c416a17

Parents:

fd1ae6d1

Message:

Minor fixes in fitpage

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FitPage.py (modified) (1 diff)
• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (7 diffs)
• ModelThread.py (modified) (1 diff)
• UnitTesting/FitPageTest.py (modified) (1 diff, 1 prop)

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

@@ -30 +30 @@
         self.data = None
         self.parameters_to_fit = []
+        self.kernel_module = None
 
         # QModels

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

@@ -275 +275 @@
         residuals.y = y
 
-    #try:
-    #    y = (fn - gn)/en
-    #    residuals.y = -y
-    #except ValueError:
-    #    msg = "ResidualPlot Error: different number of data points in theory"
-    #    print msg
-    #    y = (fn - gn[index][0]) / en
-    #    residuals.y = y
     residuals.x = current_data.x[index][0]
     residuals.dy = numpy.ones(len(residuals.y))
@@ -359 +351 @@
     return residuals
 
-
 def binary_encode(i, digits):
     return [i >> d & 1 for d in xrange(digits)]

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

@@ -819 +819 @@
         weight = FittingUtilities.getWeight(data=data, is2d=self.is2D, flag=self.weighting)
         update_module = data.err_data if self.is2D else data.dy
+        # Overwrite relevant values in data
         update_module = weight
 
@@ -873 +874 @@
         # (Re)-create headers
         FittingUtilities.addHeadersToModel(self._model_model)
+        self.lstParams.header().setFont(self.boldFont)
 
         # Update Q Ranges
@@ -888 +890 @@
 
         # Explicitly add scale and background with default values
+        temp_undo_state = self.undo_supported
+        self.undo_supported = False
         self.addScaleToModel(self._model_model)
         self.addBackgroundToModel(self._model_model)
+        self.undo_supported = temp_undo_state
 
         # Update the QModel
@@ -920 +925 @@
             self.checkboxSelected(item)
             self.cmdFit.setEnabled(self.parameters_to_fit != [] and self.logic.data_is_loaded)
+            # Update state stack
+            self.updateUndo()
             return
 
@@ -1070 +1077 @@
         calc_thread = threads.deferToThread(method.compute)
         calc_thread.addCallback(self.methodCompleteForData())
+        calc_thread.addErrback(self.calculateDataFailed())
+
+    def calculateDataFailed(self):
+        """
+        """
+        print "Calculate Data failed."
 
     def complete1D(self, return_data):
@@ -1093 +1106 @@
         # Create a new index for holding data
         fitted_data.symbol = "Line"
+
+        # Modify fitted_data with weighting
+        self.addWeightingToData(fitted_data)
+
         self.createNewIndex(fitted_data)
         # Calculate difference between return_data and logic.data
@@ -1308 +1325 @@
         fp.chi2 = self.chi2
         fp.parameters_to_fit = self.parameters_to_fit
+        fp.kernel_module = self.kernel_module
 
         # Options tab

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

@@ -229 +229 @@
         elapsed = time.time() - self.starttime
 
-        #self.complete(x=self.data.x[index], y=output[index],
-        #              page_id=self.page_id,
-        #              state=self.state,
-        #              weight=self.weight,
-        #              fid=self.fid,
-        #              toggle_mode_on=self.toggle_mode_on,
-        #              elapsed=elapsed, index=index, model=self.model,
-        #              data=self.data,
-        #              update_chisqr=self.update_chisqr,
-        #              source=self.source)
         return (self.data.x[index], output[index],
                 self.page_id,

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

@@ -30 +30 @@
         self.assertEqual(self.page.filename, "")
         self.assertIsNone(self.page.data)
+        self.assertIsNone(self.page.kernel_module)
         self.assertEqual(self.page.parameters_to_fit, [])