Changeset 340c2b3 in sasview

Timestamp:

Jan 10, 2011 12:20:38 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:

2f60121

Parents:

6a0cbcf4

Message:

make panel inheriting from panelBase

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (12 diffs)
• fitpanel.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1 +1 @@
 
-import sys, os
+import sys
+import os
 import wx
 import numpy
@@ -7 +8 @@
 import math
 import string
+from wx.lib.scrolledpanel import ScrolledPanel
 from sans.guiframe.utils import format_number,check_float
 from sans.guicomm.events import StatusEvent
@@ -29 +31 @@
     ON_MAC = True
     
-class BasicPage(wx.ScrolledWindow):
+class BasicPage(wx.ScrolledPanel, PanelBase):
     """
     This class provide general structure of  fitpanel page
@@ -43 +45 @@
         wx.ScrolledWindow.__init__(self, parent, 
                                    style=wx.FULL_REPAINT_ON_RESIZE)
+        PanelBase.__init__(self)
+        self.SetupScrolling()
         #Set window's font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
@@ -340 +344 @@
         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):
         """ 
@@ -476 +471 @@
         self.sizer4.Layout()
         self.Layout()
-        self.SetScrollbars(20,20,25,65)
+     
         self.Refresh()
         ## saving the state of enable dispersity button
@@ -1522 +1517 @@
                 items = self.structurebox.GetItems()
                 self.sizer1.Layout()
-                self.SetScrollbars(20, 20, 25 ,65)
+                
                 for i in range(len(items)):
                     if items[i]== str(name):
@@ -1737 +1732 @@
         sizer.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
         sizer.Layout()
-        self.SetScrollbars(20,20,25,65)
-        
-        
+       
     def _on_show_sld(self, event=None):
         """
@@ -1835 +1828 @@
         self.Layout()
         self.Refresh()
-        self.SetScrollbars(20,20,25,65)
-            
+  
     def _populate_box(self, combobox, list):
         """
@@ -2236 +2228 @@
         self.sizer4_4.Layout()
         self.sizer4.Layout()
-        self.SetScrollbars(20,20,25,65)
-      
-            
+    
     def _reset_dispersity(self):
         """
@@ -2307 +2297 @@
         self.sizer4_4.Layout()
         self.sizer4.Layout()
-        self.SetScrollbars(20,20,25,65)
-        
+    
     def _set_sizer_arraydispersion(self):
         """
@@ -2489 +2478 @@
         self.sizer6.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
         self.sizer6.Layout()
-        self.SetScrollbars(20,20,25,65)
-        
+    
     def _lay_out(self):
         """

sansview/perspectives/fitting/fitpanel.py

@@ -5 +5 @@
 import wx.aui
 
+from sans.guiframe.panel_base import PanelBase
 import basepage
 
@@ -144 +145 @@
         self.type = "Data"
         
-class FitPanel(wx.aui.AuiNotebook):    
+class FitPanel(wx.aui.AuiNotebook, PanelBase):    
 
     """
@@ -166 +167 @@
                     wx.aui.AUI_NB_DEFAULT_STYLE|
                     wx.CLIP_CHILDREN)
-    
-        self.manager=None
-        self.parent=parent
-        self.event_owner=None
+        PanelBase.__init__(self)
+    
+        self.manager = None
+        self.parent = parent
+        self.event_owner = None
         
         pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
@@ -191 +193 @@
         
         # increment number for model name
-        self.count=0
+        self.count = 0
         #updating the panel
         self.Update()