Changeset 521

Timestamp:

Jun 6, 2011 1:45:34 PM (12 years ago)

Author:

jemian

Message:

minor refactoring

File:

• scat/src/scat/gui1/scatter1.py (modified) (6 diffs)

scat/src/scat/gui1/scatter1.py

@@ -152 +152 @@
         '''
         # FIXME: When do the scrollbars appear?
-        sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, parent=owner, style=wx.HSCROLL | wx.VSCROLL)
+        sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, 
+                            parent=owner, style=wx.HSCROLL | wx.VSCROLL)
         sw.SetToolTipString('adjustable parameters for crystal lattice')
         owner.AddPage(imageId=-1, page=sw, select=False, text='Lattice')
@@ -178 +179 @@
                 Consider a Template Method for the panel handlers.
         '''
-        sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, parent=owner, style=wx.HSCROLL | wx.VSCROLL)
+        sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, 
+                            parent=owner, style=wx.HSCROLL | wx.VSCROLL)
         sw.SetToolTipString('adjustable parameters for scattering particle')
         owner.AddPage(imageId=-1, page=sw, select=True, text='Particle')
@@ -186 +188 @@
         sw.SetSizer(sizer)
 
+        #self.StackBuiltParticleParameters(sw, sizer)
+
+        sw.Fit()
+
+        return sw
+
+    def StackBuiltParticleParameters(self, sw, sizer):
         # Sphere: Rin (nm), sigma (Rin), ParticleInteriorChoice
         # Cylinder: Rc (nm), sigma (Rc), L (nm), ParticleInteriorChoice
@@ -277 +286 @@
         self.StackBuilder(sw, sizer, stack)
 
-        sw.Fit()
-
-        return sw
-
     def _init_notebook_Plotting(self, owner):
         '''
@@ -301 +306 @@
         :return: wx.lib.scrolledpanel.ScrolledPanel object
         '''
-        sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, parent=owner, style=wx.HSCROLL | wx.VSCROLL)
+        sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, 
+                            parent=owner, style=wx.HSCROLL | wx.VSCROLL)
         owner.AddPage(imageId=-1, page=sw, select=False, text='Plot')
 
@@ -473 +479 @@
                 # define its content now
                 for i in range(len(choices)):
-                    sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, parent=widget, style=wx.HSCROLL | wx.VSCROLL)
+                    sw = wx.lib.scrolledpanel.ScrolledPanel(id=wx.ID_ANY, 
+                                        parent=widget, style=wx.HSCROLL | wx.VSCROLL)
                     widget.AddPage(imageId=-1, page=sw, select=False, text=choices[i])