Hi Michael,
I think I'll avoid applying 100% of the patch as there are some parts
that I would prefer not to have in the code base. There are the
following:
<<<<<
Index: gui_bieri/__init__.py
===================================================================
--- gui_bieri/__init__.py (revision 10210)
+++ gui_bieri/__init__.py (working copy)
@@ -33,6 +33,8 @@
from relax_gui import about_relax, main
+
+
__all__ = ['relax_gui']
__doc__ = \
@@ -77,3 +79,4 @@
relaxGUI.SetTopWindow(relaxGUI_main)
relaxGUI_main.Show()
relaxGUI.MainLoop()
+
This just adds empty lines which make the spacing worse.
<<<<<
Index: gui_bieri/res/calc_rx.py
===================================================================
--- gui_bieri/res/calc_rx.py (revision 10210)
+++ gui_bieri/res/calc_rx.py (working copy)
@@ -32,8 +32,8 @@
# relax module imports.
from float import floatAsByteArray
-from generic_fns.mol_res_spin import generate_spin_id,
spin_index_loop, spin_loop
-from generic_fns import pipes
+from generic_fns.mol_res_spin import generate_spin_id,
spin_index_loop, spin_loop, spin_loop
+from generic_fns import *
import generic_fns.structure.main
This is not how imports should be done. In the first, spin_loop is
imported twice. In the second, the '*' notation is used. This change
is repeated in gui_bieri/res/calc_noe.py and
gui_bieri/res/calc_modelfree.py.
<<<<<
Index: gui_bieri/res/calc_modelfree.py
===================================================================
--- gui_bieri/res/calc_modelfree.py (revision 10210)
+++ gui_bieri/res/calc_modelfree.py (working copy)
@@ -69,16 +81,17 @@
num_field = 2
if self.aic.GetValue() == True:
- selection = "AIC"
+ selection1 = "AIC"
if self.bic.GetValue() == True:
- selection = "BIC"
+ selection1 = "BIC"
Here I cannot determine why this variable has been renamed. Is this
important? Does the '1' have a meaning?
<<<<<
Index: gui_bieri/res/results_analysis.py
===================================================================
--- gui_bieri/res/results_analysis.py (revision 10210)
+++ gui_bieri/res/results_analysis.py (working copy)
@@ -21,122 +21,148 @@
#
#
###############################################################################
-# Graphical User Interface for relax
-
# Python module imports.
from os import getcwd, listdir, sep
from re import search
from string import lower
import wx
import time
-import res
from string import replace
-from string import lowercase
-from os import getcwd, sep
+import time
import sys
import os
-import webbrowser
+import wx
+import wx.grid
-# relax module imports.
-from float import floatAsByteArray
-from generic_fns.mol_res_spin import generate_spin_id,
spin_index_loop, spin_loop
-from generic_fns import pipes
-from relax_errors import RelaxError
+# relax modeule import
+from generic_fns.mol_res_spin import spin_loop
This needs cleaning up. I will try breaking the patch up even more
too help me catch additional problems.
Regards,
Edward
2010/1/14 Edward d Auvergne <NO-REPLY.INVALID-ADDRESS@xxxxxxx>:
Follow-up Comment #12, task #6847 (project relax):
This file is essentially patch_II (file #7620) with the following changes
removed:
- The '/' to os.sep fix (applied in commit r10206,
https://mail.gna.org/public/relax-commits/2010-01/msg00108.html)
- The [Tt][12x] to [Rr][12x] change (applied in commit r10207,
https://mail.gna.org/public/relax-commits/2010-01/msg00109.html).
Note that these two commits included more changes than just those in
patch_II. Therefore the branch was reverted to r10205 by typing:
$ svn up -r10205
Then the patch applied cleanly by:
$ patch -p0 < patch_II
Then the branch updated:
$ svn up
And finally all the conflicts resolved. This procedure can be used for
separating out other components of patch_III.
(file #7673)
_______________________________________________________
Additional Item Attachment:
File name: patch_III Size:400 KB
_______________________________________________________
Reply to this item at:
<http://gna.org/task/?6847>
_______________________________________________
Message sent via/by Gna!
http://gna.org/
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
relax-devel@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel
Re: [task #6847] The Bieri graphical user interface.