Changeset 339e22b in sasview

Timestamp:

Sep 7, 2018 10:21:37 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:

12db2db6

Parents:

dda8f16

Message:

Mask Edit menu item added to Fitting

Mask edit was previously only available via right clicking data before fit, now available on fitting drop down menu option.

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (3 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

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)
@@ -1059 +1059 @@
         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="EditMask"/>
    </widget>
    <widget class="QMenu" name="menuWindow">
@@ -413 +415 @@
    </property>
   </action>
+    <action name="EditMask">
+   <property name="text">
+    <string>Edit Mask</string>
+   </property>
+  </action>
   <action name="actionCascade">
    <property name="text">

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

@@ -48 +48 @@
 from sas.qtgui.Perspectives.Fitting.ReportPageLogic import ReportPageLogic
 
-
 TAB_MAGNETISM = 4
 TAB_POLY = 3
@@ -188 +187 @@
 
         # Overwrite data type descriptor
+
         self.is2D = True if isinstance(self.logic.data, Data2D) else False
 
@@ -3213 +3213 @@
         self._poly_model.blockSignals(False)
 
+
+

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