r14607 - in /1.3/gui/user_functions: mol_res_spin.py molecule.py residue.py spin.py -- September 08, 2011 - 11:22

Author: bugman
Date: Thu Sep  8 11:22:59 2011
New Revision: 14607

URL: http://svn.gna.org/viewcvs/relax?rev=14607&view=rev
Log:
Added checks for a current data pipe to a number of GUI user function pages.

This prevents relax errors when trying to launch the user functions but when 
no data pipes exist.


Modified:
    1.3/gui/user_functions/mol_res_spin.py
    1.3/gui/user_functions/molecule.py
    1.3/gui/user_functions/residue.py
    1.3/gui/user_functions/spin.py

Modified: 1.3/gui/user_functions/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/user_functions/mol_res_spin.py?rev=14607&r1=14606&r2=14607&view=diff
==============================================================================
--- 1.3/gui/user_functions/mol_res_spin.py (original)
+++ 1.3/gui/user_functions/mol_res_spin.py Thu Sep  8 11:22:59 2011
@@ -28,7 +28,7 @@
 
 # relax module imports.
 from generic_fns.mol_res_spin import generate_spin_id, residue_loop, 
spin_loop
-from generic_fns import pipes
+from generic_fns.pipes import cdp_name
 
 # GUI module imports.
 from base import UF_base
@@ -195,8 +195,9 @@
 
         # The list of residue names.
         mol_id = generate_spin_id(str(self.mol.GetValue()))
-        for res in residue_loop(mol_id):
-            self.res.Append(str_to_gui("%s %s" % (res.num, res.name)))
+        if cdp_name():
+            for res in residue_loop(mol_id):
+                self.res.Append(str_to_gui("%s %s" % (res.num, res.name)))
 
 
     def _update_spins(self, event):
@@ -218,5 +219,6 @@
             return
 
         # Build the list of spin names.
-        for spin in spin_loop(res_id):
-            self.spin.Append(str_to_gui("%s %s" % (spin.num, spin.name)))
+        if cdp_name():
+            for spin in spin_loop(res_id):
+                self.spin.Append(str_to_gui("%s %s" % (spin.num, spin.name)))

Modified: 1.3/gui/user_functions/molecule.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/user_functions/molecule.py?rev=14607&r1=14606&r2=14607&view=diff
==============================================================================
--- 1.3/gui/user_functions/molecule.py (original)
+++ 1.3/gui/user_functions/molecule.py Thu Sep  8 11:22:59 2011
@@ -171,8 +171,9 @@
         self.mol_from.Clear()
 
         # The list of molecule names.
-        for mol in molecule_loop(pipe=pipe_from):
-            self.mol_from.Append(str_to_gui(mol.name))
+        if cdp_name():
+            for mol in molecule_loop(pipe=pipe_from):
+                self.mol_from.Append(str_to_gui(mol.name))
 
 
 

Modified: 1.3/gui/user_functions/residue.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/user_functions/residue.py?rev=14607&r1=14606&r2=14607&view=diff
==============================================================================
--- 1.3/gui/user_functions/residue.py (original)
+++ 1.3/gui/user_functions/residue.py Thu Sep  8 11:22:59 2011
@@ -200,10 +200,11 @@
         self.mol_to.Clear()
 
         # The list of molecule names.
-        for mol in molecule_loop(pipe=pipe_from):
-            self.mol_from.Append(str_to_gui(mol.name))
-        for mol in molecule_loop(pipe=pipe_to):
-            self.mol_to.Append(str_to_gui(mol.name))
+        if cdp_name():
+            for mol in molecule_loop(pipe=pipe_from):
+                self.mol_from.Append(str_to_gui(mol.name))
+            for mol in molecule_loop(pipe=pipe_to):
+                self.mol_to.Append(str_to_gui(mol.name))
 
         # Update the residues too.
         self.update_res_list()
@@ -228,8 +229,9 @@
             return
 
         # The list of molecule names.
-        for res in residue_loop(mol_from, pipe=pipe_from):
-            self.res_from.Append(str_to_gui("%s %s" % (res.num, res.name)))
+        if cdp_name():
+            for res in residue_loop(mol_from, pipe=pipe_from):
+                self.res_from.Append(str_to_gui("%s %s" % (res.num, 
res.name)))
 
 
 

Modified: 1.3/gui/user_functions/spin.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/user_functions/spin.py?rev=14607&r1=14606&r2=14607&view=diff
==============================================================================
--- 1.3/gui/user_functions/spin.py (original)
+++ 1.3/gui/user_functions/spin.py Thu Sep  8 11:22:59 2011
@@ -291,10 +291,11 @@
         self.mol_to.Clear()
 
         # The list of molecule names.
-        for mol in molecule_loop(pipe=pipe_from):
-            self.mol_from.Append(str_to_gui(mol.name))
-        for mol in molecule_loop(pipe=pipe_to):
-            self.mol_to.Append(str_to_gui(mol.name))
+        if cdp_name():
+            for mol in molecule_loop(pipe=pipe_from):
+                self.mol_from.Append(str_to_gui(mol.name))
+            for mol in molecule_loop(pipe=pipe_to):
+                self.mol_to.Append(str_to_gui(mol.name))
 
         # Update the residues too.
         self.update_res_list()
@@ -319,8 +320,9 @@
             return
 
         # The list of molecule names.
-        for res in residue_loop(mol_from, pipe=pipe_from):
-            self.res_from.Append(str_to_gui("%s %s" % (res.num, res.name)))
+        if cdp_name():
+            for res in residue_loop(mol_from, pipe=pipe_from):
+                self.res_from.Append(str_to_gui("%s %s" % (res.num, 
res.name)))
 
         # Update the spins too.
         self.update_spin_list()
@@ -345,8 +347,9 @@
             return
 
         # The list of molecule names.
-        for spin in spin_loop(res_from, pipe=pipe_from):
-            self.spin_from.Append(str_to_gui("%s %s" % (spin.num, 
spin.name)))
+        if cdp_name():
+            for spin in spin_loop(res_from, pipe=pipe_from):
+                self.spin_from.Append(str_to_gui("%s %s" % (spin.num, 
spin.name)))