r14293 - in /branches/gui_testing: ./ generic_fns/grace.py generic_fns/pymol_control.py -- August 09, 2011 - 14:43

Author: bugman
Date: Tue Aug  9 14:43:27 2011
New Revision: 14293

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

........
  r14285 | bugman | 2011-08-09 12:07:39 +0200 (Tue, 09 Aug 2011) | 3 lines
  
  The pymol.tensor_pdb() user function now shows the diffusion tensor using 
PyMOL sticks.
........
  r14292 | bugman | 2011-08-09 14:42:06 +0200 (Tue, 09 Aug 2011) | 3 lines
  
  Bug fix for the xydxdy type Grace graphs - the dx data was not being placed 
in the file.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/generic_fns/grace.py
    branches/gui_testing/generic_fns/pymol_control.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug  9 14:43:27 2011
@@ -1,1 +1,1 @@
-/1.3:1-14262
+/1.3:1-14292

Modified: branches/gui_testing/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/grace.py?rev=14293&r1=14292&r2=14293&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/grace.py (original)
+++ branches/gui_testing/generic_fns/grace.py Tue Aug  9 14:43:27 2011
@@ -425,7 +425,7 @@
                 file.write("%-30s %-30s" % (point[0], point[1]/norm_fact))
 
                 # The dx and dy errors.
-                if graph_type in ['xydx', 'xydy']:
+                if graph_type in ['xydx', 'xydy', 'xydxdy']:
                     # Catch x or y-axis errors of None.
                     error = point[2]
                     if error == None:

Modified: branches/gui_testing/generic_fns/pymol_control.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/pymol_control.py?rev=14293&r1=14292&r2=14293&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/pymol_control.py (original)
+++ branches/gui_testing/generic_fns/pymol_control.py Tue Aug  9 14:43:27 2011
@@ -382,6 +382,19 @@
     pymol_obj.exec_cmd("load " + file)
 
 
+    # The tensor object.
+    ####################
+
+    # Select the TNS residue.
+    pymol_obj.exec_cmd("select resn TNS")
+
+    # Hide everything.
+    pymol_obj.exec_cmd("hide ('sele')")
+
+    # Show as 'sticks'.
+    pymol_obj.exec_cmd("show sticks, 'sele'")
+
+
     # Centre of mass.
     #################