r11882 - in /branches/bieri_gui/gui_bieri: misc.py settings.py -- December 17, 2010 - 17:53

Author: bugman
Date: Fri Dec 17 17:53:23 2010
New Revision: 11882

URL: http://svn.gna.org/viewcvs/relax?rev=11882&view=rev
Log:
Fix for the 'Parameter file setttings' dialog.

The columns could not be set to nothing, as the int() function was used to 
convert the value.  This
would result in a ValueError.  Instead the misc.gui_to_int() function has 
been written to perform
the proper conversion.


Modified:
    branches/bieri_gui/gui_bieri/misc.py
    branches/bieri_gui/gui_bieri/settings.py

Modified: branches/bieri_gui/gui_bieri/misc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/misc.py?rev=11882&r1=11881&r2=11882&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/misc.py (original)
+++ branches/bieri_gui/gui_bieri/misc.py Fri Dec 17 17:53:23 2010
@@ -54,3 +54,20 @@
 
     # Return the float.
     return result
+
+
+def gui_to_int(string):
+    """Convert the GUI obtained string to an int.
+
+    @param string:  The number in string form.
+    @type string:   str
+    @return:        The integer
+    @rtype:         int or None
+    """
+
+    # No input.
+    if string == '':
+        return None
+
+    # Convert.
+    return int(string)

Modified: branches/bieri_gui/gui_bieri/settings.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/settings.py?rev=11882&r1=11881&r2=11882&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/settings.py (original)
+++ branches/bieri_gui/gui_bieri/settings.py Fri Dec 17 17:53:23 2010
@@ -29,6 +29,7 @@
 # relax GUI module imports.
 from filedialog import openfile
 from message import error_message
+from misc import gui_to_int
 from paths import IMAGE_PATH
 
 
@@ -256,13 +257,13 @@
 
     def accept_settings(self, event): # change settings
         self.settings = []
-        self.settings.append(int(self.mol_nam.GetValue()))
-        self.settings.append(int(self.res_num_col.GetValue()))
-        self.settings.append(int(self.res_nam_col.GetValue()))
-        self.settings.append(int(self.spin_num_col.GetValue()))
-        self.settings.append(int(self.spin_nam_col.GetValue()))
-        self.settings.append(int(self.value_col.GetValue()))
-        self.settings.append(int(self.error_col.GetValue()))
+        self.settings.append(gui_to_int(self.mol_nam.GetValue()))
+        self.settings.append(gui_to_int(self.res_num_col.GetValue()))
+        self.settings.append(gui_to_int(self.res_nam_col.GetValue()))
+        self.settings.append(gui_to_int(self.spin_num_col.GetValue()))
+        self.settings.append(gui_to_int(self.spin_nam_col.GetValue()))
+        self.settings.append(gui_to_int(self.value_col.GetValue()))
+        self.settings.append(gui_to_int(self.error_col.GetValue()))
         self.Destroy()