Changeset 1c86a37 in sasview

Timestamp:

Oct 6, 2011 11:55:30 AM (13 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:

a4964b8e

Parents:

3dcbe99

Message:

update grid according to feedbacks

File:

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

sansguiframe/src/sans/guiframe/data_processor.py

@@ -13 +13 @@
 import wx.aui
 from wx.aui import AuiNotebook as nb
+import wx.lib.sheet as sheet
 from sans.guiframe.panel_base import PanelBase
-import wx.lib.sheet as sheet
-
+from sans.guiframe.utils import format_number
 from sans.guiframe.events import NewPlotEvent 
 from sans.guiframe.events import StatusEvent  
@@ -103 +103 @@
         self.last_selected_row = -1
         self.last_selected_col = -1
-        col_with = 30
-        row_height = 20
+        self.col_width = 30
+        self.row_height = 20
         self.max_row_touse = 0
         self.axis_value = []
@@ -113 +113 @@
         self.plottable_cells = []
         self.plottable_flag = False
-        self.SetColMinimalAcceptableWidth(col_with)
-        self.SetRowMinimalAcceptableHeight(row_height)
+        self.SetColMinimalAcceptableWidth(self.col_width)
+        self.SetRowMinimalAcceptableHeight(self.row_height)
         self.SetNumberRows(self._cols)
         self.SetNumberCols(self._rows)
         self.AutoSize()
+        self.default_col_width = 75
+        if self.GetNumberCols() > 0:
+            self.default_col_width =  self.GetColSize(0)
         self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_left_click)
         self.Bind(wx.grid.EVT_GRID_LABEL_RIGHT_CLICK, self.on_right_click)
         self.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.on_selected_cell)
         self.Bind(wx.grid.EVT_GRID_CMD_CELL_CHANGE, self.on_edit_cell)
-       
+        
+        
     def on_edit_cell(self, event):
         """
@@ -192 +196 @@
             self.axis_label = self.GetCellValue(0, col)
         
-            
-            
-            
-            
-       
-
     def on_right_click(self, event):
         """
@@ -209 +207 @@
         slicerpop = wx.Menu()
         col_label_menu  = wx.Menu()
+        c_name = self.GetCellValue(0, col) 
+        label = "Insert column before %s " % str(c_name)
         slicerpop.AppendSubMenu(col_label_menu , 
-                                 '&Insert Column', 'Insert Column')
+                                 '&%s' % str(label), str(label))
         col_name = [self.GetCellValue(0, c) 
                         for c in range(self.GetNumberCols())]
@@ -361 +361 @@
                     if issubclass(value.__class__, BatchCell):
                         label = value.label
-                    self.SetCellValue(cell_row, cell_col, str(label))
+                    try:
+                        float(label)
+                        label = format_number(label)
+                    except:
+                        label = str(label)
+                    self.SetCellValue(cell_row, cell_col, label)
+                    self.AutoSizeColumn(cell_col, True)
+                    width = self.GetColSize(cell_col)
+                    if width < self.default_col_width:
+                       self.SetColSize(cell_col, self.default_col_width)
+                    
                     cell_row += 1
                 cell_col += 1
                 if cell_row > self.max_row_touse:
                     self.max_row_touse = cell_row
-                    
+        self.ForceRefresh()
+        
     def get_grid_view(self):
         """
@@ -696 +707 @@
                                                  StatusEvent(status=msg,
                                                               info="error")) 
-                                    return
-                                
+                                    return  
                         wx.PostEvent(self.parent.parent, 
                                      NewPlotEvent(plot=new_plot, 
@@ -725 +735 @@
         #evalue x
         sentence = self.x_axis_label.GetValue()
-        if sentence.strip() == "":
-            msg = "select value for x axis"
-            raise ValueError, msg
+        try:
+            if sentence.strip() == "":
+                msg = "select value for x axis and y axis"
+                raise ValueError, msg
+        except:
+             wx.PostEvent(self.parent.parent, 
+                             StatusEvent(status=msg, info="error")) 
+             return
+        
+        
         dict = parse_string(sentence, column_names.keys())
         for tok, (col_name, list) in dict.iteritems():
@@ -762 +779 @@
             title = self.notebook.GetPageText(pos)
             new_plot.name = title
+            new_plot.xtransform = "x"
+            new_plot.ytransform  = "y"  
             wx.PostEvent(self.parent.parent, 
                              NewPlotEvent(plot=new_plot, 
@@ -794 +813 @@
         self.x_axis_unit = wx.TextCtrl(self, -1)
         self.y_axis_unit = wx.TextCtrl(self, -1)
-        self.view_button = wx.Button(self, -1, "View")
+        self.view_button = wx.Button(self, -1, "View Results")
         wx.EVT_BUTTON(self, self.view_button.GetId(), self.on_view)
         self.plot_button = wx.Button(self, -1, "Plot")