Changeset f4b37d1 in sasview

Timestamp:

Sep 23, 2011 1:03:54 PM (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:

e6c6b67

Parents:

a582d28

Message:

working on dataprocessor

File:

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

sansguiframe/src/sans/guiframe/data_processor.py

@@ -62 +62 @@
     return col_dict
 
+          
+          
+class SPanel(ScrolledPanel):
+    def __init__(self, parent, *args, **kwds):
+        ScrolledPanel.__init__(self, parent , *args, **kwds)
+        self.SetupScrolling()  
+        
 class GridPage(sheet.CSheet):
     """
@@ -69 +76 @@
         """
         sheet.CSheet.__init__(self, parent)
-        self.SetLabelBackgroundColour('#DBD4D4')
-        self.AutoSize()
+        
+        self.AdjustScrollbars()
+        #self.SetLabelBackgroundColour('#DBD4D4')
+        self.parent = parent
         self.panel = panel
         self.col_names = []
@@ -89 +98 @@
         self.SetNumberRows(self._cols)
         self.SetNumberCols(self._rows)
+        self.AutoSize()
         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)
@@ -286 +296 @@
                 if cell_row > self.max_row_touse:
                     self.max_row_touse = cell_row
-            self.AutoSize()
-           
+       
 
 class Notebook(nb, PanelBase):
@@ -301 +310 @@
         """
         nb.__init__(self, parent, -1,
-                    style= wx.aui.AUI_BUTTON_DOWN|
-                    wx.aui.AUI_NB_WINDOWLIST_BUTTON|
+                    style=wx.aui.AUI_NB_WINDOWLIST_BUTTON| 
+                    wx.aui.AUI_BUTTON_DOWN|
                     wx.aui.AUI_NB_DEFAULT_STYLE|
                     wx.CLIP_CHILDREN)
@@ -324 +333 @@
         self.SetPageText(pos, title)
         self.SetSelection(pos)
-        return grid
+        return grid , pos
         
     def enable_close_button(self):
@@ -448 +457 @@
         if data_outputs is None or data_outputs == {}:
             return
-        grid = self.add_empty_page()
-        #grid = GridPage(self, panel=self.parent)
-        grid.set_data(data_inputs, data_outputs)  
-        #self.AddPage(grid, "", True)
-        #pos = self.GetPageIndex(grid)
-        #title = "Batch " + str(self.GetPageCount())
-        #self.SetPageText(pos, title)
-        #self.SetSelection(pos)
-        
+        
+        for pos in range(self.GetPageCount()):
+            grid = self.GetPage(pos)
+            if grid.data is None:
+                #Found empty page
+                grid.set_data(data_inputs, data_outputs) 
+                self.SetSelection(pos) 
+                return
+                
+        grid, pos = self.add_empty_page()
+        grid.set_data(data_inputs, data_outputs)
+    
     def add_column(self):
         """
@@ -474 +486 @@
         for cpos in cols_pos:
             grid.DeleteCols(cpos)
-          
-          
-class SPanel(ScrolledPanel):
-    def __init__(self, parent, *args, **kwds):
-        ScrolledPanel.__init__(self, parent , *args, **kwds)
-        self.SetupScrolling()  
+
 
 
@@ -486 +493 @@
                  data_outputs=None, *args, **kwds):
         SPanel.__init__(self, parent , *args, **kwds)
+       
         self.vbox = wx.BoxSizer(wx.VERTICAL)