Author: bugman
Date: Tue Nov 15 14:36:02 2016
New Revision: 28279
URL: http://svn.gna.org/viewcvs/relax?rev=28279&view=rev
Log:
Keyword to positional argument conversion for the GUI
wx.ListCtrl.SetStringItem() function calls.
The keyword arguments for this function must exist for backwards
compatibility with ancient wxPython
versions. The current documentation lists them as positional arguments, and
keyword arguments are
not accepted by wxPython-Phoenix.
Modified:
trunk/devel_scripts/memory_management/GUI_uf_align_tensor_init.py
trunk/gui/input_elements/sequence.py
trunk/test_suite/gui_tests/test_user_functions.py
Modified: trunk/devel_scripts/memory_management/GUI_uf_align_tensor_init.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/memory_management/GUI_uf_align_tensor_init.py?rev=28279&r1=28278&r2=28279&view=diff
==============================================================================
--- trunk/devel_scripts/memory_management/GUI_uf_align_tensor_init.py
(original)
+++ trunk/devel_scripts/memory_management/GUI_uf_align_tensor_init.py Tue
Nov 15 14:36:02 2016
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2015 Edward d'Auvergne
#
+# Copyright (C) 2015-2016 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -58,7 +58,7 @@
# Set the parameters.
uf.page.uf_args['params'].SetValue(str_to_gui('(0.00000,
-0.00017, 0.00016, 0.00060, -0.00019)'))
uf.page.uf_args['params'].selection_win_show()
-
uf.page.uf_args['params'].sel_win.sequence.SetStringItem(index=0, col=1,
label=float_to_gui(0.00037))
+ uf.page.uf_args['params'].sel_win.sequence.SetStringItem(0, 1,
float_to_gui(0.00037))
uf.page.uf_args['params'].selection_win_data()
# Set up the other tensor data.
Modified: trunk/gui/input_elements/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/sequence.py?rev=28279&r1=28278&r2=28279&view=diff
==============================================================================
--- trunk/gui/input_elements/sequence.py (original)
+++ trunk/gui/input_elements/sequence.py Tue Nov 15 14:36:02 2016
@@ -611,7 +611,7 @@
for i in range(len(values)):
# Fixed dimension sequences - set the values of the pre-created
list.
if not self.variable_length:
- self.sequence.SetStringItem(index=i, col=1,
label=self.convert_to_gui(values[i]))
+ self.sequence.SetStringItem(i, 1,
self.convert_to_gui(values[i]))
# Variable dimension sequences - append the item to the end of
the blank list.
else:
@@ -621,7 +621,7 @@
self.sequence.InsertStringItem(i, int_to_gui(i+1))
# Then set the value.
- self.sequence.SetStringItem(index=i, col=1,
label=self.convert_to_gui(values[i]))
+ self.sequence.SetStringItem(i, 1,
self.convert_to_gui(values[i]))
def add_buttons(self, sizer):
Modified: trunk/test_suite/gui_tests/test_user_functions.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/test_user_functions.py?rev=28279&r1=28278&r2=28279&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/test_user_functions.py (original)
+++ trunk/test_suite/gui_tests/test_user_functions.py Tue Nov 15 14:36:02
2016
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2012-2014 Edward d'Auvergne
#
+# Copyright (C) 2012-2016 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -70,7 +70,7 @@
# Set the y-value of a single point, and check.
uf.page.uf_args['point'].selection_win_show()
- uf.page.uf_args['point'].sel_win.sequence.SetStringItem(index=0,
col=2, label=int_to_gui(2))
+ uf.page.uf_args['point'].sel_win.sequence.SetStringItem(0, 2,
int_to_gui(2))
uf.page.uf_args['point'].selection_win_data()
points = uf.page.uf_args['point'].GetValue()
print("Points: %s" % points)
@@ -133,8 +133,8 @@
for val in ['x']:
uf.page.uf_args['point'].SetValue(str_to_gui(''))
uf.page.uf_args['point'].selection_win_show()
- uf.page.uf_args['point'].sel_win.sequence.SetStringItem(index=0,
col=2, label=str_to_gui(val))
- uf.page.uf_args['point'].sel_win.sequence.SetStringItem(index=0,
col=1, label=int_to_gui(1))
+ uf.page.uf_args['point'].sel_win.sequence.SetStringItem(0, 2,
str_to_gui(val))
+ uf.page.uf_args['point'].sel_win.sequence.SetStringItem(0, 1,
int_to_gui(1))
uf.page.uf_args['point'].selection_win_data()
points = uf.page.uf_args['point'].GetValue()
print("Points: %s" % points)
@@ -202,7 +202,7 @@
# Set the y-value of a single pos, and check.
#uf.page.uf_args['pos'].selection_win_show()
- #uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(index=1,
col=1, label=int_to_gui(2))
+ #uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(1, 1,
int_to_gui(2))
#uf.page.uf_args['pos'].selection_win_data()
#pos = uf.page.uf_args['pos'].GetValue()
#print("Pos: %s" % pos)
@@ -252,8 +252,8 @@
uf.page.uf_args['pos'].SetValue(str_to_gui(''))
uf.page.uf_args['pos'].selection_win_show()
uf.page.uf_args['pos'].sel_win.add_element()
- uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(index=1,
col=1, label=str_to_gui(val))
- uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(index=0,
col=1, label=int_to_gui(1))
+ uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(1, 1,
str_to_gui(val))
+ uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(0, 1,
int_to_gui(1))
uf.page.uf_args['pos'].selection_win_data()
pos = uf.page.uf_args['pos'].GetValue()
sys.stdout.write("Return: %40s\n" % repr(pos))
@@ -282,15 +282,15 @@
uf.page.SetValue('read_model', str_to_gui('6'))
uf.page.uf_args['read_model'].selection_win_show()
uf.page.uf_args['read_model'].sel_win.add_element(None)
-
uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(index=0, col=1,
label=int_to_gui(2))
-
uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(index=1, col=1,
label=int_to_gui(4))
+ uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(0, 1,
int_to_gui(2))
+ uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(1, 1,
int_to_gui(4))
uf.page.uf_args['read_model'].selection_win_data()
# Renumber the models.
uf.page.uf_args['set_model_num'].selection_win_show()
uf.page.uf_args['set_model_num'].sel_win.add_element(None)
-
uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(index=0,
col=1, label=int_to_gui(1))
-
uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(index=1,
col=1, label=int_to_gui(3))
+ uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(0,
1, int_to_gui(1))
+ uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(1,
1, int_to_gui(3))
uf.page.uf_args['set_model_num'].selection_win_data()
# GUI data checks.
@@ -327,15 +327,15 @@
uf.page.SetValue('read_model', str_to_gui('6'))
uf.page.uf_args['read_model'].selection_win_show()
uf.page.uf_args['read_model'].sel_win.add_element(None)
-
uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(index=0, col=1,
label=int_to_gui(2))
-
uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(index=1, col=1,
label=int_to_gui(4))
+ uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(0, 1,
int_to_gui(2))
+ uf.page.uf_args['read_model'].sel_win.sequence.SetStringItem(1, 1,
int_to_gui(4))
uf.page.uf_args['read_model'].selection_win_data()
# Renumber the models.
uf.page.uf_args['set_model_num'].selection_win_show()
uf.page.uf_args['set_model_num'].sel_win.add_element(None)
-
uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(index=0,
col=1, label=int_to_gui(1))
-
uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(index=1,
col=1, label=int_to_gui(3))
+ uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(0,
1, int_to_gui(1))
+ uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(1,
1, int_to_gui(3))
uf.page.uf_args['set_model_num'].selection_win_data()
# GUI data checks.
@@ -352,7 +352,7 @@
# Change the rotation matrix in the Sequence_2D window, without
changing anything, then check it.
uf.page.uf_args['R'].selection_win_show()
- uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=1, col=1,
label=int_to_gui(2))
+ uf.page.uf_args['R'].sel_win.sequence.SetStringItem(1, 1,
int_to_gui(2))
uf.page.uf_args['R'].selection_win_data()
R = uf.page.uf_args['R'].GetValue()
print("Rotation matrix:\n%s" % R)
@@ -371,7 +371,7 @@
# Set the rotation matrix to nothing in the wizard, open the
Sequence_2D window, set a value, close the window, and check what happens.
uf.page.uf_args['R'].SetValue(str_to_gui(''))
uf.page.uf_args['R'].selection_win_show()
- uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=1, col=1,
label=int_to_gui(2))
+ uf.page.uf_args['R'].sel_win.sequence.SetStringItem(1, 1,
int_to_gui(2))
uf.page.uf_args['R'].selection_win_data()
R = uf.page.uf_args['R'].GetValue()
print("Rotation matrix:\n%s" % R)
@@ -408,8 +408,8 @@
for val in ['x']:
uf.page.uf_args['R'].SetValue(str_to_gui(''))
uf.page.uf_args['R'].selection_win_show()
- uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=1,
col=1, label=str_to_gui(val))
- uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=0,
col=0, label=int_to_gui(1))
+ uf.page.uf_args['R'].sel_win.sequence.SetStringItem(1, 1,
str_to_gui(val))
+ uf.page.uf_args['R'].sel_win.sequence.SetStringItem(0, 0,
int_to_gui(1))
uf.page.uf_args['R'].selection_win_data()
R = uf.page.uf_args['R'].GetValue()
print("Rotation matrix:\n%s" % R)
r28279 - in /trunk: devel_scripts/memory_management/ gui/input_elements/ test_suite/gui_tests/