Changeset e43c012 in sasview for prview/perspectives/pr

Timestamp:

Oct 24, 2008 11:41:56 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

b24bf4e

Parents:

bbc8013

Message:

Notify user when multi-entry data files are loaded

File:

• prview/perspectives/pr/pr.py (modified) (4 diffs)

prview/perspectives/pr/pr.py

@@ -366 +366 @@
             err = dataread.dy
         else:
-            raise RuntimeError, "This tool can only read 1D data"
+            if isinstance(dataread, list) and len(dataread)>0:
+                x = dataread[0].x
+                y = dataread[0].y
+                err = dataread[0].dy
+                msg = "PrView only allows a single data set at a time. "
+                msg += "Only the first data set was loaded." 
+                wx.PostEvent(self.parent, StatusEvent(status=msg))
+            else:
+                raise RuntimeError, "This tool can only read 1D data"
         
         self._current_file_data.x = x
@@ -613 +621 @@
                 err = dataread.dy
             else:
-                wx.PostEvent(self.parent, StatusEvent(status="This tool can only read 1D data"))
-                return
+                if isinstance(dataread, list) and len(dataread)>0:
+                    x = dataread[0].x
+                    y = dataread[0].y
+                    err = dataread[0].dy
+                    msg = "PrView only allows a single data set at a time. "
+                    msg += "Only the first data set was loaded." 
+                    wx.PostEvent(self.parent, StatusEvent(status=msg))
+                else:
+                    wx.PostEvent(self.parent, StatusEvent(status="This tool can only read 1D data"))
+                    return
+            
         except:
             wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
@@ -908 +925 @@
                 err = self._current_file_data.err
             else:
+                # Reset the status bar so that we don't get mixed up
+                # with old messages. 
+                #TODO: refactor this into a proper status handling
+                wx.PostEvent(self.parent, StatusEvent(status=''))
                 x, y, err = self.load(path)
             
@@ -923 +944 @@
                 message = "The loaded file had no error bars, statistical errors are assumed."
                 wx.PostEvent(self.parent, StatusEvent(status=message))
-            else:
-                wx.PostEvent(self.parent, StatusEvent(status=''))
             
             try: