Changes in / [605d944:6da3e3d] in sasview

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

@@ -533 +533 @@
         """
         self.communicate.copyFitParamsSignal.emit("")
+        self._workspace.actionPaste.setEnabled(True)
         pass
 
@@ -960 +961 @@
             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
-
 
 
@@ -2983 +2982 @@
         # first - regular params
         param_list = []
+
+        param_list.append(['model_name', str(self.cbModel.currentText())])
         def gatherParams(row):
             """
@@ -3069 +3070 @@
         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(',')
@@ -3095 +3103 @@
                     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)
@@ -3133 +3153 @@
             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
@@ -3139 +3161 @@
         self.iterateOverModel(updateFittedValues)
         self._model_model.blockSignals(False)
+
 
     def updateFullPolyModel(self, param_dict):
@@ -3183 +3206 @@
             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
@@ -3190 +3214 @@
         self._poly_model.blockSignals(False)
 
-

src/sas/qtgui/Utilities/GuiUtils.py

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