Changeset 0eff615 in sasview

Timestamp:

Sep 6, 2018 5:18:50 AM (6 years ago)

Author:

Laura Forster <Awork@…>

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:

6da3e3d

Parents:

c1cfa80

Message:

Paste params edited

When GUI loaded Paste is now disabled until user copies params. Paste also checks if model has changed since last copy, and displays message warning user that not all params may
paste, with option to cancel. Also - focus fixed such that if paste is clicked the params automatically update without having to move mouse to reset the focus.

Files:

• setuptools-3.4.1.zip (added)
• src/sas/qtgui/MainWindow/GuiManager.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (8 diffs)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -531 +531 @@
         """
         self.communicate.copyFitParamsSignal.emit("")
+        self._workspace.actionPaste.setEnabled(True)
         pass
 
@@ -945 +946 @@
             self._workspace.menubar.addAction(self._workspace.menuWindow.menuAction())
             self._workspace.menubar.addAction(self._workspace.menuHelp.menuAction())
+
         elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]):
             self.checkAnalysisOption(self._workspace.actionInvariant)

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

@@ -47 +47 @@
 from sas.qtgui.Perspectives.Fitting.MultiConstraint import MultiConstraint
 from sas.qtgui.Perspectives.Fitting.ReportPageLogic import ReportPageLogic
-
 
 
@@ -2935 +2934 @@
         # first - regular params
         param_list = []
+
+        param_list.append(['model_name', str(self.cbModel.currentText())])
         def gatherParams(row):
             """
@@ -3021 +3022 @@
         if lines[0] != 'sasview_parameter_values':
             return False
-        for line in lines[1:-1]:
+
+        model = lines[1].split(',')
+
+        if model[0] != 'model_name':
+            return False
+
+        context['model_name'] = [model[1]]
+        for line in lines[2:-1]:
             if len(line) != 0:
                 item = line.split(',')
@@ -3047 +3055 @@
                     except IndexError:
                         pass
+
+        if str(self.cbModel.currentText()) != str(context['model_name'][0]):
+            msg = QtWidgets.QMessageBox()
+            msg.setIcon(QtWidgets.QMessageBox.Information)
+            msg.setText("The model in the clipboard is not the same as the currently loaded model. \
+                         Not all parameters saved may paste correctly.")
+            msg.setStandardButtons(QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel)
+            result = msg.exec_()
+            if result == QtWidgets.QMessageBox.Ok:
+                pass
+            else:
+                return
 
         self.updateFullModel(context)
@@ -3085 +3105 @@
             param_repr = GuiUtils.formatNumber(param_dict[param_name][3+ioffset], high=True)
             self._model_model.item(row, 3+ioffset).setText(param_repr)
+            self.setFocus()
+
 
         # block signals temporarily, so we don't end up
@@ -3091 +3113 @@
         self.iterateOverModel(updateFittedValues)
         self._model_model.blockSignals(False)
+
 
     def updateFullPolyModel(self, param_dict):
@@ -3135 +3158 @@
             param_repr = GuiUtils.formatNumber(param_dict[param_name][5+ioffset], high=True)
             self._poly_model.item(row, 5+ioffset).setText(param_repr)
+            self.setFocus()
 
         # block signals temporarily, so we don't end up
@@ -3142 +3166 @@
         self._poly_model.blockSignals(False)
 
-

src/sas/qtgui/Utilities/GuiUtils.py

@@ -260 +260 @@
     # Fitting parameter paste from clipboard
     pasteFitParamsSignal = QtCore.pyqtSignal()
+
     # Notify about new categories/models from category manager
     updateModelCategoriesSignal = QtCore.pyqtSignal()