Changeset e696e0a in sasview

Timestamp:

Jan 10, 2011 1:59:19 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:

6a0cbcf4

Parents:

691643c

Message:

make panel inheriting from panelbase of guiframe

Location:

calculatorview/perspectives/calculator

Files:

• kiessig_calculator_panel.py (modified) (3 diffs)
• sld_panel.py (modified) (4 diffs)
• slit_length_calculator_panel.py (modified) (3 diffs)

calculatorview/perspectives/calculator/kiessig_calculator_panel.py

@@ -11 +11 @@
 import wx
 import sys
-#import os
-
-#from sans.guicomm.events import StatusEvent  
+
+from sans.guiframe.panel_base import PanelBase
 from sans.calculator.kiessig_calculator import KiessigThicknessCalculator 
 from calculator_widgets import OutputTextCtrl
@@ -29 +28 @@
     FONT_VARIANT = 1
  
-class KiessigThicknessCalculatorPanel(wx.Panel):
+class KiessigThicknessCalculatorPanel(wx.Panel, PanleBase):
     """
     Provides the Kiessig thickness calculator GUI.
@@ -42 +41 @@
     def __init__(self, parent, *args, **kwds):
         wx.Panel.__init__(self, parent, *args, **kwds)
+        PanelBase.__init__(self)
         #Font size 
         self.SetWindowVariant(variant=FONT_VARIANT)  

calculatorview/perspectives/calculator/sld_panel.py

@@ -7 +7 @@
 import math
 import sys
+
+from sans.guiframe.panel_base import PanelBase
 
 from sans.guiframe.utils import format_number
@@ -17 +19 @@
 from periodictable.xsf import xray_energy
 from periodictable.xsf import xray_sld_from_atoms
-#rom periodictable.constants import avogadro_number
 from periodictable.nsf import neutron_scattering
        
@@ -35 +36 @@
     FONT_VARIANT = 1
     
-class SldPanel(wx.Panel):
+class SldPanel(wx.Panel, PanelBase):
     """
     Provides the SLD calculator GUI.
@@ -50 +51 @@
         """
         wx.Panel.__init__(self, parent, *args, **kwds)
+        PanelBase.__init__(self)
         #Font size 
         self.SetWindowVariant(variant=FONT_VARIANT)

calculatorview/perspectives/calculator/slit_length_calculator_panel.py

@@ -13 +13 @@
 import os
 
-#from DataLoader.readers.ascii_reader import Reader
+from sans.guiframe.panel_base import PanelBase
+
 from sans.guicomm.events import StatusEvent  
 from sans.calculator.slit_length_calculator import SlitlengthCalculator  
@@ -30 +31 @@
     FONT_VARIANT = 1
  
-class SlitLengthCalculatorPanel(wx.Panel):
+class SlitLengthCalculatorPanel(wx.Panel, PanelBase):
     """
         Provides the slit length calculator GUI.
@@ -43 +44 @@
     def __init__(self, parent, *args, **kwds):
         wx.Panel.__init__(self, parent, *args, **kwds)
+        PanelBase.__init__(self)
         #Font size 
         self.SetWindowVariant(variant=FONT_VARIANT)