Changeset 7f75a3f in sasview for src/sas/sasgui/guiframe

Timestamp:

Apr 5, 2017 11:08:59 AM (8 years ago)

Author:

krzywon

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

278ddee

Parents:

69400ec

git-author:

Jeff Krzywon <krzywon@…> (04/05/17 11:08:59)

git-committer:

krzywon <krzywon@…> (04/05/17 11:08:59)

Message:

More explicit error messages when file loading fails. see #889

File:

• src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (12 diffs)

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -9 +9 @@
 
 from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.dataloader.loader_exceptions import NoKnownLoaderException
 from sas.sasgui.guiframe.plugin_base import PluginBase
 from sas.sasgui.guiframe.events import StatusEvent
@@ -39 +40 @@
 APPLICATION_WLIST = config.APPLICATION_WLIST
 
+
 class Plugin(PluginBase):
 
@@ -54 +56 @@
         """
         # menu for data files
-        menu_list = []
         data_file_hint = "load one or more data in the application"
         menu_list = [('&Load Data File(s)', data_file_hint, self.load_data)]
         gui_style = self.parent.get_style()
         style = gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
-        style1 = gui_style & GUIFRAME.DATALOADER_ON
         if style == GUIFRAME.MULTIPLE_APPLICATIONS:
             # menu for data from folder
@@ -100 +100 @@
         self.get_data(file_list)
 
-
     def can_load_data(self):
         """
@@ -106 +105 @@
         """
         return True
-
 
     def _load_folder(self, event):
@@ -114 +112 @@
         path = None
         self._default_save_location = self.parent._default_save_location
-        if self._default_save_location == None:
+        if self._default_save_location is None:
             self._default_save_location = os.getcwd()
         dlg = wx.DirDialog(self.parent, "Choose a directory",
@@ -138 +136 @@
         """
         if error is not None or str(error).strip() != "":
-            dial = wx.MessageDialog(self.parent, str(error), 'Error Loading File',
+            dial = wx.MessageDialog(self.parent, str(error),
+                                    'Error Loading File',
                                     wx.OK | wx.ICON_EXCLAMATION)
             dial.ShowModal()
@@ -147 +146 @@
         """
         if os.path.isdir(path):
-            return [os.path.join(os.path.abspath(path), filename) for filename in os.listdir(path)]
+            return [os.path.join(os.path.abspath(path), filename) for filename
+                    in os.listdir(path)]
 
     def _process_data_and_errors(self, item, p_file, output, message):
@@ -220 +220 @@
                 info="info")
 
+            except NoKnownLoaderException as e:
+                logging.error(e.message)
+                self.load_update(output=None, message=e.message, info="warning")
+                self.load_complete(output=None,
+                                   message="Loading data failed!",
+                                   info="warning")
             except:
                 logging.error(sys.exc_value)
 
-                error_message = "The Data file you selected could not be loaded.\n"
-                error_message += "Make sure the content of your file"
+                error_message = "The Data file you selected could not be "
+                error_message += "loaded.\nMake sure the content of your file"
                 error_message += " is properly formatted.\n"
                 error_message += "When contacting the SasView team, mention the"
@@ -230 +236 @@
                 error_message += "Error: " + str(sys.exc_info()[1])
                 file_errors[basename] = [error_message]
-                self.load_update(output=output, message=error_message, info="warning")
+                self.load_update(output=output, message=error_message,
+                                 info="warning")
 
         if len(file_errors) > 0:
@@ -243 +250 @@
 
         self.load_complete(output=output, message="Loading data complete!",
-            info="info")
+                           info="info")
 
     def load_update(self, output=None, message="", info="warning"):
@@ -252 +259 @@
             wx.PostEvent(self.parent, StatusEvent(status=message, info=info,
                                                   type="progress"))
-    def load_complete(self, output, message="", error_message="", path=None,
-                      info="warning"):
-        """
-         post message to  status bar and return list of data
-        """
-        wx.PostEvent(self.parent, StatusEvent(status=message,
-                                              info=info,
+
+    def load_complete(self, output, message="", info="warning"):
+        """
+         post message to status bar and return list of data
+        """
+        wx.PostEvent(self.parent, StatusEvent(status=message, info=info,
                                               type="stop"))
-        # if error_message != "":
-        #    self.load_error(error_message)
         self.parent.add_data(data_list=output)