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

Timestamp:

Aug 9, 2017 9:52:07 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:

38eb433

Parents:

985ad94

Message:

Initial setup for batch fitting. SASVIEW-615

File:

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

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

@@ -48 +48 @@
 DEFAULT_POLYDISP_FUNCTION = 'gaussian'
 
-USING_TWISTED = True
+USING_TWISTED = False
 
 class FittingWidget(QtGui.QWidget, Ui_FittingWidgetUI):
@@ -65 +65 @@
 
         # Main Data[12]D holder
-        self.logic = FittingLogic(data=data)
+        self.logic = FittingLogic()
 
         # Globals
@@ -117 +117 @@
     def data(self, value):
         """ data setter """
-        assert isinstance(value, QtGui.QStandardItem)
+        if isinstance(value, list):
+            self.is_batch_fitting = True
+        else:
+            value = [value]
+
+        assert isinstance(value[0], QtGui.QStandardItem)
         # _index contains the QIndex with data
-        self._index = value
+        self._index = value[0]
+
+        # Keep reference to all datasets for batch
+        self.all_data = value
 
         # Update logics with data items
-        self.logic.data = GuiUtils.dataFromItem(value)
+        self.logic.data = GuiUtils.dataFromItem(value[0])
 
         # Overwrite data type descriptor
@@ -140 +148 @@
         # Data[12]D passed and set
         self.data_is_loaded = False
+        # Batch/single fitting
+        self.is_batch_fitting = False
         # Current SasModel in view
         self.kernel_module = None
@@ -294 +304 @@
         self.chk2DView.setVisible(False)
         self.chkMagnetism.setEnabled(self.is2D)
+        # Combo box or label for file name"
+        if self.is_batch_fitting:
+            self.lblFilename.setVisible(False)
+            for dataitem in self.all_data:
+                filename = GuiUtils.dataFromItem(dataitem).filename
+                self.cbFileNames.addItem(filename)
+            self.cbFileNames.setVisible(True)
         # Similarly on other tabs
         self.options_widget.setEnablementOnDataLoad()
@@ -344 +361 @@
         Set initial control enablement
         """
+        self.cbFileNames.setVisible(False)
         self.cmdFit.setEnabled(False)
         self.cmdPlot.setEnabled(False)
@@ -370 +388 @@
         self.cbCategory.currentIndexChanged.connect(self.onSelectCategory)
         self.cbModel.currentIndexChanged.connect(self.onSelectModel)
+        self.cbFileNames.currentIndexChanged.connect(self.onSelectBatchFilename)
         # Checkboxes
         self.chk2DView.toggled.connect(self.toggle2D)
@@ -423 +442 @@
 
         self.respondToModelStructure(model=model, structure_factor=None)
+
+    def onSelectBatchFilename(self, data_index):
+        """
+        Update the logic based on the selected file in batch fitting
+        """
+        self._index = self.all_data[data_index]
+        self.logic.data = GuiUtils.dataFromItem(self.all_data[data_index])
+        self.updateQRange()
 
     def onSelectStructureFactor(self):
@@ -613 +640 @@
         Perform fitting on the current data
         """
-        fitter = Fit()
 
         # Data going in
@@ -650 +676 @@
 
         # Parameterize the fitter
-        fitter.set_model(model, fit_id, params_to_fit, data=data,
-                         constraints=constraints)
-
-        fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin,
-                        qmax=qmax)
-        fitter.select_problem_for_fit(id=fit_id, value=1)
-
-        fitter.fitter_id = page_id
+        fitters = []
+        for fit_index in self.all_data:
+            fitter = Fit()
+            data = GuiUtils.dataFromItem(fit_index)
+            fitter.set_model(model, fit_id, params_to_fit, data=data,
+                             constraints=constraints)
+            qmin, qmax, _ = self.logic.computeRangeFromData(data)
+            fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin,
+                            qmax=qmax)
+            fitter.select_problem_for_fit(id=fit_id, value=1)
+            fitter.fitter_id = page_id
+            fit_id += 1
+            fitters.append(fitter)
 
         # Create the fitting thread, based on the fitter
+        completefn = self.batchFitComplete if self.is_batch_fitting else self.fitComplete
+
         calc_fit = FitThread(handler=handler,
-                             fn=[fitter],
-                             batch_inputs=batch_inputs,
-                             batch_outputs=batch_outputs,
-                             page_id=list_page_id,
-                             updatefn=updater,
-                             completefn=self.fitComplete)
+                                fn=fitters,
+                                batch_inputs=batch_inputs,
+                                batch_outputs=batch_outputs,
+                                page_id=list_page_id,
+                                updatefn=updater,
+                                completefn=completefn)
 
         if USING_TWISTED:
@@ -696 +729 @@
         pass
 
-    def fitComplete(self, result):
-        """
-        Receive and display fitting results
-        "result" is a tuple of actual result list and the fit time in seconds
+    def batchFitComplete(self, result):
+        """
+        Receive and display batch fitting results
         """
         #re-enable the Fit button
@@ -705 +737 @@
         self.cmdFit.setEnabled(True)
 
+        print ("BATCH FITTING FINISHED")
+        # Add the Qt version of wx.aui.AuiNotebook and populate it
+        pass
+
+    def fitComplete(self, result):
+        """
+        Receive and display fitting results
+        "result" is a tuple of actual result list and the fit time in seconds
+        """
+        #re-enable the Fit button
+        self.cmdFit.setText("Fit")
+        self.cmdFit.setEnabled(True)
+
         assert result is not None
 
-        res_list = result[0]
+        res_list = result[0][0]
         res = res_list[0]
         if res.fitness is None or \