r15909 - in /branches/uf_redesign: ./ gui/wizard_elements.py test_suite/system_tests/state.py -- May 03, 2012 - 18:43

Author: bugman
Date: Thu May  3 18:43:26 2012
New Revision: 15909

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

........
  r15906 | bugman | 2012-05-03 16:29:16 +0200 (Thu, 03 May 2012) | 6 lines
  
  Fix for the Base_value ResetChoices() method.
  
  The recent simplification was failing as the ComboBox.Insert() method could 
not handle the position
  being set to sys.maxint, unlike most other of its methods.
........
  r15907 | bugman | 2012-05-03 18:14:11 +0200 (Thu, 03 May 2012) | 8 lines
  
  Big bug fix for the test suite!
  
  One of the state system tests was removing the frame order analysis from the
  generic_fns.pipes.VALID_TYPES list with a pop() call.  But this change is 
permanent.  So in the
  later Bmrb.test_bmrb_rw GUI test, the GUI fails as this list is used in the 
pipe.create GUI user
  function interface and it no longer matches the corresponding 
PIPE_DESC_LIST structure!
........

Modified:
    branches/uf_redesign/   (props changed)
    branches/uf_redesign/gui/wizard_elements.py
    branches/uf_redesign/test_suite/system_tests/state.py

Propchange: branches/uf_redesign/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May  3 18:43:26 2012
@@ -1,1 +1,1 @@
-/1.3:1-15903
+/1.3:1-15908

Modified: branches/uf_redesign/gui/wizard_elements.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/wizard_elements.py?rev=15909&r1=15908&r2=15909&view=diff
==============================================================================
--- branches/uf_redesign/gui/wizard_elements.py (original)
+++ branches/uf_redesign/gui/wizard_elements.py Thu May  3 18:43:26 2012
@@ -207,7 +207,7 @@
 
             # Loop over the choices and data, adding both to the end.
             for i in range(len(combo_choices)):
-                self._field.Insert(str_to_gui(combo_choices[i]), sys.maxint, 
combo_data[i])
+                self._field.Insert(str_to_gui(combo_choices[i]), i, 
combo_data[i])
 
             # Set the default selection.
             if combo_default:

Modified: branches/uf_redesign/test_suite/system_tests/state.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/system_tests/state.py?rev=15909&r1=15908&r2=15909&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/system_tests/state.py (original)
+++ branches/uf_redesign/test_suite/system_tests/state.py Thu May  3 18:43:26 
2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2008-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2008-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -21,6 +21,7 @@
 
###############################################################################
 
 # Python module imports.
+from copy import deepcopy
 import sys
 from tempfile import mktemp
 
@@ -89,7 +90,7 @@
         reset()
 
         # The data pipe list.
-        pipe_types = VALID_TYPES
+        pipe_types = deepcopy(VALID_TYPES)
         pipe_types.pop(pipe_types.index("frame order"))
 
         # Create a few data pipes.