Changeset 9400de6 in sasview

Timestamp:

Oct 13, 2011 2:03:12 PM (13 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:

7360816

Parents:

61523e2

Message:

added error msg and tips

File:

• sansguiframe/src/sans/guiframe/data_processor.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -729 +729 @@
         grid = self.notebook.GetPage(pos)
         title = self.notebook.GetPageText(pos)
-    
+        if len(grid.selected_cells) == 0:
+            msg = "Highlight a Data or Chi2 column first..."
+            wx.PostEvent(self.parent.parent, 
+                             StatusEvent(status=msg, info="error")) 
+            return
         for cell in grid.selected_cells:
             row, col = cell
@@ -736 +740 @@
             if label in grid.data:
                 values = grid.data[label]
-                value = values[row -1]
+                if row < len(values):
+                    value = values[row -1]
+                else:
+                    msg = "Invalid cell was chosen." 
+                    #raise ValueError, msg
+                    wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
+                                                                info="error"))
+                    continue
                 if issubclass(value.__class__, BatchCell):
                     if value.object is None or len(value.object) == 0:
@@ -807 +818 @@
         try:
             if sentence.strip() == "":
-                msg = "select value for x axis and y axis"
+                msg = "Select column values for x axis and y axis"
                 raise ValueError, msg
         except: