Changeset 57be490 in sasview

Timestamp:

May 17, 2018 2: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 07:34:43)

git-committer:

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

Message:

Merged ESS_GUI_reporting

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)
• Perspectives/Fitting/FittingUtilities.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (5 diffs)
• Perspectives/Fitting/ReportPageLogic.py (added)
• Utilities/GuiUtils.py (modified) (4 diffs)
• Utilities/ReportDialog.py (added)
• Utilities/UI/ReportDialogUI.ui (added)
• Utilities/UnitTesting/GuiUtilsTest.py (modified) (2 diffs)
• Utilities/UnitTesting/ReportDialogTest.py (added)

src/sas/qtgui/GUITests.py

@@ -49 +49 @@
 from Utilities.UnitTesting import TabbedModelEditorTest
 from Utilities.UnitTesting import AddMultEditorTest
+from Utilities.UnitTesting import ReportDialogTest
 
 # Unit Testing
@@ -109 +110 @@
         unittest.makeSuite(TabbedModelEditorTest.TabbedModelEditorTest,'test'),
         unittest.makeSuite(AddMultEditorTest.AddMultEditorTest, 'test'),
+        unittest.makeSuite(ReportDialogTest.ReportDialogTest,     'test'),
 
         # Calculators

src/sas/qtgui/MainWindow/GuiManager.py

@@ -23 +23 @@
 from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
 
+from sas.qtgui.Utilities.ReportDialog import ReportDialog
 from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements
 from sas.qtgui.MainWindow.AboutBox import AboutBox
@@ -488 +489 @@
     def actionSave_Analysis(self):
         """
-        """
-        print("actionSave_Analysis TRIGGERED")
-
-        pass
+        Menu File/Save Analysis
+        """
+        self.communicate.saveAnalysisSignal.emit()
 
     def actionQuit(self):
@@ -526 +526 @@
     def actionReport(self):
         """
-        """
-        print("actionReport TRIGGERED")
-        pass
+        Show the Fit Report dialog.
+        """
+        report_list = None
+        if getattr(self._current_perspective, "currentTab"):
+            try:
+                report_list = self._current_perspective.currentTab.getReport()
+            except Exception as ex:
+                logging.error("Report generation failed with: " + str(ex))
+
+        if report_list is not None:
+            self.report_dialog = ReportDialog(parent=self, report_list=report_list)
+            self.report_dialog.show()
 
     def actionReset(self):

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)
+
+

src/sas/qtgui/Utilities/GuiUtils.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 """
 Global defaults and various utility functions usable by the general GUI
@@ -248 +249 @@
     sendDataToGridSignal = QtCore.pyqtSignal(list)
 
+    # Action Save Analysis triggered
+    saveAnalysisSignal = QtCore.pyqtSignal()
 
 def updateModelItemWithPlot(item, update_data, name=""):
@@ -378 +381 @@
                  if str(i.text()) == filename])
     return item[0] if len(item)>0 else None
+
+def plotsFromModel(model_name, model_item):
+    """
+    Returns the list of plots for the item with model name in the model
+    """
+    assert isinstance(model_item, QtGui.QStandardItem)
+    assert isinstance(model_name, str)
+
+    plot_data = []
+    # Iterate over model looking for named items
+    for index in range(model_item.rowCount()):
+        item = model_item.child(index)
+        if isinstance(item.data(), (Data1D, Data2D)):
+            plot_data.append(item.data())
+        if model_name in str(item.text()):
+            #plot_data.append(item.child(0).data())
+            # Going 1 level deeper only
+            for index_2 in range(item.rowCount()):
+                item_2 = item.child(index_2)
+                if item_2 and isinstance(item_2.data(), (Data1D, Data2D)):
+                    plot_data.append(item_2.data())
+
+    return plot_data
 
 def plotsFromFilename(filename, model_item):
@@ -841 +867 @@
     return output.lstrip().rstrip()
 
+def replaceHTMLwithUTF8(html):
+    """
+    Replace some important HTML-encoded characters
+    with their UTF-8 equivalents
+    """
+    # Angstrom
+    html_out = html.replace("Å", "Ã
+")
+    # infinity
+    html_out = html_out.replace("∞", "∞")
+    # +/-
+    html_out = html_out.replace("±", "±")
+
+    return html_out
+
+def replaceHTMLwithASCII(html):
+    """
+    Replace some important HTML-encoded characters
+    with their ASCII equivalents
+    """
+    # Angstrom
+    html_out = html.replace("Å", "Ang")
+    # infinity
+    html_out = html_out.replace("∞", "inf")
+    # +/-
+    html_out = html_out.replace("±", "+/-")
+
+    return html_out
+
+def convertUnitToUTF8(unit):
+    """
+    Convert ASCII unit display into UTF-8 symbol
+    """
+    if unit == "1/A":
+        return "Ã
+<sup>-1</sup>"
+    elif unit == "1/cm":
+        return "cm<sup>-1</sup>"
+    elif unit == "Ang":
+        return "Ã
+"
+    elif unit == "1e-6/Ang^2":
+        return "10<sup>-6</sup>/Ã
+<sup>2</sup>"
+    elif unit == "inf":
+        return "∞"
+    elif unit == "-inf":
+        return "-∞"
+    else:
+        return unit
+
 def convertUnitToHTML(unit):
     """

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 import sys
 import unittest
@@ -446 +447 @@
         self.assertEqual(yscale, "log")
 
+    def testReplaceHTMLwithUTF8(self):
+        ''' test single character replacement '''
+        s = None
+        with self.assertRaises(AttributeError):
+            result = replaceHTMLwithUTF8(s)
+
+        s = ""
+        self.assertEqual(replaceHTMLwithUTF8(s), s)
+
+        s = "aaaa"
+        self.assertEqual(replaceHTMLwithUTF8(s), s)
+
+        s = "Å ∞      ±"
+        self.assertEqual(replaceHTMLwithUTF8(s), "Ã
+ ∞      ±")
+
+    def testReplaceHTMLwithASCII(self):
+        ''' test single character replacement'''
+        s = None
+        with self.assertRaises(AttributeError):
+            result = replaceHTMLwithASCII(s)
+
+        s = ""
+        self.assertEqual(replaceHTMLwithASCII(s), s)
+
+        s = "aaaa"
+        self.assertEqual(replaceHTMLwithASCII(s), s)
+
+        s = "Å ∞      ±"
+        self.assertEqual(replaceHTMLwithASCII(s), "Ang inf      +/-")
+
+    def testConvertUnitToUTF8(self):
+        ''' test unit string replacement'''
+        s = None
+        self.assertIsNone(convertUnitToUTF8(s))
+
+        s = ""
+        self.assertEqual(convertUnitToUTF8(s), s)
+
+        s = "aaaa"
+        self.assertEqual(convertUnitToUTF8(s), s)
+
+        s = "1/A"
+        self.assertEqual(convertUnitToUTF8(s), "Ã
+<sup>-1</sup>")
+
+        s = "Ang"
+        self.assertEqual(convertUnitToUTF8(s), "Ã
+")
+
+        s = "1e-6/Ang^2"
+        self.assertEqual(convertUnitToUTF8(s), "10<sup>-6</sup>/Ã
+<sup>2</sup>")
+
+        s = "inf"
+        self.assertEqual(convertUnitToUTF8(s), "∞")
+
+        s = "1/cm"
+        self.assertEqual(convertUnitToUTF8(s), "cm<sup>-1</sup>")
+
+    def testConvertUnitToHTML(self):
+        ''' test unit string replacement'''
+        s = None
+        self.assertIsNone(convertUnitToHTML(s))
+
+        s = ""
+        self.assertEqual(convertUnitToHTML(s), s)
+
+        s = "aaaa"
+        self.assertEqual(convertUnitToHTML(s), s)
+
+        s = "1/A"
+        self.assertEqual(convertUnitToHTML(s), "&#x212B;<sup>-1</sup>")
+
+        s = "Ang"
+        self.assertEqual(convertUnitToHTML(s), "&#x212B;")
+
+        s = "1e-6/Ang^2"
+        self.assertEqual(convertUnitToHTML(s), "10<sup>-6</sup>/&#x212B;<sup>2</sup>")
+
+        s = "inf"
+        self.assertEqual(convertUnitToHTML(s), "&#x221e;")
+        s = "-inf"
+
+        self.assertEqual(convertUnitToHTML(s), "-&#x221e;")
+
+        s = "1/cm"
+        self.assertEqual(convertUnitToHTML(s), "cm<sup>-1</sup>")
+
     def testParseName(self):
         '''test parse out a string from the beinning of a string'''