Changeset e20870bc in sasview for src/sas/qtgui/MainWindow

Timestamp:

Jun 27, 2018 5:33:52 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

b1a7a81

Parents:

c5e0d84

git-author:

Piotr Rozyczko <rozyczko@…> (05/31/18 07:15:47)

git-committer:

Piotr Rozyczko <rozyczko@…> (06/27/18 05:33:52)

Message:

Masking dialog for fitting

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -91 +91 @@
         self.communicator.activeGraphName.connect(self.updatePlotName)
         self.communicator.plotUpdateSignal.connect(self.updatePlot)
+        self.communicator.maskEditorSignal.connect(self.showEditDataMask)
 
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
@@ -990 +991 @@
         new_plot.show()
 
-    def showEditDataMask(self):
+    def showEditDataMask(self, data=None):
         """
         Mask Editor for 2D plots
         """
-        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):
+            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)
 
         mask_editor = MaskEditor(self, data)