Changeset 186d678 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Oct 31, 2018 6:08:16 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

48df831

Parents:

b1b71ad (diff), 04e1c80 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_project_save

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -545 +545 @@
         pass
 
-    def sendData(self, event):
+    def sendData(self, event=None):
         """
         Send selected item data to the current perspective and set the relevant notifiers
@@ -1371 +1371 @@
         Mask Editor for 2D plots
         """
+        msg = QtWidgets.QMessageBox()
+        msg.setIcon(QtWidgets.QMessageBox.Information)
+        msg.setText("Error: cannot apply mask.\n"+
+                    "Please select a 2D dataset.")
+        msg.setStandardButtons(QtWidgets.QMessageBox.Ok)
+
         try:
             if data is None or not isinstance(data, Data2D):
+                # if data wasn't passed - try to get it from
+                # the currently selected item
                 index = self.current_view.selectedIndexes()[0]
                 proxy = self.current_view.model()
@@ -1381 +1389 @@
 
             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)
+                # If data is still not right, complain
                 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