Author: bugman
Date: Wed Jul 20 16:02:41 2011
New Revision: 13782
URL: http://svn.gna.org/viewcvs/relax?rev=13782&view=rev
Log:
Merged revisions 13780 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r13780 | bugman | 2011-07-20 15:56:27 +0200 (Wed, 20 Jul 2011) | 6 lines
Bug fix - the pipe switching flag is now propagated all the way to the data
store add() method.
The flag was previously not sent to the method so that the creation of a
new data pipe always
resulted in a switch to that pipe. This bug is normally harmless.
........
Modified:
branches/gui_testing/ (props changed)
branches/gui_testing/generic_fns/pipes.py
Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 20 16:02:41 2011
@@ -1,1 +1,1 @@
-/1.3:1-13749
+/1.3:1-13781
Modified: branches/gui_testing/generic_fns/pipes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/pipes.py?rev=13782&r1=13781&r2=13782&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/pipes.py (original)
+++ branches/gui_testing/generic_fns/pipes.py Wed Jul 20 16:02:41 2011
@@ -81,8 +81,7 @@
'relax_fit': Relaxation curve fitting,
'relax_disp': Relaxation dispersion,
@type pipe_type: str
- @keyword switch: If True, this new pipe will be switched to,
otherwise the current data pipe
- will remain as is.
+ @keyword switch: If True, this new pipe will be switched to,
otherwise the current data pipe will remain as is.
@type switch: bool
"""
@@ -99,7 +98,7 @@
raise RelaxError("The frame order analysis is not available. Please
install the scipy Python package.")
# Add the data pipe.
- ds.add(pipe_name=pipe_name, pipe_type=pipe_type)
+ ds.add(pipe_name=pipe_name, pipe_type=pipe_type, switch=switch)
def cdp_name():
r13782 - in /branches/gui_testing: ./ generic_fns/pipes.py