r25181 - in /branches/frame_order_cleanup: ./ gui/components/spectrum.py -- August 21, 2014 - 17:28

Author: bugman
Date: Thu Aug 21 17:28:47 2014
New Revision: 25181

URL: http://svn.gna.org/viewcvs/relax?rev=25181&view=rev
Log:
Merged revisions 25178 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r25178 | bugman | 2014-08-21 17:23:52 +0200 (Thu, 21 Aug 2014) | 5 lines
  
  Fix for the relax_disp.spin_lock_offset user function in the dispersion GUI 
tab.
  
  This is in the spectrum list element popup menu.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/gui/components/spectrum.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 21 17:28:47 2014
@@ -1 +1 @@
-/trunk:1-25173,25175-25177
+/trunk:1-25180

Modified: branches/frame_order_cleanup/gui/components/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/components/spectrum.py?rev=25181&r1=25180&r2=25181&view=diff
==============================================================================
--- branches/frame_order_cleanup/gui/components/spectrum.py     (original)
+++ branches/frame_order_cleanup/gui/components/spectrum.py     Thu Aug 21 
17:28:47 2014
@@ -227,7 +227,7 @@
 
         # Launch the dialog.
         if offset_flag:
-            uf_store['relax_disp.spin_lock_offset'](field=offset, 
spectrum_id=id)
+            uf_store['relax_disp.spin_lock_offset'](offset=offset, 
spectrum_id=id)
         else:
             uf_store['relax_disp.spin_lock_offset'](spectrum_id=id)