Changeset 340c2b3 in sasview for sansview/perspectives
- Timestamp:
- Jan 10, 2011 2:20:38 PM (14 years ago)
- 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
- Location:
- sansview/perspectives/fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sansview/perspectives/fitting/basepage.py
rf867cd9 r340c2b3 1 1 2 import sys, os 2 import sys 3 import os 3 4 import wx 4 5 import numpy … … 7 8 import math 8 9 import string 10 from wx.lib.scrolledpanel import ScrolledPanel 9 11 from sans.guiframe.utils import format_number,check_float 10 12 from sans.guicomm.events import StatusEvent … … 29 31 ON_MAC = True 30 32 31 class BasicPage(wx.Scrolled Window):33 class BasicPage(wx.ScrolledPanel, PanelBase): 32 34 """ 33 35 This class provide general structure of fitpanel page … … 43 45 wx.ScrolledWindow.__init__(self, parent, 44 46 style=wx.FULL_REPAINT_ON_RESIZE) 47 PanelBase.__init__(self) 48 self.SetupScrolling() 45 49 #Set window's font size 46 50 self.SetWindowVariant(variant=FONT_VARIANT) … … 340 344 self.vbox.Fit(self) 341 345 self.SetSizer(self.vbox) 342 343 self.set_scroll()344 346 self.Centre() 345 346 def set_scroll(self): 347 """ 348 """ 349 self.SetScrollbars(20,20,25,65) 350 self.Layout() 351 self.SetAutoLayout(True) 352 347 353 348 def set_owner(self,owner): 354 349 """ … … 476 471 self.sizer4.Layout() 477 472 self.Layout() 478 self.SetScrollbars(20,20,25,65)473 479 474 self.Refresh() 480 475 ## saving the state of enable dispersity button … … 1522 1517 items = self.structurebox.GetItems() 1523 1518 self.sizer1.Layout() 1524 self.SetScrollbars(20, 20, 25 ,65)1519 1525 1520 for i in range(len(items)): 1526 1521 if items[i]== str(name): … … 1737 1732 sizer.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10) 1738 1733 sizer.Layout() 1739 self.SetScrollbars(20,20,25,65) 1740 1741 1734 1742 1735 def _on_show_sld(self, event=None): 1743 1736 """ … … 1835 1828 self.Layout() 1836 1829 self.Refresh() 1837 self.SetScrollbars(20,20,25,65) 1838 1830 1839 1831 def _populate_box(self, combobox, list): 1840 1832 """ … … 2236 2228 self.sizer4_4.Layout() 2237 2229 self.sizer4.Layout() 2238 self.SetScrollbars(20,20,25,65) 2239 2240 2230 2241 2231 def _reset_dispersity(self): 2242 2232 """ … … 2307 2297 self.sizer4_4.Layout() 2308 2298 self.sizer4.Layout() 2309 self.SetScrollbars(20,20,25,65) 2310 2299 2311 2300 def _set_sizer_arraydispersion(self): 2312 2301 """ … … 2489 2478 self.sizer6.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10) 2490 2479 self.sizer6.Layout() 2491 self.SetScrollbars(20,20,25,65) 2492 2480 2493 2481 def _lay_out(self): 2494 2482 """ -
sansview/perspectives/fitting/fitpanel.py
r645f9b6 r340c2b3 5 5 import wx.aui 6 6 7 from sans.guiframe.panel_base import PanelBase 7 8 import basepage 8 9 … … 144 145 self.type = "Data" 145 146 146 class FitPanel(wx.aui.AuiNotebook ):147 class FitPanel(wx.aui.AuiNotebook, PanelBase): 147 148 148 149 """ … … 166 167 wx.aui.AUI_NB_DEFAULT_STYLE| 167 168 wx.CLIP_CHILDREN) 168 169 self.manager=None 170 self.parent=parent 171 self.event_owner=None 169 PanelBase.__init__(self) 170 171 self.manager = None 172 self.parent = parent 173 self.event_owner = None 172 174 173 175 pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE … … 191 193 192 194 # increment number for model name 193 self.count =0195 self.count = 0 194 196 #updating the panel 195 197 self.Update()
Note: See TracChangeset
for help on using the changeset viewer.