mailr12894 - /1.3/gui/components/spectrum.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on June 08, 2011 - 13:52:
Author: bugman
Date: Wed Jun  8 13:52:30 2011
New Revision: 12894

URL: http://svn.gna.org/viewcvs/relax?rev=12894&view=rev
Log:
Shifted the button code into the add_buttons() method.


Modified:
    1.3/gui/components/spectrum.py

Modified: 1.3/gui/components/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/components/spectrum.py?rev=12894&r1=12893&r2=12894&view=diff
==============================================================================
--- 1.3/gui/components/spectrum.py (original)
+++ 1.3/gui/components/spectrum.py Wed Jun  8 13:52:30 2011
@@ -80,6 +80,41 @@
         # Sizer
         sizer = wx.BoxSizer(wx.HORIZONTAL)
 
+        # Add the buttons.
+        self.add_buttons(sizer)
+
+        # Grid of peak list file names and relaxation time
+        self.peaklist = wx.grid.Grid(self.parent, -1, size=(1, 230))
+
+        # Create entries
+        self.peaklist.CreateGrid(self.num_rows, 2)
+
+        # Create headers
+        self.peaklist.SetColLabelValue(0, "%s peak list" % self.label)
+        self.peaklist.SetColSize(0, 370)
+        self.peaklist.SetColLabelValue(1, "Relaxation delay [s]")
+        self.peaklist.SetColSize(1, 160)
+
+        # Bind some events.
+        self.peaklist.GetGridWindow().Bind(wx.EVT_LEFT_DCLICK, 
self.event_left_dclick)
+        self.peaklist.Bind(wx.EVT_KEY_DOWN, self.event_key_down)
+
+        # Add grid to sizer, with spacing.
+        sizer.Add(self.peaklist, -1, wx.EXPAND, 0)
+
+        # Pack box
+        box.AddSpacer(self.spacing)
+        box.Add(sizer, 0, wx.EXPAND, 0)
+        box.AddSpacer(self.spacing)
+
+
+    def add_buttons(self, sizer):
+        """Add the buttons for peak list manipulation.
+
+        @param box:     The sizer element to pack the buttons into.
+        @type box:      wx.BoxSizer instance
+        """
+
         # Button Sizer
         button_sizer = wx.BoxSizer(wx.VERTICAL)
 
@@ -116,30 +151,6 @@
 
         # Pack buttons
         sizer.Add(button_sizer, 0, 0, 0)
-
-        # Grid of peak list file names and relaxation time
-        self.peaklist = wx.grid.Grid(self.parent, -1, size=(1, 230))
-
-        # Create entries
-        self.peaklist.CreateGrid(self.num_rows, 2)
-
-        # Create headers
-        self.peaklist.SetColLabelValue(0, "%s peak list" % self.label)
-        self.peaklist.SetColSize(0, 370)
-        self.peaklist.SetColLabelValue(1, "Relaxation delay [s]")
-        self.peaklist.SetColSize(1, 160)
-
-        # Bind some events.
-        self.peaklist.GetGridWindow().Bind(wx.EVT_LEFT_DCLICK, 
self.event_left_dclick)
-        self.peaklist.Bind(wx.EVT_KEY_DOWN, self.event_key_down)
-
-        # Add grid to sizer, with spacing.
-        sizer.Add(self.peaklist, -1, wx.EXPAND, 0)
-
-        # Pack box
-        box.AddSpacer(self.spacing)
-        box.Add(sizer, 0, wx.EXPAND, 0)
-        box.AddSpacer(self.spacing)
 
 
     def event_left_dclick(self, event):




Related Messages


Powered by MHonArc, Updated Wed Jun 08 14:00:02 2011