Changeset c8536d6c in sasview for src/sas/qtgui

Timestamp:

Sep 8, 2018 9:32:23 AM (6 years ago)

Author:

GitHub <noreply@…>

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:

35e36fd, c0de493

Parents:

3090270 (diff), 01b4877 (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.

git-author:

Torin Cooper-Bennun <40573959+tcbennun@…> (09/08/18 09:32:23)

git-committer:

GitHub <noreply@…> (09/08/18 09:32:23)

Message:

Merge pull request #174 from SasView?/ESS_GUI_iss1034

SASVIEW-1034: Support for parameters injected into the product model by sasmodels

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingUtilities.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)
• MainWindow/DataExplorer.py (modified) (8 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
• Perspectives/Fitting/UI/OptionsWidgetUI.ui (modified) (2 diffs)
• Perspectives/Fitting/UnitTesting/FittingLogicTest.py (modified) (2 diffs)
• Perspectives/Fitting/UnitTesting/FittingOptionsTest.py (modified) (1 diff)
• Plotting/Plotter.py (modified) (3 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

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

@@ -167 +167 @@
     return rows
 
-def addSimpleParametersToModel(parameters, is2D, parameters_original=None, model=None, view=None):
+def addSimpleParametersToModel(parameters, is2D, parameters_original=None, model=None, view=None, row_num=None):
     """
     Update local ModelModel with sasmodel parameters (non-dispersed, non-magnetic)
@@ -216 +216 @@
         # Append to the model and use the combobox, if required
         if None not in (model, view):
-            model.appendRow(row)
+            if row_num is None:
+                model.appendRow(row)
+            else:
+                model.insertRow(row_num, row)
+                row_num += 1
+
             if cbox:
                 view.setIndexWidget(item2.index(), cbox)
+
         rows.append(row)
 

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

@@ -2102 +2102 @@
             return
 
+        product_params = None
+
         if self.kernel_module is None:
             # Structure factor is the only selected model; build it and show all its params
@@ -2107 +2109 @@
             s_params = self.kernel_module._model_info.parameters
             s_params_orig = s_params
-
         else:
             s_kernel = self.models[structure_factor]()
@@ -2124 +2125 @@
             if "radius_effective_mode" in all_param_names:
                 # Show all parameters
+                # In this case, radius_effective is NOT pruned by sasmodels.product
                 s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len])
                 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters)
+                product_params = modelinfo.ParameterTable(
+                        self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:])
             else:
                 # Ensure radius_effective is not displayed
                 s_params_orig = modelinfo.ParameterTable(s_kernel._model_info.parameters.kernel_parameters[1:])
                 if "radius_effective" in all_param_names:
+                    # In this case, radius_effective is NOT pruned by sasmodels.product
                     s_params = modelinfo.ParameterTable(all_params[p_pars_len+1:p_pars_len+s_pars_len])
+                    product_params = modelinfo.ParameterTable(
+                            self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len:])
                 else:
+                    # In this case, radius_effective is pruned by sasmodels.product
                     s_params = modelinfo.ParameterTable(all_params[p_pars_len:p_pars_len+s_pars_len-1])
+                    product_params = modelinfo.ParameterTable(
+                            self.kernel_module._model_info.parameters.kernel_parameters[p_pars_len+s_pars_len-1:])
 
         # Add heading row
@@ -2140 +2150 @@
         # Any renamed parameters are stored as data in the relevant item, for later handling
         FittingUtilities.addSimpleParametersToModel(
-                s_params,
-                self.is2D,
-                s_params_orig,
-                self._model_model,
-                self.lstParams)
+                parameters=s_params,
+                is2D=self.is2D,
+                parameters_original=s_params_orig,
+                model=self._model_model,
+                view=self.lstParams)
+
+        # Insert product-only params into QModel
+        if product_params:
+            prod_rows = FittingUtilities.addSimpleParametersToModel(
+                    parameters=product_params,
+                    is2D=self.is2D,
+                    parameters_original=None,
+                    model=self._model_model,
+                    view=self.lstParams,
+                    row_num=2)
+
+            # Since this all happens after shells are dealt with and we've inserted rows, fix this counter
+            self._n_shells_row += len(prod_rows)
 
     def haveParamsToFit(self):

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -42 +42 @@
         # Main model for keeping loaded data
         self.model = QtGui.QStandardItemModel(self)
-
         # Secondary model for keeping frozen data sets
         self.theory_model = QtGui.QStandardItemModel(self)
@@ -98 +97 @@
         self.communicator.plotUpdateSignal.connect(self.updatePlot)
         self.communicator.maskEditorSignal.connect(self.showEditDataMask)
+        self.communicator.extMaskEditorSignal.connect(self.extShowEditDataMask)
 
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
@@ -598 +598 @@
         plot2D.plot(plot_set)
         self.addPlot(plot2D)
-        self.active_plots[plot2D.data.id] = plot2D
+        self.active_plots[plot2D.data.name] = plot2D
         #============================================
         # Experimental hook for silx charts
@@ -626 +626 @@
                 new_plot.plot(plot_set, transform=transform)
                 # active_plots may contain multiple charts
-                self.active_plots[plot_set.id] = new_plot
+                self.active_plots[plot_set.name] = new_plot
             elif isinstance(plot_set, Data2D):
                 self.addDataPlot2D(plot_set, item)
@@ -697 +697 @@
                 old_plot.plot()
                 # need this for lookup - otherwise this plot will never update
-                self.active_plots[plot_set.id] = old_plot
+                self.active_plots[plot_set.name] = old_plot
 
     def updatePlot(self, data):
@@ -711 +711 @@
 
         ids_keys = list(self.active_plots.keys())
-        ids_vals = [val.data.id for val in self.active_plots.values()]
-
-        data_id = data.id
+        ids_vals = [val.data.name for val in self.active_plots.values()]
+
+        data_id = data.name
         if data_id in ids_keys:
             self.active_plots[data_id].replacePlot(data_id, data)
@@ -952 +952 @@
         model = proxy.sourceModel()
 
-        if index.isValid():
-            model_item = model.itemFromIndex(proxy.mapToSource(index))
-            # Find the mapped index
-            orig_index = model_item.isCheckable()
-            if orig_index:
-                # Check the data to enable/disable actions
-                is_2D = isinstance(GuiUtils.dataFromItem(model_item), Data2D)
-                self.actionQuick3DPlot.setEnabled(is_2D)
-                self.actionEditMask.setEnabled(is_2D)
-                # Fire up the menu
-                self.context_menu.exec_(self.current_view.mapToGlobal(position))
+        if not index.isValid():
+            return
+        model_item = model.itemFromIndex(proxy.mapToSource(index))
+        # Find the mapped index
+        orig_index = model_item.isCheckable()
+        if not orig_index:
+            return
+        # Check the data to enable/disable actions
+        is_2D = isinstance(GuiUtils.dataFromItem(model_item), Data2D)
+        self.actionQuick3DPlot.setEnabled(is_2D)
+        self.actionEditMask.setEnabled(is_2D)
+        # Fire up the menu
+        self.context_menu.exec_(self.current_view.mapToGlobal(position))
 
     def showDataInfo(self):
@@ -1059 +1061 @@
         self.new_plot.show()
 
+    def extShowEditDataMask(self):
+        self.showEditDataMask()
+
     def showEditDataMask(self, data=None):
         """
         Mask Editor for 2D plots
         """
-        if data is None or not isinstance(data, Data2D):
-            index = self.current_view.selectedIndexes()[0]
-            proxy = self.current_view.model()
-            model = proxy.sourceModel()
-            model_item = model.itemFromIndex(proxy.mapToSource(index))
-
-            data = GuiUtils.dataFromItem(model_item)
+        try:
+            if data is None or not isinstance(data, Data2D):
+                index = self.current_view.selectedIndexes()[0]
+                proxy = self.current_view.model()
+                model = proxy.sourceModel()
+                model_item = model.itemFromIndex(proxy.mapToSource(index))
+
+                data = GuiUtils.dataFromItem(model_item)
+
+            if data is None or not isinstance(data, Data2D):
+                msg = QtWidgets.QMessageBox()
+                msg.setIcon(QtWidgets.QMessageBox.Information)
+                msg.setText("Error: cannot apply mask. \
+                                Please select a 2D dataset.")
+                msg.setStandardButtons(QtWidgets.QMessageBox.Cancel)
+                msg.exec_()
+                return
+        except:
+            msg = QtWidgets.QMessageBox()
+            msg.setIcon(QtWidgets.QMessageBox.Information)
+            msg.setText("Error: No dataset selected. \
+                            Please select a 2D dataset.")
+            msg.setStandardButtons(QtWidgets.QMessageBox.Cancel)
+            msg.exec_()
+            return
 
         mask_editor = MaskEditor(self, data)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -422 +422 @@
         self._workspace.actionExcel.triggered.connect(self.actionExcel)
         self._workspace.actionLatex.triggered.connect(self.actionLatex)
-
         # View
         self._workspace.actionShow_Grid_Window.triggered.connect(self.actionShow_Grid_Window)
@@ -452 +451 @@
         self._workspace.actionManage_Custom_Models.triggered.connect(self.actionManage_Custom_Models)
         self._workspace.actionAddMult_Models.triggered.connect(self.actionAddMult_Models)
+        self._workspace.actionEditMask.triggered.connect(self.actionEditMask)
+
         # Window
         self._workspace.actionCascade.triggered.connect(self.actionCascade)
@@ -781 +782 @@
         self.add_mult_editor.show()
 
+    def actionEditMask(self):
+
+        self.communicate.extMaskEditorSignal.emit()
+
     #============ ANALYSIS =================
     def actionFitting(self):

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -113 +113 @@
     <addaction name="actionManage_Custom_Models"/>
     <addaction name="actionAddMult_Models"/>
+    <addaction name="separator"/>
+    <addaction name="actionEditMask"/>
    </widget>
    <widget class="QMenu" name="menuWindow">
@@ -413 +415 @@
    </property>
   </action>
+    <action name="actionEditMask">
+   <property name="text">
+    <string>Edit Mask</string>
+   </property>
+  </action>
   <action name="actionCascade">
    <property name="text">

src/sas/qtgui/Perspectives/Fitting/UI/OptionsWidgetUI.ui

@@ -32 +32 @@
         <item row="0" column="1">
          <widget class="QLineEdit" name="txtMinRange">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Minimum value of Q.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -54 +60 @@
         <item row="1" column="1">
          <widget class="QLineEdit" name="txtMaxRange">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum value of Q.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -99 +99 @@
         data.name = "boop"
         data.id = "poop"
-        return_data = (data.x,data.y, 7, None, None,
-                       0, True, 0.0, 1, data,
-                       data, False, None,
-                       None, None, None,
-                       None, None)
+        # Condensed return data (new1DPlot only uses these fields)
+        return_data = dict(x = data.x,
+                           y = data.y,
+                           model = data,
+                           data = data)
+        # return_data = (data.x,data.y, 7, None, None,
+        #                0, True, 0.0, 1, data,
+        #                data, False, None,
+        #                None, None, None,
+        #                None, None)
 
         new_plot = self.logic.new1DPlot(return_data=return_data, tab_id=0)
@@ -139 +144 @@
         qmin, qmax, npts = self.logic.computeDataRange()
 
-        return_data = (x_0, data, 7, data, None,
-                        True, 0.0, 1, 0, qmin, qmax,
-                        0.1, False, None)
+        # Condensed return data (new2DPlot only uses these fields)
+        return_data = dict(image = x_0,
+                           data = data,
+                           page_id = 7,
+                           model = data)
+        # return_data = (x_0, data, 7, data, None,
+        #                 True, 0.0, 1, 0, qmin, qmax,
+        #                 0.1, False, None)
 
         new_plot = self.logic.new2DPlot(return_data=return_data)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingOptionsTest.py

@@ -38 +38 @@
         # The combo box
         self.assertIsInstance(self.widget.cbAlgorithm, QtWidgets.QComboBox)
-        self.assertEqual(self.widget.cbAlgorithm.count(), 5)
+        self.assertEqual(self.widget.cbAlgorithm.count(), 6)
         self.assertEqual(self.widget.cbAlgorithm.itemText(0), 'Nelder-Mead Simplex')
         self.assertEqual(self.widget.cbAlgorithm.itemText(4), 'Levenberg-Marquardt')

src/sas/qtgui/Plotting/Plotter.py

@@ -182 +182 @@
 
         # Update the list of data sets (plots) in chart
-        self.plot_dict[self._data.id] = self.data
-
-        self.plot_lines[self._data.id] = line
+        self.plot_dict[self._data.name] = self.data
+
+        self.plot_lines[self._data.name] = line
 
         # Now add the legend with some customizations.
@@ -201 +201 @@
         # refresh canvas
         self.canvas.draw()
-        # This is an important processEvent.
-        # This allows charts to be properly updated in order
-        # of plots being applied.
-        QtWidgets.QApplication.processEvents()
 
     def createContextMenu(self):
@@ -420 +416 @@
         This effectlvely refreshes the chart with changes to one of its plots
         """
-        import logging
         self.removePlot(id)
         self.plot(data=new_plot)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -265 +265 @@
     # Mask Editor requested
     maskEditorSignal = QtCore.pyqtSignal(Data2D)
+
+    #second Mask Editor for external
+    extMaskEditorSignal = QtCore.pyqtSignal()
 
     # Fitting parameter copy to clipboard