Changeset 9680906d in sasview for sansguiframe/src/sans

Timestamp:

Aug 31, 2011 5:05:23 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:

857d00f

Parents:

c17760d

Message:

working on grid

File:

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

sansguiframe/src/sans/guiframe/data_processor.py

@@ -133 +133 @@
         self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.on_close_page)
         
+        
     def enable_close_button(self):
         """
@@ -150 +151 @@
                 style |= wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
                 self.SetWindowStyle(style)
-                
+              
+    def on_edit_axis(self):
+        """
+        Return the select cell of a given selected column
+        """
+        pos = self.GetSelection()
+        grid = self.GetPage(pos)
+        print "selected column",grid.GetSelectedCols(), grid.GetSelectionMode()
+
+        print "selected cell", grid.GetSelectedCells()
+        
+        print "notebook on_edit_axis()"
+        
     def on_close_page(self, event):
         """
@@ -202 +215 @@
         self.vbox = wx.BoxSizer(wx.VERTICAL)
         
-        self.plotting_sizer = wx.FlexGridSizer(3, 5, 10, 5)
+        self.plotting_sizer = wx.FlexGridSizer(3, 7, 10, 5)
         w, h = self.GetSize()
         #self.panel_grid = SPanel(self, -1, size=(w, -1))
@@ -266 +279 @@
         self.grid = Notebook(parent=self)
         self.grid.set_data(self._data)
-        #self.grid = Table(parent=self, data=self._data)
-        #vbox = wx.BoxSizer(wx.HORIZONTAL)
         self.grid_sizer.Add(self.grid, 1, wx.EXPAND, 0)
-        #self.panel_grid.SetSizer(vbox)
+    
         
     def layout_grid1(self):
@@ -285 +296 @@
         """
         self.x_axis_label = wx.TextCtrl(self, -1)
-       
         self.y_axis_label = wx.TextCtrl(self, -1)
-        
-        self.x_axis_value = wx.TextCtrl(self, -1)
-        self.y_axis_value = wx.TextCtrl(self, -1)
-       
+        self.x_axis_value = wx.TextCtrl(self, -1, size=(200, -1))
+        self.y_axis_value = wx.TextCtrl(self, -1, size=(200, -1))
+        self.x_axis_add = wx.Button(self, -1, "Add")
+        self.x_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
+                            id=self.x_axis_add.GetId())
+        self.y_axis_add = wx.Button(self, -1, "Add")
+        self.y_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
+                            id=self.y_axis_add.GetId())
         self.x_axis_unit = wx.TextCtrl(self, -1)
         self.y_axis_unit = wx.TextCtrl(self, -1)
         self.plot_button = wx.Button(self, -1, "Plot")
         wx.EVT_BUTTON(self, self.plot_button.GetId(), self.on_plot)
-        self.plotting_sizer.AddMany([(wx.StaticText(self, -1, "x"), 1, wx.LEFT, 10),
-                                     (self.x_axis_label,  wx.TOP|wx.BOTTOM|wx.LEFT, 10),
-                                      (self.x_axis_value,  wx.TOP|wx.BOTTOM|wx.LEFT, 10),
-                                     (wx.StaticText(self, -1 , "unit"), 1, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE|wx.EXPAND, 0),
-                                      (self.x_axis_unit),
-                                      (wx.StaticText(self, -1, "y"), 1, wx.LEFT, 10),
-                                       (self.y_axis_label,  wx.TOP|wx.BOTTOM|wx.LEFT, 10),
-                                      (self.y_axis_value, wx.TOP|wx.BOTTOM|wx.LEFT, 10),
-                                     (wx.StaticText(self, -1 , "unit"), 1, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE|wx.EXPAND, 0),
-                                      (self.y_axis_unit),
-                                      (-1, -1),
-                                      (-1, -1),
-                                      (-1, -1),
-                                      (self.plot_button, 1, wx.LEFT, 30)])
+        self.plotting_sizer.AddMany([
+                    (wx.StaticText(self, -1, "x-axis label"), 1, wx.LEFT, 10),
+                    (self.x_axis_label, wx.TOP|wx.BOTTOM|wx.LEFT, 10),
+                    (wx.StaticText(self, -1, "x-axis value"), 1, wx.LEFT, 10),
+                    (self.x_axis_value, wx.TOP|wx.BOTTOM|wx.LEFT, 10),
+                    (self.x_axis_add, 1, wx.LEFT|wx.RIGHT, 0),
+                    (wx.StaticText(self, -1 , "unit"), 1, wx.LEFT|wx.RIGHT, 0),
+                    (self.x_axis_unit, 0, wx.LEFT, 0),
+                    (wx.StaticText(self, -1, "y-axis label"), 1, wx.LEFT, 10),
+                    (self.y_axis_label,  wx.TOP|wx.BOTTOM|wx.LEFT, 10),
+                    (wx.StaticText(self, -1, "y-axis value"), 1, wx.LEFT, 10),
+                    (self.y_axis_value, wx.TOP|wx.BOTTOM|wx.LEFT, 10),
+                    (self.y_axis_add, 1, wx.LEFT|wx.RIGHT, 0),
+                    (wx.StaticText(self, -1 , "unit"), 1, wx.LEFT|wx.RIGHT, 0),
+                    (self.y_axis_unit, 0, wx.LEFT, 0),
+                      (-1, -1),
+                      (-1, -1),
+                      (-1, -1),
+                      (-1, -1),
+                      (-1, -1),
+                      (-1, -1),
+                      (self.plot_button, 1, wx.LEFT, 0)])
    
-        
+    def on_edit_axis(self, event):
+        """
+        Get the selected column on  the visible grid and set values for axis
+        """
+        self.grid.on_edit_axis()
+        
+    def edit_axis_helper(self, tcrtl_label, tcrtl_value):
+        """
+        """
     def add_column(self):
         """
@@ -325 +355 @@
         
 class GridFrame(wx.Frame):
-    def __init__(self, parent=None, data=None, id=-1, title="Batch Results", size=(500, 400)):
+    def __init__(self, parent=None, data=None, id=-1, title="Batch Results", size=(700, 400)):
         wx.Frame.__init__(self, parent=parent, id=id, title=title, size=size)
         self.parent = parent