Changeset 6fd4e36 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Mar 28, 2017 6:53:29 AM (7 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:

0268aed

Parents:

a9b568c

Message:

Chi2 display + minor refactoring

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (6 diffs)

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

@@ -147 +147 @@
         assert isinstance(value[0], QtGui.QStandardItem)
         # _index contains the QIndex with data
-        self._index = value
+        self._index = value[0]
 
         # Update logics with data items
@@ -314 +314 @@
         self.SASModelToQModel(model)
 
-        if self._index is None:
+        if self.data_is_loaded:
+            self.calculateQGridForModel()
+        else:
             # Create default datasets if no data passed
             self.createDefaultDataset()
-        else:
-            self.calculateQGridForModel()
 
     def onSelectStructureFactor(self):
@@ -503 +503 @@
         # multishell params in self.kernel_module.details[??] = value
 
-
-    def createTheoryIndex(self):
-        """
-        Create a QStandardModelIndex containing default model data
-        """
-        name = self.kernel_module.name
+    def nameForFittedData(self, name):
+        """
+        Generate name for the current fit
+        """
         if self.is2D:
             name += "2d"
         name = "M%i [%s]" % (self.tab_id, name)
-        new_item = GuiUtils.createModelItemWithPlot(QtCore.QVariant(self.data), name=name)
-        # Notify the GUI manager so it can update the theory model in DataExplorer
+        return name
+
+    def createNewIndex(self, fitted_data):
+        """
+        Create a model or theory index with passed Data1D/Data2D
+        """
+        if self.data_is_loaded:
+            self.updateModelIndex(fitted_data)
+        else:
+            self.createTheoryIndex(fitted_data)
+
+    def updateModelIndex(self, fitted_data):
+        """
+        Update a QStandardModelIndex containing model data
+        """
+        name = self.nameForFittedData(self.logic.data.filename)
+        fitted_data.title = name
+        fitted_data.name = name
+        # Make this a line
+        fitted_data.symbol = 'Line'
+        # Notify the GUI manager so it can update the main model in DataExplorer
+        GuiUtils.updateModelItemWithPlot(self._index, QtCore.QVariant(fitted_data), name)
+
+    def createTheoryIndex(self, fitted_data):
+        """
+        Create a QStandardModelIndex containing model data
+        """
+        name = self.nameForFittedData(self.kernel_module.name)
+        fitted_data.title = name
+        fitted_data.name = name
+        fitted_data.filename = name
+        # Notify the GUI manager so it can create the theory model in DataExplorer
+        new_item = GuiUtils.createModelItemWithPlot(QtCore.QVariant(fitted_data), name=name)
         self.communicate.updateTheoryFromPerspectiveSignal.emit(new_item)
 
@@ -520 +549 @@
         Perform fitting on the current data
         """
+        # TODO: everything here
         #self.calculate1DForModel()
         pass
@@ -527 +557 @@
         Plot the current set of data
         """
-        # TODO: reimplement basepage.py/_update_paramv_on_fit
-        if self.data is None or not self.data.is_data:
+        if self.data is None :#or not self.data.is_data:
             self.createDefaultDataset()
         self.calculateQGridForModel()
@@ -607 +636 @@
         Plot the current 1D data
         """
-        self.logic.new1DPlot(return_data)
-        self.createTheoryIndex()
-
-        #output=self._cal_chisqr(data=data,
+        fitted_data = self.logic.new1DPlot(return_data)
+        self.calculateResiduals(self.logic.new1DPlot(return_data))
+
+    def complete2D(self, return_data):
+        """
+        Plot the current 2D data
+        """
+        fitted_data = self.logic.new2DPlot(return_data)
+        self.calculateResiduals(fitted_data)
+
+    def calculateResiduals(self, fitted_data):
+        """
+        Calculate and print Chi2 and display chart of residuals
+        """
+        # Create a new index for holding data
+        self.createNewIndex(fitted_data)
+        # Calculate difference between return_data and logic.data
+        chi2 = FittingUtilities.calculateChi2(fitted_data, self.logic.data)
+        # Update the control
+        self.lblChi2Value.setText(GuiUtils.formatNumber(chi2, high=True))
+
+        # TODO: plot residuals
+        #self._plot_residuals(page_id=page_id, data=current_data,
         #                        fid=fid,
-        #                        weight=weight,
-        #                        page_id=page_id,
-        #                        index=index)
-
-    def complete2D(self, return_data):
-        """
-        Plot the current 2D data
-        """
-        self.logic.new2DPlot(return_data)
-        self.createTheoryIndex()
-
-        #output=self._cal_chisqr(data=data,
-        #                        weight=weight,
-        #                        fid=fid,
-        #                        page_id=page_id,
-        #                        index=index)
-        #    self._plot_residuals(page_id=page_id, data=data, fid=fid,
-        #                            index=index, weight=weight)
+        #                        weight=weight, index=index)
 
     def calcException(self, etype, value, tb):