Author: bugman Date: Tue Jul 26 22:25:00 2011 New Revision: 13910 URL: http://svn.gna.org/viewcvs/relax?rev=13910&view=rev Log: Merged revisions 13909 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r13909 | bugman | 2011-07-26 22:18:51 +0200 (Tue, 26 Jul 2011) | 3 lines The data_type() API method is now exposed. ........ Modified: branches/gui_testing/ (props changed) branches/gui_testing/gui/user_functions/value.py branches/gui_testing/specific_fns/setup.py Propchange: branches/gui_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Jul 26 22:25:00 2011 @@ -1,1 +1,1 @@ -/1.3:1-13906 +/1.3:1-13909 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=13910&r1=13909&r2=13910&view=diff ============================================================================== --- branches/gui_testing/gui/user_functions/value.py (original) +++ branches/gui_testing/gui/user_functions/value.py Tue Jul 26 22:25:00 2011 @@ -126,6 +126,7 @@ # The value (converted to the correct type). val_str = gui_to_str(self.val.GetValue()) + print `val_str` val_type = self.data_type(param) try: val = apply(val_type, val_str) Modified: branches/gui_testing/specific_fns/setup.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/setup.py?rev=13910&r1=13909&r2=13910&view=diff ============================================================================== --- branches/gui_testing/specific_fns/setup.py (original) +++ branches/gui_testing/specific_fns/setup.py Tue Jul 26 22:25:00 2011 @@ -87,6 +87,10 @@ if eqi == 'data_names': function = inst.data_names + # The parameter type function. + if eqi == 'data_type': + function = inst.data_type + # Default parameter value returning function. if eqi == 'default_value': function = inst.default_value