The patches here appear to apply to r10247, and not r10120. I'll
apply them against this version using:
$ svn up -r10247
$ patch -p0 < xxx_patch
$ svn up
[fix conflicts]
$ svn ci
and then repeat this for all patched. Actually, they are failing for
r10247 too. Do you know which revision these patches apply cleanly
to? If you type 'svn info' in the branch where you have created these
patches, it should say. I'll try applying these in reverse, maybe
that will help.
Cheers,
Edward
2010/1/19 Michael Bieri <NO-REPLY.INVALID-ADDRESS@xxxxxxx>:
Follow-up Comment #20, task #6847 (project relax):
Hi Edward
I collected all the missing patches:
relax_log_window_start_patch:
Opening the relaxGUI Log Window after pushing start-relax button
added:
+from res.project import create_save_file, open_file
+from res.relax_control import start_rx, start_noe
changed:
make_noe() to start_noe()
make_rx() to start_rx()
_________________________________
calc_noe_patch:
Created feedback to relaxGUI Log Window during NOE calculation
added:
class RedirectText --> redirect the relax output to relaxGUI Log Window
# Number of Monte Carlo simulations
global montecarlo
montecarlo = int(global_setting[6])
--> set monte carlo value for updating progress bar in log window
# value for progress bar during monte carlo simulation
global progress
progress = 5.0
--> initial progress value before monte carlo simulation
# redirect relax output and errors to relaxGUI - log panel
redir=RedirectText(self)
sys.stdout=redir
sys.stderr=redir
redirecting system output and error to new created class that updates log
window
_________________________________
calc_rx_patch:
Created feedback to relaxGUI Log Window during Rx calculation
added:
class RedirectText --> redirect the relax output to relaxGUI Log Window
# Number of Monte Carlo simulations
global montecarlo
montecarlo = int(global_setting[6])
--> set monte carlo value for updating progress bar in log window
# value for progress bar during monte carlo simulation
global progress
progress = 5.0
--> initial progress value before monte carlo simulation
# redirect relax output and errors to relaxGUI - log panel
redir=RedirectText(self)
sys.stdout=redir
sys.stderr=redir
redirecting system output and error to new created class that updates log
window
-------------------------------------------------
removed_tab_in_modelfree_patch:
replaced tabulators to 4 space characters in calc_model_free.py
----------------------------------------------------
mkdir_patch:
replaced os.sytem('mkdir ' + ....) to os.mkdir()
--------------------------------------------------
statusbar_size_patch:
increased the size of the 3. cell of the status bar. Now 'repository
checkout' is fully displaid
-------------------------------------------------
import_patch:
replaced form xxxx import * with from xxx import yyy, aaa.... in
relax_gui.py
------------------------ ------------------------
application_patch:
about relaxGUI panel does not create own wx application
removed:
about.py:
- app = wx.PySimpleApp(0)
- wx.InitAllImageHandlers()
- start = MyFrame(None, -1, "")
- app.SetTopWindow(start)
- start.Show()
- app.MainLoop()
changed:
xw.Frame to wx.Dialog in about.py
moved:
in __init__.py (main folder)
+ # start wx Application
+ relaxGUI = wx.PySimpleApp(0)
+ wx.InitAllImageHandlers()
--> to start one wx application for about panel and main relaxGUI window
-----------------------------------
The patches are in the compressed file below.
Cheers
Michael
(file #7726)
_______________________________________________________
Additional Item Attachment:
File name: 100120_patches.zip Size:20 KB
_______________________________________________________
Reply to this item at:
<http://gna.org/task/?6847>
_______________________________________________
Nachricht geschickt von/durch 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.