Changeset 8cb8c89 in sasview

Timestamp:

May 11, 2011 1:56:49 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

732b03c

Parents:

99f9ecf

Message:

pop error message when error occur on read file

Location:

guiframe

Files:

• data_panel.py (modified) (2 diffs)
• gui_manager.py (modified) (2 diffs)
• local_perspectives/data_loader/data_loader.py (modified) (2 diffs)

guiframe/data_panel.py

@@ -570 +570 @@
         :param error: details error message to be displayed
         """
-        message = "The data file you selected could not be loaded.\n"
-        message += "Make sure the content of your file"
-        message += " is properly formatted.\n\n"
-        
-        if error is not None:
-            message += "When contacting the DANSE team, mention the"
-            message += " following:\n%s" % str(error)
-        dial = wx.MessageDialog(self.parent, message, 'Error Loading File',
+        if error is not None or str(error).strip() != "":
+            dial = wx.MessageDialog(self.parent, str(error), 'Error Loading File',
                                 wx.OK | wx.ICON_EXCLAMATION)
-        dial.ShowModal()  
+            dial.ShowModal()  
         
     def _load_data(self, event):
@@ -643 +637 @@
                 self.load_update(output=output, message=message)
             except:
-                error_message = "Error while loading Data: %s\n" % str(p_file)
-                error_message += str(sys.exc_value) + "\n"
+                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)
                 self.load_update(output=output, message=error_message)
                 

guiframe/gui_manager.py

@@ -1726 +1726 @@
                         new_plot.group_id = self.panel_on_focus.group_id
                     else:
-                        message = "Only 1D Data can be append to plot panel\n"
-                        message += "%s will be plot separetly\n" %str(new_plot.name)
+                        message = "Only 1D Data can be append to"
+                        message += " plot panel containing 1D data.\n"
+                        message += "%s not be appended.\n" %str(new_plot.name)
+                        message += "try new plot option.\n"
                         wx.PostEvent(self, StatusEvent(status=message, 
                                                    info='warning'))
@@ -1733 +1735 @@
                 #if not append then new plot
                 from sans.guiframe.dataFitting import Data2D
-                if (Data2D, new_plot.__class__):
+                if issubclass(Data2D, new_plot.__class__):
                     #for 2 D always plot in a separated new plot
                     new_plot.group_id = wx.NewId()

guiframe/local_perspectives/data_loader/data_loader.py

@@ -158 +158 @@
         :param error: details error message to be displayed
         """
-        message = "The data file you selected could not be loaded.\n"
-        message += "Make sure the content of your file"
-        message += " is properly formatted.\n\n"
-        
-        if error is not None:
-            message += "When contacting the DANSE team, mention the"
-            message += " following:\n%s" % str(error)
-        dial = wx.MessageDialog(self.parent, message, 'Error Loading File',
+        if error is not None or str(error).strip() != "":
+            dial = wx.MessageDialog(self.parent, str(error), 'Error Loading File',
                                 wx.OK | wx.ICON_EXCLAMATION)
-        dial.ShowModal()  
+            dial.ShowModal()  
         
     def get_file_path(self, path):
@@ -208 +202 @@
                 self.load_update(output=output, message=message)
             except:
-                error_message = "Error while loading Data: %s\n" % str(p_file)
-                error_message += str(sys.exc_value) + "\n"
-                self.load_update(output=output, message=error_message)
+                 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)
+                 self.load_update(output=output, message=error_message)
                 
         message = "Loading Data Complete! "