Changeset c27a111 in sasview

Timestamp:

Oct 14, 2011 1:57:31 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:

1ec979d

Parents:

978feaa

Message:

fixed generating a none row for excel

File:

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

sansguiframe/src/sans/guiframe/data_processor.py

@@ -440 +440 @@
             if label != "":
                 grid_view[label] = []
-                for row in range(1, self.max_row_touse+1):
+                for row in range(1, self.max_row_touse):
                     value = self.GetCellValue(row=row, col=col)
                     if value != "":
@@ -751 +751 @@
                     if value.object is None or len(value.object) == 0:
                         msg = "Row %s , " % str(row)
-                        msg += "Column %s doesn't have a view" % str(label)
+                        msg += "Column %s is NOT " % str(label)
+                        msg += "the results of fits to view..."
                         #raise ValueError, msg
                         wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
@@ -761 +762 @@
                                         plottables.Plottable):
                             msg = "Row %s , " % str(row)
-                            msg += "Column %s doesn't have a view" % str(label)
+                            msg += "Column %s is NOT " % str(label)
+                            msg += "the results of fits to view..."
                             #raise ValueError, msg
                             wx.PostEvent(self.parent.parent, 
@@ -780 +782 @@
                                 if len(grid.selected_cells) != 1:
                                     msg = "2D View: Please select one data set"
-                                    msg += " at a time to view."
+                                    msg += " at a time for View Results."
                                     wx.PostEvent(self.parent.parent, 
                                                  StatusEvent(status=msg,
@@ -795 +797 @@
                                                   group_id=str(group_id),
                                                   title=title))  
+                        msg = "Plotting the View Results  completed!"
+                        wx.PostEvent( self.parent.parent, 
+                                      StatusEvent(status=msg))  
                 else:
                    
                     msg = "Row %s , " % str(row)
-                    msg += "Column %s doesn't have a view" % str(label)
+                    msg += "Column %s is NOT " % str(label)
+                    msg += "the results of fits to view..."
                     #raise ValueError, msg
                     wx.PostEvent(self.parent.parent, 
@@ -866 +872 @@
             wx.PostEvent(self.parent.parent, 
                              NewPlotEvent(plot=new_plot, 
-                        group_id=str(new_plot.group_id), title =title))    
+                        group_id=str(new_plot.group_id), title =title)) 
+            msg = "Plotting completed!"
+            wx.PostEvent( self.parent.parent, 
+                                      StatusEvent(status=msg))   
         except:
              wx.PostEvent(self.parent.parent, 
                              StatusEvent(status=msg, info="error")) 
-        
+
     def layout_grid(self):
         """