Changes in / [6da3e3d:605d944] in sasview
- Files:
-
- 1 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/MainWindow/GuiManager.py
r0eff615 rfd7ef36 533 533 """ 534 534 self.communicate.copyFitParamsSignal.emit("") 535 self._workspace.actionPaste.setEnabled(True)536 535 pass 537 536 … … 961 960 self._workspace.menubar.addAction(self._workspace.menuWindow.menuAction()) 962 961 self._workspace.menubar.addAction(self._workspace.menuHelp.menuAction()) 963 964 962 elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]): 965 963 self.checkAnalysisOption(self._workspace.actionInvariant) -
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r0eff615 r605d944 47 47 from sas.qtgui.Perspectives.Fitting.MultiConstraint import MultiConstraint 48 48 from sas.qtgui.Perspectives.Fitting.ReportPageLogic import ReportPageLogic 49 49 50 50 51 … … 2982 2983 # first - regular params 2983 2984 param_list = [] 2984 2985 param_list.append(['model_name', str(self.cbModel.currentText())])2986 2985 def gatherParams(row): 2987 2986 """ … … 3070 3069 if lines[0] != 'sasview_parameter_values': 3071 3070 return False 3072 3073 model = lines[1].split(',') 3074 3075 if model[0] != 'model_name': 3076 return False 3077 3078 context['model_name'] = [model[1]] 3079 for line in lines[2:-1]: 3071 for line in lines[1:-1]: 3080 3072 if len(line) != 0: 3081 3073 item = line.split(',') … … 3103 3095 except IndexError: 3104 3096 pass 3105 3106 if str(self.cbModel.currentText()) != str(context['model_name'][0]):3107 msg = QtWidgets.QMessageBox()3108 msg.setIcon(QtWidgets.QMessageBox.Information)3109 msg.setText("The model in the clipboard is not the same as the currently loaded model. \3110 Not all parameters saved may paste correctly.")3111 msg.setStandardButtons(QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel)3112 result = msg.exec_()3113 if result == QtWidgets.QMessageBox.Ok:3114 pass3115 else:3116 return3117 3097 3118 3098 self.updateFullModel(context) … … 3153 3133 param_repr = GuiUtils.formatNumber(param_dict[param_name][3+ioffset], high=True) 3154 3134 self._model_model.item(row, 3+ioffset).setText(param_repr) 3155 self.setFocus()3156 3157 3135 3158 3136 # block signals temporarily, so we don't end up … … 3161 3139 self.iterateOverModel(updateFittedValues) 3162 3140 self._model_model.blockSignals(False) 3163 3164 3141 3165 3142 def updateFullPolyModel(self, param_dict): … … 3206 3183 param_repr = GuiUtils.formatNumber(param_dict[param_name][5+ioffset], high=True) 3207 3184 self._poly_model.item(row, 5+ioffset).setText(param_repr) 3208 self.setFocus()3209 3185 3210 3186 # block signals temporarily, so we don't end up … … 3214 3190 self._poly_model.blockSignals(False) 3215 3191 3192 -
src/sas/qtgui/Utilities/GuiUtils.py
r0eff615 rfd7ef36 271 271 # Fitting parameter paste from clipboard 272 272 pasteFitParamsSignal = QtCore.pyqtSignal() 273 274 273 # Notify about new categories/models from category manager 275 274 updateModelCategoriesSignal = QtCore.pyqtSignal()
Note: See TracChangeset
for help on using the changeset viewer.