Changeset 44148f0 in sasview for calculatorview/perspectives/calculator

Timestamp:

Nov 2, 2010 9:34:47 AM (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:

a7a5886

Parents:

96c0234

Message:

working on pylint

Location:

calculatorview/perspectives/calculator

Files:

• calculator.py (modified) (3 diffs)
• kiessig_calculator_panel.py (modified) (1 diff)
• sld_panel.py (modified) (3 diffs)
• slit_length_calculator_panel.py (modified) (1 diff)

calculatorview/perspectives/calculator/calculator.py

@@ -145 +145 @@
         frame = KiessigWindow()
         frame.Show(True) 
-        event.Skip()
-       
+    
     def on_calculate_sld(self, event):
         """
@@ -154 +153 @@
         frame = SldWindow(base=self.parent)
         frame.Show(True) 
-        event.Skip()
-        
+       
     def on_calculate_slit_size(self, event):
         """
@@ -163 +161 @@
         frame = SlitLengthCalculatorWindow(parent=self.parent)    
         frame.Show(True)
-        event.Skip()
-        
+   
     def on_perspective(self, event):
         """

calculatorview/perspectives/calculator/kiessig_calculator_panel.py

@@ -185 +185 @@
      
 class KiessigWindow(wx.Frame):
-    def __init__(self, parent=None, title="Kiessig Thickness Calculator"):
-        wx.Frame.__init__(self, parent, title,
-                           size=(PANEL_WIDTH,PANEL_HEIGHT))
+    def __init__(self, parent=None, title="Kiessig Thickness Calculator",
+                  size=(PANEL_WIDTH,PANEL_HEIGHT), *args, **kwds):
+        kwds['title'] = title
+        kwds['size'] = size
+        wx.Frame.__init__(self, parent, *args, **kwds)
         self.parent = parent
         self.panel = KiessigThicknessCalculatorPanel(parent=self)

calculatorview/perspectives/calculator/sld_panel.py

@@ -46 +46 @@
     CENTER_PANE = True
     
-    def __init__(self, parent, base=None):
-        """
-        """
-        wx.Panel.__init__(self, parent)
+    def __init__(self, parent, base=None, *args, **kwds):
+        """
+        """
+        wx.Panel.__init__(self, parent, *args, **kwds)
         #Font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
@@ -415 +415 @@
     """
     """
-    def __init__(self, parent=None, title="SLD Calculator", base=None):
-        """
-        """
-        wx.Frame.__init__(self, parent, title,
-                           size=(PANEL_SIZE, PANEL_SIZE))
+    def __init__(self, parent=None, title="SLD Calculator",
+                  base=None, size=(PANEL_SIZE, PANEL_SIZE), *args, **kwds):
+        """
+        """
+        kwds['title'] = title
+        kwds['size'] = size
+        wx.Frame.__init__(self, parent, *args, **kwds)
         """
         """
@@ -432 +434 @@
         """
         """
-        frame = SldWindow(None, -1, 'SLD Calculator')    
+        frame = SldWindow(None, title='SLD Calculator')    
         frame.Show(True)
         self.SetTopWindow(frame)

calculatorview/perspectives/calculator/slit_length_calculator_panel.py

@@ -238 +238 @@
     """
     """
-    def __init__(self, parent=None, title="Slit Size Calculator"):
-        """
-        """
-        wx.Frame.__init__(self, parent, title,
-                           size=(PANEL_WIDTH,PANEL_HEIGHT))
+    def __init__(self, parent=None, title="Slit Size Calculator",
+                size=(PANEL_WIDTH,PANEL_HEIGHT), *args, **kwds):
+        """
+        """
+        kwds['size']= size
+        kwds['title']= title
+        wx.Frame.__init__(self, parent, *args, **kwds)
         self.parent = parent
         self.panel = SlitLengthCalculatorPanel(parent=self)