Changeset c151afc in sasview for sansguiframe

Timestamp:

Apr 20, 2012 10:01:17 AM (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:

41a8cb3

Parents:

9ccb7e1

Message:

fixed misleading warning msg icon

Location:

sansguiframe/src/sans/guiframe

Files:

• data_processor.py (modified) (1 diff)
• local_perspectives/data_loader/data_loader.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -263 +263 @@
         
         col = event.GetCol()
+        row = event.GetRow()
         # Ignore the index column
-        if col < 0:
+        if col < 0 or row != -1:
             return
         self.selected_cols = []

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

@@ -178 +178 @@
         output = {}
         error_message = ""
+        info = "info"
         for p_file in path:
             basename  = os.path.basename(p_file)
@@ -200 +201 @@
                     output[data.id] = data
                 message = "Loading Data..." + str(p_file) + "\n"
-                self.load_update(output=output, message=message)
+                self.load_update(output=output, message=message, info=info)
             except:
                  error = "Error while loading Data: %s\n" % str(p_file)
@@ -209 +210 @@
                  error_message += "When contacting the DANSE team, mention the"
                  error_message += " following:\n%s" % str(error)
-                 self.load_update(output=output, message=error_message)
+                 info = "error"
+                 self.load_update(output=output, message=error_message, 
+                                  info=info)
                 
         message = "Loading Data Complete! "
         message += log_msg
+        if error_message!= "":
+            info = 'error'
         self.load_complete(output=output, error_message=error_message,
-                       message=message, path=path)
+                       message=message, path=path, info=info)
             
-    def load_update(self, output=None, message=""):
+    def load_update(self, output=None, message="", info="warning"):
         """
         print update on the status bar
         """
         if message != "":
-            wx.PostEvent(self.parent, StatusEvent(status=message,
-                                                  type="progress",
-                                                   info="warning"))
-    def load_complete(self, output, message="", error_message="", path=None):
+            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="warning",
+        wx.PostEvent(self.parent, StatusEvent(status=message, 
+                                              info=info,
                                               type="stop"))
         if error_message != "":