Changeset 04972ea in sasview

Timestamp:

Aug 3, 2018 8:31:45 AM (6 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_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

97df8a9

Parents:

8e2cd79 (diff), 46f59ba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Files:

• build_tools/conda_qt5_min_ubuntu.yml (added)
• installers/sasview_qt5_osx.spec (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)
• src/sas/qtgui/MainWindow/GuiManager.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py (modified) (1 diff)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (1 diff)

installers/sasview_qt5_osx.spec

@@ -54 +54 @@
 datas.append(('../src/sas/logger_config.py','.'))
 datas.append(('../src/sas/logging.ini','.'))
+datas.append(('../src/sas/sasview/custom_config.py','sas/sasview'))
+datas.append(('../src/sas/sasview/local_config.py','sas/sasview'))
 
 # pyinstaller gets mightily confused by upper/lower case,

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

@@ -148 +148 @@
         item.append([item1, item2, item4, item5, item6])
     return item
+
+def markParameterDisabled(model, row):
+    """Given the QModel row number, format to show it is not available for fitting"""
+
+    # If an error column is present, there are a total of 6 columns.
+    items = [model.item(row, c) for c in range(6)]
+
+    model.blockSignals(True)
+
+    for item in items:
+        if item is None:
+            continue
+        item.setEditable(False)
+        item.setCheckable(False)
+
+    item = items[0]
+
+    font = QtGui.QFont()
+    font.setItalic(True)
+    item.setFont(font)
+    item.setForeground(QtGui.QBrush(QtGui.QColor(100, 100, 100)))
+    item.setToolTip("This parameter cannot be fitted.")
+
+    model.blockSignals(False)
 
 def addCheckedListToModel(model, param_list):

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

@@ -14 +14 @@
 from PyQt5 import QtWidgets
 
-from sasmodels import product
 from sasmodels import generate
 from sasmodels import modelinfo
 from sasmodels.sasview_model import load_standard_models
+from sasmodels.sasview_model import MultiplicationModel
 from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
 
@@ -1404 +1404 @@
         param_dict = self.paramDictFromResults(res)
 
+        if param_dict is None:
+            return
+
         elapsed = result[1]
         if self.calc_fit._interrupting:
@@ -1645 +1648 @@
             return
 
+        def iterateOverMagnetModel(func):
+            """
+            Take func and throw it inside the magnet model row loop
+            """
+            for row_i in range(self._magnet_model.rowCount()):
+                func(row_i)
+
         def updateFittedValues(row):
             # Utility function for main model update
@@ -1961 +1971 @@
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
+
         structure_kernel = self.models[structure_factor]()
-
-        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info)
+        form_kernel = self.kernel_module
+
+        self.kernel_module = MultiplicationModel(form_kernel, structure_kernel)
 
         new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)
         for row in new_rows:
             self._model_model.appendRow(row)
+            # disable fitting of parameters not listed in self.kernel_module (probably radius_effective)
+            if row[0].text() not in self.kernel_module.params.keys():
+                row_num = self._model_model.rowCount() - 1
+                FittingUtilities.markParameterDisabled(self._model_model, row_num)
+
         # Update the counter used for multishell display
         self._last_model_row = self._model_model.rowCount()

src/sas/qtgui/MainWindow/GuiManager.py

@@ -520 +520 @@
     def actionCopy(self):
         """
-        """
-        print("actionCopy TRIGGERED")
+        Send a signal to the fitting perspective so parameters
+        can be saved to the clipboard
+        """
+        self.communicate.copyFitParamsSignal.emit("")
         pass
 
     def actionPaste(self):
         """
-        """
-        print("actionPaste TRIGGERED")
-        pass
+        Send a signal to the fitting perspective so parameters
+        from the clipboard can be used to modify the fit state
+        """
+        self.communicate.pasteFitParamsSignal.emit()
 
     def actionReport(self):
@@ -555 +558 @@
     def actionExcel(self):
         """
-        """
-        print("actionExcel TRIGGERED")
-        pass
+        Send a signal to the fitting perspective so parameters
+        can be saved to the clipboard
+        """
+        self.communicate.copyFitParamsSignal.emit("Excel")
 
     def actionLatex(self):
         """
-        """
-        print("actionLatex TRIGGERED")
-        pass
+        Send a signal to the fitting perspective so parameters
+        can be saved to the clipboard
+        """
+        self.communicate.copyFitParamsSignal.emit("Latex")
 
     #============ VIEW =================

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

@@ -288 +288 @@
             rect = textRect.topLeft()
             y = rect.y()
-            y += 5.0 # magic value for rendering nice display in the table
+            y += 6.0 # magic value for rendering nice display in the table
             rect.setY(y)
             painter.translate(rect)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -254 +254 @@
     # Mask Editor requested
     maskEditorSignal = QtCore.pyqtSignal(Data2D)
+
+    # Fitting parameter copy to clipboard
+    copyFitParamsSignal = QtCore.pyqtSignal(str)
+
+    # Fitting parameter paste from clipboard
+    pasteFitParamsSignal = QtCore.pyqtSignal()
 
 def updateModelItemWithPlot(item, update_data, name=""):