Author: bugman Date: Fri Dec 7 10:22:39 2012 New Revision: 18075 URL: http://svn.gna.org/viewcvs/relax?rev=18075&view=rev Log: Merged revisions 18072-18074 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18072 | bugman | 2012-12-06 18:03:49 +0100 (Thu, 06 Dec 2012) | 3 lines Bug fix for the catching of errors in the GUI user functions - the sys module import was missing. ........ r18073 | bugman | 2012-12-06 18:32:30 +0100 (Thu, 06 Dec 2012) | 5 lines The spin.create_pseudo user function 'members' argument is no longer read only in the GUI. This allows the user to type in shorter spin IDs rather than selecting them from the list. ........ r18074 | bugman | 2012-12-06 18:34:56 +0100 (Thu, 06 Dec 2012) | 6 lines Bug fix for the GUI combo_list input element SetValue() method. Values not belonging to the combo lists can now be set. This fixes the spin.create_pseudo user function in the test suite, a bug triggered by the N_state_model.test_absolute_rdc_menthol GUI test. ........ Modified: branches/cst/ (props changed) branches/cst/gui/input_elements/combo_list.py branches/cst/gui/uf_objects.py branches/cst/user_functions/spin.py Propchange: branches/cst/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Dec 7 10:22:39 2012 @@ -1,1 +1,1 @@ -/trunk:1-18066 +/trunk:1-18074 Modified: branches/cst/gui/input_elements/combo_list.py URL: http://svn.gna.org/viewcvs/relax/branches/cst/gui/input_elements/combo_list.py?rev=18075&r1=18074&r2=18075&view=diff ============================================================================== --- branches/cst/gui/input_elements/combo_list.py (original) +++ branches/cst/gui/input_elements/combo_list.py Fri Dec 7 10:22:39 2012 @@ -351,10 +351,16 @@ # Loop over the list. for i in range(len(value)): # Loop until the proper client data is found. + found = False for j in range(self._combo_boxes[i].GetCount()): if self._combo_boxes[i].GetClientData(j) == value[i]: self._combo_boxes[i].SetSelection(j) + found = True break + + # Otherwise set the value. + if not found: + self._combo_boxes[i].SetValue(value[i]) def UpdateChoices(self, combo_choices=None, combo_data=None, combo_default=None): Modified: branches/cst/gui/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/branches/cst/gui/uf_objects.py?rev=18075&r1=18074&r2=18075&view=diff ============================================================================== --- branches/cst/gui/uf_objects.py (original) +++ branches/cst/gui/uf_objects.py Fri Dec 7 10:22:39 2012 @@ -26,6 +26,7 @@ from re import search import wx from wx.lib import scrolledpanel +import sys # relax module imports. import arg_check Modified: branches/cst/user_functions/spin.py URL: http://svn.gna.org/viewcvs/relax/branches/cst/user_functions/spin.py?rev=18075&r1=18074&r2=18075&view=diff ============================================================================== --- branches/cst/user_functions/spin.py (original) +++ branches/cst/user_functions/spin.py Fri Dec 7 10:22:39 2012 @@ -196,7 +196,7 @@ wiz_element_type = "combo_list", wiz_combo_iter = get_spin_ids, wiz_combo_list_min = 2, - wiz_read_only = True + wiz_read_only = False ) uf.add_keyarg( name = "averaging",