r12768 - in /branches/relax_data: ./ gui/user_functions/value.py -- March 03, 2011 - 11:51

Author: bugman
Date: Thu Mar  3 11:51:18 2011
New Revision: 12768

URL: http://svn.gna.org/viewcvs/relax?rev=12768&view=rev
Log:
Merged revisions 12648 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r12648 | bugman | 2011-03-01 15:52:19 +0100 (Tue, 01 Mar 2011) | 3 lines
  
  Modified the value.set() user function GUI element so that the parameter 
element is an input field.
........

Modified:
    branches/relax_data/   (props changed)
    branches/relax_data/gui/user_functions/value.py

Propchange: branches/relax_data/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar  3 11:51:18 2011
@@ -1,1 +1,1 @@
-/1.3:1-12644
+/1.3:1-12767

Modified: branches/relax_data/gui/user_functions/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/gui/user_functions/value.py?rev=12768&r1=12767&r2=12768&view=diff
==============================================================================
--- branches/relax_data/gui/user_functions/value.py (original)
+++ branches/relax_data/gui/user_functions/value.py Thu Mar  3 11:51:18 2011
@@ -74,7 +74,7 @@
         """
 
         # The parameter.
-        self.param = self.combo_box(sizer, "The parameter:", [])
+        self.param = self.input_field(sizer, "The parameter:")
 
         # The value.
         self.value = self.input_field(sizer, "The value:")
@@ -87,7 +87,7 @@
         """Execute the user function."""
 
         # The parameter and value.
-        param = 
gui_to_str(self.param.GetClientData(self.param.GetSelection()))
+        param = gui_to_str(self.param.GetValue())
         value = gui_to_str(self.value.GetValue())
 
         # The spin ID.
@@ -109,14 +109,14 @@
         return_data_desc = 
specific_fns.setup.get_specific_fn('return_data_desc', pipes.get_type(), 
raise_error=False)
 
         # Loop over the parameters.
-        for name in data_names(set='params'):
-            # Get the description.
-            desc = return_data_desc(name)
+        #for name in data_names(set='params'):
+        #    # Get the description.
+        #    desc = return_data_desc(name)
 
-            # No description.
-            if not desc:
-                desc = name
+        #    # No description.
+        #    if not desc:
+        #        desc = name
 
-            # Append the description.
-            self.param.Append(str_to_gui(desc), name)
+        #    # Append the description.
+        #    self.param.Append(str_to_gui(desc), name)