r14330 - in /branches/gui_testing: ./ specific_fns/model_free/molmol.py -- August 11, 2011 - 08:46

Author: bugman
Date: Thu Aug 11 08:46:53 2011
New Revision: 14330

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

........
  r14329 | bugman | 2011-08-11 08:45:10 +0200 (Thu, 11 Aug 2011) | 3 lines
  
  Bug fix for the molmol macro user functions - one of the args 'param' 
should have been 'data_type'.
........

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

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 11 08:46:53 2011
@@ -1,1 +1,1 @@
-/1.3:1-14324
+/1.3:1-14329

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=14330&r1=14329&r2=14330&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/model_free/molmol.py (original)
+++ branches/gui_testing/specific_fns/model_free/molmol.py Thu Aug 11 
08:46:53 2011
@@ -111,7 +111,7 @@
     def _molmol_classic_style(self, data_type=None, colour_start=None, 
colour_end=None, colour_list=None, spin_id=None):
         """The MOLMOL classic style.
 
-        @keyword data_type:     The parameter name.
+        @keyword data_type:     The parameter name or data type.
         @type data_type:        str
         @keyword colour_start:  The starting colour (must be a MOLMOL or X11 
name).
         @type colour_start:     str
@@ -563,11 +563,11 @@
         self._molmol_classic_colour(res_num, width, rgb_array)
 
 
-    def molmol_macro(self, param, style=None, colour_start=None, 
colour_end=None, colour_list=None, spin_id=None):
+    def molmol_macro(self, data_type, style=None, colour_start=None, 
colour_end=None, colour_list=None, spin_id=None):
         """Create and return an array of Molmol macros of the model-free 
parameters.
 
-        @param param:           The parameter name.
-        @type param:            str
+        @param data_type:       The parameter name or data type.
+        @type data_type:        str
         @keyword style:         The Molmol style.
         @type style:            None or str
         @keyword colour_start:  The starting colour (must be a MOLMOL or X11 
name).