Changeset 722b7d6 in sasview for src/sas

Timestamp:

Oct 29, 2018 4:34:53 AM (6 years ago)

Author:

piotr

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:

ec4a143

Parents:

75906a1

Message:

Minor changes after PK's CR + minor refactoring.

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (3 diffs)
• MainWindow/GuiManager.py (modified) (1 diff)
• Perspectives/Fitting/ViewDelegate.py (modified) (3 diffs)
• Plotting/Plotter2D.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -364 +364 @@
         pass
 
-    def sendData(self, event):
+    def sendData(self, event=None):
         """
         Send selected item data to the current perspective and set the relevant notifiers
@@ -1171 +1171 @@
         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()
@@ -1181 +1189 @@
 
             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

src/sas/qtgui/MainWindow/GuiManager.py

@@ -10 +10 @@
 from PyQt5.QtGui import *
 from PyQt5.QtCore import Qt, QLocale, QUrl
+
+import matplotlib as mpl
+mpl.use("Qt5Agg")
 
 from twisted.internet import reactor

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

@@ -13 +13 @@
         Overwrite generic constructor to allow for some globals
         """
-        super(QtWidgets.QStyledItemDelegate, self).__init__()
+        super(ModelViewDelegate, self).__init__()
 
         # Main parameter table view columns
@@ -125 +125 @@
         Overwrite generic constructor to allow for some globals
         """
-        super(QtWidgets.QStyledItemDelegate, self).__init__()
+        super(PolyViewDelegate, self).__init__()
 
         self.poly_parameter = 0
@@ -226 +226 @@
         Overwrite generic constructor to allow for some globals
         """
-        super(QtWidgets.QStyledItemDelegate, self).__init__()
+        super(MagnetismViewDelegate, self).__init__()
 
         self.mag_parameter = 0

src/sas/qtgui/Plotting/Plotter2D.py

@@ -9 +9 @@
 
 
-#import sys
-#print("SYS.PATH = ", sys.path)
 import matplotlib as mpl
-mpl.use("Qt5Agg")
 DEFAULT_CMAP = mpl.cm.jet