r12084 - /branches/bieri_gui/gui_bieri/user_functions/mol_res_spin.py -- December 31, 2010 - 17:59

Author: bugman
Date: Fri Dec 31 17:59:38 2010
New Revision: 12084

URL: http://svn.gna.org/viewcvs/relax?rev=12084&view=rev
Log:
Modified _get_res_info() to be able to handle either 1 or 2 data structures 
for the residue ID.


Modified:
    branches/bieri_gui/gui_bieri/user_functions/mol_res_spin.py

Modified: branches/bieri_gui/gui_bieri/user_functions/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/user_functions/mol_res_spin.py?rev=12084&r1=12083&r2=12084&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/user_functions/mol_res_spin.py (original)
+++ branches/bieri_gui/gui_bieri/user_functions/mol_res_spin.py Fri Dec 31 
17:59:38 2010
@@ -32,6 +32,7 @@
 
 # GUI module imports.
 from base import UF_base, UF_window
+from gui_bieri.misc import gui_to_int, gui_to_str
 from gui_bieri.paths import WIZARD_IMAGE_PATH
 
 
@@ -72,24 +73,36 @@
         @rtype:             int, str
         """
 
-        # The residue info.
-        obj = getattr(self, 'res'+suffix)
-        res = str(obj.GetValue())
-
-        # Nothing.
-        if res == '':
-            return
-
-        # Split.
-        res_num, res_name = split(res)
-
-        # Convert.
-        if res_name == '':
-            res_name = None
-        if res_num == '':
-            res_num = None
+        # Single residue object.
+        if hasattr(self, 'res'+suffix):
+            # The residue info.
+            obj = getattr(self, 'res'+suffix)
+            res = gui_to_str(obj.GetValue())
+
+            # Nothing.
+            if not res:
+                return
+
+            # Split.
+            res_num, res_name = split(res)
+
+            # Convert.
+            if res_name == '':
+                res_name = None
+            if res_num == '':
+                res_num = None
+            else:
+                res_num = int(res_num)
+
+        # 2 objects.
         else:
-            res_num = int(res_num)
+            # The residue number.
+            obj = getattr(self, 'res_num'+suffix)
+            res_num = gui_to_int(obj.GetValue())
+
+            # The residue name.
+            obj = getattr(self, 'res_name'+suffix)
+            res_name = gui_to_str(obj.GetValue())
 
         # Return the number and name.
         return res_num, res_name