Changeset 986da97 in sasview for sansguiframe/src/sans/guiframe/local_perspectives/data_loader

Timestamp:

Jun 28, 2012 4:53:08 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

83b81b8

Parents:

9c30b8c

Message:

Popup dialog on status event with error

File:

• sansguiframe/src/sans/guiframe/local_perspectives/data_loader/data_loader.py (modified) (4 diffs)

sansguiframe/src/sans/guiframe/local_perspectives/data_loader/data_loader.py

@@ -177 +177 @@
         log_msg = ''
         output = {}
+        any_error = False
         error_message = ""
-        info = "info"
         for p_file in path:
+            info = "info"
             basename  = os.path.basename(p_file)
             root, extension = os.path.splitext(basename)
             if extension.lower() in EXTENSIONS:
+                any_error = True
                 log_msg = "Data Loader cannot "
                 log_msg += "load: %s\n" % str(p_file)
@@ -203 +205 @@
                 self.load_update(output=output, message=message, info=info)
             except:
-                 error = "Error while loading Data: %s\n" % str(p_file)
-                 error += str(sys.exc_value) + "\n"
-                 error_message = "The data file you selected could not be loaded.\n"
-                 error_message += "Make sure the content of your file"
-                 error_message += " is properly formatted.\n\n"
-                 error_message += "When contacting the DANSE team, mention the"
-                 error_message += " following:\n%s" % str(error)
-                 info = "error"
-                 self.load_update(output=output, message=error_message, 
+                any_error = True
+                if error_message == "":
+                     error = "Error: " + str(sys.exc_value) + "\n"
+                     error += "while loading Data: \n%s\n" % str(p_file)
+                     error_message = "The data file you selected could not be loaded.\n"
+                     error_message += "Make sure the content of your file"
+                     error_message += " is properly formatted.\n\n"
+                     error_message += "When contacting the DANSE team, mention the"
+                     error_message += " following:\n%s" % str(error)
+                else:
+                     error_message += "%s\n"% str(p_file)
+                info = "error"
+                self.load_update(output=output, message=error_message, 
                                   info=info)
                 
         message = "Loading Data Complete! "
         message += log_msg
-        if error_message!= "":
+        if error_message != "":
             info = 'error'
         self.load_complete(output=output, error_message=error_message,
@@ -226 +232 @@
         """
         if message != "":
-            wx.PostEvent(self.parent, StatusEvent(status=message, info=info, 
+            wx.PostEvent(self.parent, StatusEvent(status=message, info='info', 
                                                   type="progress"))
     def load_complete(self, output, message="", error_message="", path=None, 
@@ -236 +242 @@
                                               info=info,
                                               type="stop"))
-        if error_message != "":
-            self.load_error(error_message)
+        #if error_message != "":
+        #    self.load_error(error_message)
         self.parent.add_data(data_list=output)