r14337 - in /branches/gui_testing: ./ scripts/optimisation_testing.py specific_fns/model_free/molmol.py -- August 11, 2011 - 10:18

Author: bugman
Date: Thu Aug 11 10:18:12 2011
New Revision: 14337

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

........
  r14335 | bugman | 2011-08-11 10:13:18 +0200 (Thu, 11 Aug 2011) | 6 lines
  
  Bug fix for the molmol.write user function for model-free parameters.
  
  Some of the parameters were using the ancient self.relax code path which 
was eliminated with the
  redesign of relax 1.2 to 1.3.
........
  r14336 | bugman | 2011-08-11 10:16:24 +0200 (Thu, 11 Aug 2011) | 5 lines
  
  Fixes for the old scripts/optimisation_testing.py script.
  
  This was also using the ancient self.relax code path.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/scripts/optimisation_testing.py
    branches/gui_testing/specific_fns/model_free/molmol.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 11 10:18:12 2011
@@ -1,1 +1,1 @@
-/1.3:1-14333
+/1.3:1-14336

Modified: branches/gui_testing/scripts/optimisation_testing.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/scripts/optimisation_testing.py?rev=14337&r1=14336&r2=14337&view=diff
==============================================================================
--- branches/gui_testing/scripts/optimisation_testing.py (original)
+++ branches/gui_testing/scripts/optimisation_testing.py Thu Aug 11 10:18:12 
2011
@@ -10,12 +10,6 @@
 
 # The testing class.
 mf = model_free.Mf('run')
-
-# Add the relax namespace to the class.
-mf.relax = self.relax
-
-# Don't quit.
-self.relax.interpreter._Interpreter__quit_flag = False
 
 # Execute the tests, storing the messages.
 tests = []

Modified: branches/gui_testing/specific_fns/model_free/molmol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/model_free/molmol.py?rev=14337&r1=14336&r2=14337&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/model_free/molmol.py (original)
+++ branches/gui_testing/specific_fns/model_free/molmol.py Thu Aug 11 
10:18:12 2011
@@ -472,7 +472,7 @@
             colour_end = 'blue'
 
         # Get the RGB colour array (swap the colours because of the inverted 
hyperbolic colour value).
-        rgb_array = self.relax.colour.linear_gradient(colour_value, 
colour_end, colour_start, colour_list)
+        rgb_array = linear_gradient(colour_value, colour_end, colour_start, 
colour_list)
 
         # Colour the peptide bond.
         self._molmol_classic_colour(res_num, width, rgb_array)
@@ -557,7 +557,7 @@
             colour_end = 'red'
 
         # Get the RGB colour array (swap the colours because of the inverted 
hyperbolic colour value).
-        rgb_array = self.relax.colour.linear_gradient(colour_value, 
colour_end, colour_start, colour_list)
+        rgb_array = linear_gradient(colour_value, colour_end, colour_start, 
colour_list)
 
         # Colour the peptide bond.
         self._molmol_classic_colour(res_num, width, rgb_array)