Changeset fc292d3 in sasview

Timestamp:

Jan 10, 2011 2:39:39 PM (14 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:

9299455

Parents:

015d109

Message:

replace scrolled window with scrolledpanel

Location:

theoryview/perspectives/theory

Files:

• basepage.py (modified) (11 diffs)
• model_panel.py (modified) (4 diffs)

theoryview/perspectives/theory/basepage.py

@@ -8 +8 @@
 import math
 import string
+from wx.lib.scrolledpanel import ScrolledPanel
 from sans.guiframe.utils import format_number
 from sans.guiframe.utils import check_float
@@ -32 +33 @@
     ON_MAC = True
     
-class BasicPage(wx.ScrolledWindow):
+class BasicPage(wx.ScrolledPanel):
     """
     This class provide general structure of  fitpanel page
@@ -43 +44 @@
     
     def __init__(self,parent, page_info=None, model_list_box=None):
-        wx.ScrolledWindow.__init__(self, parent,
-                 style=wx.FULL_REPAINT_ON_RESIZE)
+        wx.ScrolledPanel.__init__(self, parent)
+        self.SetupScrolling()
         #Set window's font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
@@ -288 +289 @@
         self.vbox.Fit(self) 
         self.SetSizer(self.vbox)
-        self.set_scroll()
+       
         self.Centre()
-        
-    def set_scroll(self):
-        """
-        """
-        self.SetScrollbars(20, 20, 25, 65)
-        self.Layout()   
-        self.SetAutoLayout(True)
-         
+  
     def set_owner(self, owner):
         """ 
@@ -385 +379 @@
         self.sizer4.Layout()
         self.Layout()
-        self.SetScrollbars(20, 20, 25, 65)
+        self.SetupScrolling()
         self.Refresh()
         ## saving the state of enable dispersity button
@@ -992 +986 @@
                 items = self.structurebox.GetItems()
                 self.sizer1.Layout()
-                self.SetScrollbars(20, 20, 25, 65)
+                self.SetupScrolling()
                 for i in range(len(items)):
                     if items[i] == str(name):
@@ -1216 +1210 @@
         sizer.Add(boxsizer1, 0, wx.EXPAND|wx.ALL, 10)
         sizer.Layout()
-        self.SetScrollbars(20, 20, 25, 65)
+        self.SetupScrolling()
         
     def _on_show_sld(self, event=None):
@@ -1308 +1302 @@
         self.Layout()
         self.Refresh()
-        self.SetScrollbars(20, 20, 25, 65)
+        self.SetupScrolling()
             
     def _populate_box(self, combobox, list):
@@ -1618 +1612 @@
         self.sizer4_4.Layout()
         self.sizer4.Layout()
-        self.SetScrollbars(20, 20, 25, 65)
+        self.SetupScrolling()
       
     def _reset_dispersity(self):
@@ -1683 +1677 @@
         self.sizer4_4.Layout()
         self.sizer4.Layout()
-        self.SetScrollbars(20, 20, 25, 65)
+        self.SetupScrolling()
         
     def _set_sizer_arraydispersion(self):
@@ -1842 +1836 @@
         self.sizer6.Add(boxsizer1, 0, wx.EXPAND|wx.ALL, 10)
         self.sizer6.Layout()
-        self.SetScrollbars(20, 20, 25, 65)
+        self.SetupScrolling()
         
     def _lay_out(self):

theoryview/perspectives/theory/model_panel.py

@@ -56 +56 @@
         """
         self._on_display_description_helper()
-        self.SetScrollbars(20, 20, 25, 65)
+        self.SetupScrolling()
         self.Refresh()
 
@@ -327 +327 @@
         self.sizer4_4.Layout()
         self.sizer4.Layout()
-        self.SetScrollbars(20,20,25,65)
+        self.SetupScrolling()
              
  
@@ -579 +579 @@
             ##no model avaiable to draw sizer 
             self.sizer3.Layout()
-            self.SetScrollbars(20,20,25,65)
+            self.SetupScrolling()
             return
         box_description= wx.StaticBox(self, -1,str("Model Parameters"))
@@ -777 +777 @@
         self.sizer3.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
         self.sizer3.Layout()
-        self.SetScrollbars(20,20,25,65)
+        self.SetupScrolling()