r13200 - /branches/gui_testing/gui/user_functions/pipes.py -- June 23, 2011 - 20:50

Author: bugman
Date: Thu Jun 23 20:50:16 2011
New Revision: 13200

URL: http://svn.gna.org/viewcvs/relax?rev=13200&view=rev
Log:
Fix for the pipe.copy() GUI user function.

The on_apply() method has been renamed to on_display().


Modified:
    branches/gui_testing/gui/user_functions/pipes.py

Modified: branches/gui_testing/gui/user_functions/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/pipes.py?rev=13200&r1=13199&r2=13200&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/pipes.py (original)
+++ branches/gui_testing/gui/user_functions/pipes.py Thu Jun 23 20:50:16 2011
@@ -154,12 +154,8 @@
         self.pipe_to = self.input_field(sizer, "The destination pipe name:")
 
 
-    def on_apply(self, event):
-        """Clear the data is apply was hit.
-
-        @param event:   The wx event.
-        @type event:    wx event
-        """
+    def on_display(self):
+        """Clear the data is apply was hit."""
 
         # Clear the previous data.
         self.pipe_from.Clear()
@@ -204,16 +200,6 @@
         self.pipe_name = self.combo_box(sizer, "The pipe:", [])
 
 
-    def on_execute(self):
-        """Execute the user function."""
-
-        # Get the name.
-        pipe_name = str(self.pipe_name.GetValue())
-
-        # Delete the data pipe.
-        self.interpreter.pipe.delete(pipe_name)
-
-
     def on_display(self):
         """Clear and update the pipe name list."""
 
@@ -228,6 +214,16 @@
             self.pipe_name.Append(name)
 
 
+    def on_execute(self):
+        """Execute the user function."""
+
+        # Get the name.
+        pipe_name = str(self.pipe_name.GetValue())
+
+        # Delete the data pipe.
+        self.interpreter.pipe.delete(pipe_name)
+
+
 
 class Switch_page(UF_page):
     """The pipe.switch() user function page."""
@@ -252,16 +248,6 @@
         self.pipe_name = self.combo_box(sizer, "The pipe:", [])
 
 
-    def on_execute(self):
-        """Execute the user function."""
-
-        # Get the name.
-        pipe_name = str(self.pipe_name.GetValue())
-
-        # Switch the data pipe.
-        self.interpreter.pipe.switch(pipe_name)
-
-
     def on_display(self):
         """Clear and update the pipe name list and cdp."""
 
@@ -276,3 +262,13 @@
         # The list of pipe names.
         for name in pipe_names():
             self.pipe_name.Append(name)
+
+
+    def on_execute(self):
+        """Execute the user function."""
+
+        # Get the name.
+        pipe_name = str(self.pipe_name.GetValue())
+
+        # Switch the data pipe.
+        self.interpreter.pipe.switch(pipe_name)