Changeset 57be490 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

May 17, 2018 4:50:09 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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:

085e3c9d

Parents:

976978b

git-author:

Piotr Rozyczko <rozyczko@…> (04/13/18 09:34:43)

git-committer:

Piotr Rozyczko <rozyczko@…> (05/17/18 04:50:09)

Message:

Merged ESS_GUI_reporting

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingPerspective.py (modified) (2 diffs)
• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (5 diffs)
• ReportPageLogic.py (added)

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

@@ -37 +37 @@
         self.maxIndex = 0
 
-        # Index of the current tab
-        self.currentTab = 0
+        ## Index of the current tab
+        #self.currentTab = 0
 
         # The default optimizer
@@ -318 +318 @@
 
         pass
+
+    @property
+    def currentTab(self):
+        """
+        Returns the tab widget currently shown
+        """
+        return self.currentWidget()
+

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

@@ -68 +68 @@
     multishell_parameters = getIterParams(parameters)
     multishell_param_name, _ = getMultiplicity(parameters)
+
     if is2D:
         params = [p for p in parameters.kernel_parameters if p.type != 'magnetic']
@@ -443 +444 @@
 
 
+def getStandardParam(model=None):
+    """
+    Returns a list with standard parameters for the current model
+    """
+    param = []
+    num_rows = model.rowCount()
+    if num_rows < 1:
+        return None
+
+    for row in range(num_rows):
+        param_name = model.item(row, 0).text()
+        checkbox_state = model.item(row,0).checkState() == QtCore.Qt.Checked
+        value= model.item(row, 1).text()
+        column_shift = 0
+        if model.columnCount() == 5: # no error column
+            error_state = False
+            error_value = 0.0
+        else:
+            error_state = True
+            error_value = model.item(row, 2).text()
+            column_shift = 1
+        min_state = True
+        max_state = True
+        min_value = model.item(row, 2+column_shift).text()
+        max_value = model.item(row, 3+column_shift).text()
+        unit = ""
+        if model.item(row, 4+column_shift) is not None:
+            unit = model.item(row, 4+column_shift).text()
+
+        param.append([checkbox_state, param_name, value, "",
+                        [error_state, error_value],
+                        [min_state, min_value],
+                        [max_state, max_value], unit])
+
+    return param
+
+def getOrientationParam(kernel_module=None):
+    """
+    Get the dictionary with orientation parameters
+    """
+    param = []
+    if kernel_module is None: 
+        return None
+    for param_name in list(kernel_module.params.keys()):
+        name = param_name
+        value = kernel_module.params[param_name]
+        min_state = True
+        max_state = True
+        error_state = False
+        error_value = 0.0
+        checkbox_state = True #??
+        details = kernel_module.details[param_name] #[unit, mix, max]
+        param.append([checkbox_state, name, value, "",
+                     [error_state, error_value],
+                     [min_state, details[1]],
+                     [max_state, details[2]], details[0]])
+
+    return param

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

@@ -1 +1 @@
 import json
 import os
+import copy
 from collections import defaultdict
 
@@ -21 +22 @@
 
 from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.fit.pagestate import PageState
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -45 +47 @@
 from sas.qtgui.Perspectives.Fitting.Constraint import Constraint
 from sas.qtgui.Perspectives.Fitting.MultiConstraint import MultiConstraint
+from sas.qtgui.Perspectives.Fitting.ReportPageLogic import ReportPageLogic
+
 
 
@@ -506 +510 @@
         # Signals from other widgets
         self.communicate.customModelDirectoryChanged.connect(self.onCustomModelChange)
+        self.communicate.saveAnalysisSignal.connect(self.savePageState)
+        #self.communicate.saveReportSignal.connect(self.saveReport)
 
     def modelName(self):
@@ -2633 +2639 @@
             self.page_stack.pop()
 
+    def getReport(self):
+        """
+        Create and return HTML report with parameters and charts
+        """
+        index = None
+        if self.all_data:
+            index = self.all_data[self.data_index]
+        report_logic = ReportPageLogic(self,
+                                       kernel_module=self.kernel_module,
+                                       data=self.data,
+                                       index=index,
+                                       model=self._model_model)
+
+        return report_logic.reportList()
+
+    def savePageState(self):
+        """
+        Create and serialize local PageState
+        """
+        from sas.sascalc.fit.pagestate import Reader
+        model = self.kernel_module
+
+        # Old style PageState object
+        state = PageState(model=model, data=self.data)
+
+        # Add parameter data to the state
+        self.getCurrentFitState(state)
+
+        # Create the filewriter, aptly named 'Reader'
+        state_reader = Reader(self.loadPageStateCallback)
+        filepath = self.saveAsAnalysisFile()
+        if filepath is None:
+            return
+        state_reader.write(filename=filepath, fitstate=state)
+        pass
+
+    def saveAsAnalysisFile(self):
+        """
+        Show the save as... dialog and return the chosen filepath
+        """
+        default_name = "FitPage"+str(self.tab_id)+".fitv"
+
+        wildcard = "fitv files (*.fitv)"
+        kwargs = {
+            'caption'   : 'Save As',
+            'directory' : default_name,
+            'filter'    : wildcard,
+            'parent'    : None,
+        }
+        # Query user for filename.
+        filename_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+        filename = filename_tuple[0]
+        return filename
+
+    def loadPageStateCallback(self,state=None, datainfo=None, format=None):
+        """
+        This is a callback method called from the CANSAS reader.
+        We need the instance of this reader only for writing out a file,
+        so there's nothing here.
+        Until Load Analysis is implemented, that is.
+        """
+        pass
+
+    def loadPageState(self, pagestate=None):
+        """
+        Load the PageState object and update the current widget
+        """
+        pass
+
+    def getCurrentFitState(self, state=None):
+        """
+        Store current state for fit_page
+        """
+        # save model option
+        #if self.model is not None:
+        #    self.disp_list = self.getDispParamList()
+        #    state.disp_list = copy.deepcopy(self.disp_list)
+        #    #state.model = self.model.clone()
+
+        # Comboboxes
+        state.categorycombobox = self.cbCategory.currentText()
+        state.formfactorcombobox = self.cbModel.currentText()
+        if self.cbStructureFactor.isEnabled():
+            state.structureCombobox = self.cbStructureFactor.currentText()
+        state.tcChi = self.chi2
+
+        state.enable2D = self.is2D
+
+        #state.weights = copy.deepcopy(self.weights)
+        # save data
+        state.data = copy.deepcopy(self.data)
+
+        # save plotting range
+        state.qmin = self.q_range_min
+        state.qmax = self.q_range_max
+        state.npts = self.npts
+
+        #    self.state.enable_disp = self.enable_disp.GetValue()
+        #    self.state.disable_disp = self.disable_disp.GetValue()
+
+        #    self.state.enable_smearer = \
+        #                        copy.deepcopy(self.enable_smearer.GetValue())
+        #    self.state.disable_smearer = \
+        #                        copy.deepcopy(self.disable_smearer.GetValue())
+
+        #self.state.pinhole_smearer = \
+        #                        copy.deepcopy(self.pinhole_smearer.GetValue())
+        #self.state.slit_smearer = copy.deepcopy(self.slit_smearer.GetValue())
+        #self.state.dI_noweight = copy.deepcopy(self.dI_noweight.GetValue())
+        #self.state.dI_didata = copy.deepcopy(self.dI_didata.GetValue())
+        #self.state.dI_sqrdata = copy.deepcopy(self.dI_sqrdata.GetValue())
+        #self.state.dI_idata = copy.deepcopy(self.dI_idata.GetValue())
+
+        p = self.model_parameters
+        # save checkbutton state and txtcrtl values
+        state.parameters = FittingUtilities.getStandardParam()
+        state.orientation_params_disp = FittingUtilities.getOrientationParam()
+
+        #self._copy_parameters_state(self.orientation_params_disp, self.state.orientation_params_disp)
+        #self._copy_parameters_state(self.parameters, self.state.parameters)
+        #self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
+        #self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
+
+