Changes in src/sas/qtgui/MainWindow/DataExplorer.py [9ce69ec:6ae7466] in sasview

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -385 +385 @@
         # Which perspective has been selected?
         if len(selected_items) > 1 and not self._perspective().allowBatch():
-            msg = self._perspective().title() + " does not allow multiple data."
+            if hasattr(self._perspective(), 'title'):
+                title = self._perspective().title()
+            else:
+                title = self._perspective().windowTitle()
+            msg = title + " does not allow multiple data."
             msgbox = QtWidgets.QMessageBox()
             msgbox.setIcon(QtWidgets.QMessageBox.Critical)
@@ -394 +398 @@
 
         # Notify the GuiManager about the send request
-        self._perspective().setData(data_item=selected_items, is_batch=self.chkBatch.isChecked())
+        try:
+            self._perspective().setData(data_item=selected_items, is_batch=self.chkBatch.isChecked())
+        except Exception as ex:
+            msg = "%s perspective returned the following message: \n%s\n" %(self._perspective().name, str(ex))
+            logging.error(msg)
+            msg = str(ex)
+            msgbox = QtWidgets.QMessageBox()
+            msgbox.setIcon(QtWidgets.QMessageBox.Critical)
+            msgbox.setText(msg)
+            msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok)
+            retval = msgbox.exec_()
+
 
     def freezeCheckedData(self):
@@ -579 +594 @@
             # Don't plot intermediate results, e.g. P(Q), S(Q)
             match = GuiUtils.theory_plot_ID_pattern.match(plot.id)
-            # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
+            # 2nd match group contains the identifier for the intermediate
+            # result, if present (e.g. "[P(Q)]")
             if match and match.groups()[1] != None:
                 continue
-            # Don't include plots from different fitpages, but always include the original data
-            if fitpage_name in plot.name or filename in plot.name or filename == plot.filename:
+            # Don't include plots from different fitpages,
+            # but always include the original data
+            if (fitpage_name in plot.name
+                    or filename in plot.name
+                    or filename == plot.filename):
                 # Residuals get their own plot
                 if plot.plot_role == Data1D.ROLE_RESIDUAL: