r13097 - in /branches/gui_testing/gui/user_functions: base.py value.py -- June 17, 2011 - 12:57

Author: bugman
Date: Fri Jun 17 12:57:34 2011
New Revision: 13097

URL: http://svn.gna.org/viewcvs/relax?rev=13097&view=rev
Log:
The parent GUI object is now propagated through the value.set() user function 
and UF_panel.


Modified:
    branches/gui_testing/gui/user_functions/base.py
    branches/gui_testing/gui/user_functions/value.py

Modified: branches/gui_testing/gui/user_functions/base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/base.py?rev=13097&r1=13096&r2=13097&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/base.py (original)
+++ branches/gui_testing/gui/user_functions/base.py Fri Jun 17 12:57:34 2011
@@ -48,16 +48,18 @@
 class UF_panel(Wiz_panel):
     """User function specific panel for the wizards."""
 
-    def __init__(self, parent):
+    def __init__(self, parent, gui, interpreter):
         """Set up the window.
-        
+
         @param parent:  The parent class containing the GUI and interpreter 
objects.
         @type parent:   class instance
+        @param gui:     The GUI base object.
+        @type gui:      wx.Frame instance
         """
 
         # Store the args.
-        self.gui = parent.gui
-        self.interpreter = parent.interpreter
+        self.gui = gui
+        self.interpreter = interpreter
 
         # Execute the base class method.
-        super(UF_panel, self).__init__()
+        super(UF_panel, self).__init__(parent)

Modified: branches/gui_testing/gui/user_functions/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/value.py?rev=13097&r1=13096&r2=13097&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/value.py (original)
+++ branches/gui_testing/gui/user_functions/value.py Fri Jun 17 12:57:34 2011
@@ -50,7 +50,8 @@
 
         # Execute the wizard.
         wizard = Wiz_window(size_x=800, size_y=600, title='Set parameter 
values')
-        wizard.add_page(Set_panel(self))
+        panel = Set_panel(wizard, self)
+        wizard.add_page(panel)
         wizard.run()