Changeset 0cd8612 in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Jul 8, 2016 10:13:41 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, 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:

a95260d

Parents:

e540cd2

Message:

output console + logging

File:

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

src/sas/qtgui/DataExplorer.py

@@ -13 +13 @@
 
 # SAS
-from GuiUtils import *
+import GuiUtils
 from Plotter import Plotter
 from sas.sascalc.dataloader.loader import Loader
@@ -307 +307 @@
         """
 
-        plots = plotsFromCheckedItems(self.model)
+        plots = GuiUtils.plotsFromCheckedItems(self.model)
 
         # Call show on requested plots
@@ -334 +334 @@
             paths = [str(f) for f in paths]
 
-        if type(paths) is not list:
+        if not isinstance(paths, list):
             paths = [paths]
 
@@ -358 +358 @@
             basename = os.path.basename(p_file)
             _, extension = os.path.splitext(basename)
-            if extension.lower() in EXTENSIONS:
+            if extension.lower() in GuiUtils.EXTENSIONS:
                 any_error = True
                 log_msg = "Data Loader cannot "
@@ -430 +430 @@
 
         if any_error or error_message:
-            self.communicator.statusBarUpdateSignal.emit(error_message)
+            logging.error(error_message)
+            status_bar_message = "Errors occurred while loading %s" % format(basename)
+            self.communicator.statusBarUpdateSignal.emit(status_bar_message)
 
         else:
             message = "Loading Data Complete! "
         message += log_msg
+        # Notify the progress bar that the updates are over.
         self.communicator.progressBarUpdateSignal.emit(-1)
 
@@ -485 +488 @@
 
                 try:
-                    is1D = type(item.child(0).data().toPyObject()) is Data1D
+                    is1D = isinstance(item.child(0).data().toPyObject(), Data1D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -499 +502 @@
 
                 try:
-                    is1D = type(item.child(0).data().toPyObject()) is Data1D
+                    is1D = isinstance(item.child(0).data().toPyObject(), Data1D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -513 +516 @@
                 item.setCheckState(QtCore.Qt.Unchecked)
                 try:
-                    is2D = type(item.child(0).data().toPyObject()) is Data2D
+                    is2D = isinstance(item.child(0).data().toPyObject(), Data2D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -527 +530 @@
 
                 try:
-                    is2D = type(item.child(0).data().toPyObject()) is Data2D
+                    is2D = isinstance(item.child(0).data().toPyObject(), Data2D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -602 +605 @@
 
         # Add rows for display in the view
-        info_item = infoFromData(data)
+        info_item = GuiUtils.infoFromData(data)
 
         # Set info_item as the only child
@@ -616 +619 @@
         """
         # Assert the correct type
-        if type(model_item) != QtGui.QStandardItem:
+        if not isinstance(model_item, QtGui.QStandardItem):
             msg = "Wrong data type returned from calculations."
             raise AttributeError, msg