Author: bugman
Date: Mon May 7 11:32:33 2012
New Revision: 16035
URL: http://svn.gna.org/viewcvs/relax?rev=16035&view=rev
Log:
The user function arg type of 'num' is now handled as a float in the
auto-generated GUI elements.
Modified:
branches/uf_redesign/gui/uf_objects.py
branches/uf_redesign/gui/wizard_elements.py
Modified: branches/uf_redesign/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/uf_objects.py?rev=16035&r1=16034&r2=16035&view=diff
==============================================================================
--- branches/uf_redesign/gui/uf_objects.py (original)
+++ branches/uf_redesign/gui/uf_objects.py Mon May 7 11:32:33 2012
@@ -202,7 +202,7 @@
self.element_dir_sel(key=arg['name'], sizer=sizer, desc=desc,
tooltip=arg['desc'], read_only=arg['wiz_read_only'])
# Value types.
- elif arg['py_type'] in ['float', 'int', 'str']:
+ elif arg['py_type'] in ['float', 'int', 'num', 'str']:
self.element_value(key=arg['name'],
element_type=arg['wiz_element_type'], value_type=arg['py_type'], sizer=sizer,
desc=desc, combo_choices=arg['wiz_combo_choices'],
combo_data=arg['wiz_combo_data'], combo_default=arg['wiz_combo_default'],
tooltip=arg['desc'], read_only=arg['wiz_read_only'])
# Bool type.
Modified: branches/uf_redesign/gui/wizard_elements.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/wizard_elements.py?rev=16035&r1=16034&r2=16035&view=diff
==============================================================================
--- branches/uf_redesign/gui/wizard_elements.py (original)
+++ branches/uf_redesign/gui/wizard_elements.py Mon May 7 11:32:33 2012
@@ -665,7 +665,7 @@
self.seq_type = seq_type
# The base types.
- if value_type == 'float':
+ if value_type in ['float', 'num']:
self.convert_from_gui = gui_to_float
self.convert_to_gui = float_to_gui
elif value_type == 'int':
@@ -1005,7 +1005,7 @@
self.element_type = element_type
# The value types.
- if value_type == 'float':
+ if value_type in ['float', 'num']:
self.convert_from_gui = gui_to_float
self.convert_to_gui = float_to_gui
self.type_string = 'float'
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
