Author: bugman
Date: Fri Aug 5 14:12:16 2011
New Revision: 14175
URL: http://svn.gna.org/viewcvs/relax?rev=14175&view=rev
Log:
Some more SetValue calls are having the data pass through str_to_gui() first.
Modified:
branches/gui_testing/gui/user_functions/sequence.py
branches/gui_testing/gui/user_functions/spectrum.py
branches/gui_testing/gui/user_functions/spin.py
branches/gui_testing/gui/user_functions/structure.py
branches/gui_testing/test_suite/gui_tests/model_free.py
Modified: branches/gui_testing/gui/user_functions/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/sequence.py?rev=14175&r1=14174&r2=14175&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/sequence.py (original)
+++ branches/gui_testing/gui/user_functions/sequence.py Fri Aug 5 14:12:16
2011
@@ -208,7 +208,7 @@
# The column separator.
self.sep = self.combo_box(sizer, "Column separator:", ["white
space", ",", ";", ":", ""], tooltip=self.uf._doc_args_dict['sep'],
read_only=False)
- self.sep.SetValue("white space")
+ self.sep.SetValue(str_to_gui("white space"))
# The column flags.
self.mol_name_flag = self.boolean_selector(sizer, "Molecule name
flag:", tooltip=self.uf._doc_args_dict['mol_name_flag'])
Modified: branches/gui_testing/gui/user_functions/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/spectrum.py?rev=14175&r1=14174&r2=14175&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/spectrum.py (original)
+++ branches/gui_testing/gui/user_functions/spectrum.py Fri Aug 5 14:12:16
2011
@@ -256,12 +256,12 @@
# The heteronucleus and proton.
self.heteronuc = self.input_field(sizer, "The heternucleus name:",
tooltip=self.uf._doc_args_dict['heteronuc'])
self.proton = self.input_field(sizer, "The heternucleus name:",
tooltip=self.uf._doc_args_dict['proton'])
- self.heteronuc.SetValue('N')
- self.proton.SetValue('H')
+ self.heteronuc.SetValue(str_to_gui('N'))
+ self.proton.SetValue(str_to_gui('H'))
# The integration method.
self.int_method = self.combo_box(sizer, "The peak integration
method:", tooltip=self.uf._doc_args_dict['int_method'], choices=['height',
'point sum', 'other'])
- self.int_method.SetValue('height')
+ self.int_method.SetValue(str_to_gui('height'))
# The integration column.
self.int_col = self.input_field(sizer, "The integration column:",
tooltip=self.uf._doc_args_dict['int_col'])
Modified: branches/gui_testing/gui/user_functions/spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/spin.py?rev=14175&r1=14174&r2=14175&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/spin.py (original)
+++ branches/gui_testing/gui/user_functions/spin.py Fri Aug 5 14:12:16 2011
@@ -76,11 +76,11 @@
# Default molecule name.
if mol_name:
- page.mol.SetValue(mol_name)
+ page.mol.SetValue(str_to_gui(mol_name))
# Default residue.
if res_num or res_name:
- page.res.SetValue("%s %s" % (res_num, res_name))
+ page.res.SetValue(str_to_gui("%s %s" % (res_num, res_name)))
# Execute the wizard.
wizard.run()
@@ -124,15 +124,15 @@
# Default molecule name.
if mol_name:
- page.mol.SetValue(mol_name)
+ page.mol.SetValue(str_to_gui(mol_name))
# Default residue.
if res_num or res_name:
- page.res.SetValue("%s %s" % (res_num, res_name))
+ page.res.SetValue(str_to_gui("%s %s" % (res_num, res_name)))
# Default spin.
if spin_num or spin_name:
- page.spin.SetValue("%s %s" % (spin_num, spin_name))
+ page.spin.SetValue(str_to_gui("%s %s" % (spin_num, spin_name)))
# Execute the wizard.
wizard.run()
@@ -442,7 +442,7 @@
# The pos averaging.
self.averaging = self.combo_box(sizer, "The positional averaging:",
tooltip=self.uf._doc_args_dict['averaging'], choices=['linear'])
- self.averaging.SetValue('linear')
+ self.averaging.SetValue(str_to_gui('linear'))
def on_execute(self):
@@ -563,7 +563,7 @@
# The force flag.
self.force = self.boolean_selector(sizer, "The force flag:",
tooltip=self.uf._doc_args_dict['force'])
- self.force.SetValue('False')
+ self.force.SetValue(str_to_gui('False'))
def on_execute(self):
@@ -601,7 +601,7 @@
# The force flag.
self.force = self.boolean_selector(sizer, "The force flag:",
tooltip=self.uf._doc_args_dict['force'])
- self.force.SetValue('False')
+ self.force.SetValue(str_to_gui('False'))
def on_execute(self):
@@ -639,7 +639,7 @@
# The force flag.
self.force = self.boolean_selector(sizer, "The force flag:",
tooltip=self.uf._doc_args_dict['force'])
- self.force.SetValue('False')
+ self.force.SetValue(str_to_gui('False'))
def on_execute(self):
Modified: branches/gui_testing/gui/user_functions/structure.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/structure.py?rev=14175&r1=14174&r2=14175&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/structure.py (original)
+++ branches/gui_testing/gui/user_functions/structure.py Fri Aug 5 14:12:16
2011
@@ -164,7 +164,7 @@
# The ave_pos arg.
self.ave_pos = self.boolean_selector(sizer, "Average the atom
position across models:", tooltip=self.uf._doc_args_dict['ave_pos'])
- self.ave_pos.SetValue('True')
+ self.ave_pos.SetValue(str_to_gui('True'))
def on_execute(self):
@@ -210,7 +210,7 @@
# The PDB reader (default to internal).
self.parser = self.combo_box(sizer, "The PDB parser:",
choices=['internal', 'scientific'], tooltip=self.uf._doc_args_dict['parser'])
- self.parser.SetValue('internal')
+ self.parser.SetValue(str_to_gui('internal'))
def on_execute(self):
@@ -290,11 +290,11 @@
# The average.
self.ave = self.boolean_selector(sizer, "Average the vector across
models:", tooltip=self.uf._doc_args_dict['ave'])
- self.ave.SetValue('True')
+ self.ave.SetValue(str_to_gui('True'))
# The unit flag.
self.unit = self.boolean_selector(sizer, "Calculate unit vectors:",
tooltip=self.uf._doc_args_dict['unit'])
- self.unit.SetValue('True')
+ self.unit.SetValue(str_to_gui('True'))
def on_execute(self):
Modified: branches/gui_testing/test_suite/gui_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/gui_tests/model_free.py?rev=14175&r1=14174&r2=14175&view=diff
==============================================================================
--- branches/gui_testing/test_suite/gui_tests/model_free.py (original)
+++ branches/gui_testing/test_suite/gui_tests/model_free.py Fri Aug 5
14:12:16 2011
@@ -49,7 +49,7 @@
self.gui.analysis.menu_new(None)
page = self.gui.analysis.new_wizard.wizard.get_page(0)
page.select_mf(None)
- page.analysis_name.SetValue("Model-free test")
+ page.analysis_name.SetValue(str_to_gui("Model-free test"))
self.gui.analysis.new_wizard.wizard._go_next(None)
page = self.gui.analysis.new_wizard.wizard.get_page(1)
self.gui.analysis.new_wizard.wizard._go_next(None)
r14175 - in /branches/gui_testing: gui/user_functions/ test_suite/gui_tests/