Author: bugman
Date: Sun Apr 28 11:32:23 2013
New Revision: 19594
URL: http://svn.gna.org/viewcvs/relax?rev=19594&view=rev
Log:
Merged revisions 19592-19593 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19592 | bugman | 2013-04-22 23:50:29 +0200 (Mon, 22 Apr 2013) | 8 lines
Changed the 'Execute relax' button in all analyses in the GUI to 'Execute
analysis'.
It makes no sense to execute relax as relax has been executing during the
analysis initialisation
and the user setting up all the data for the analysis. This is a remnant
of ancient design of
Michael Bieri's GUI being a separate program to relax, which would execute
relax with the click of
this button.
........
r19593 | bugman | 2013-04-27 21:46:04 +0200 (Sat, 27 Apr 2013) | 7 lines
Restored the Py_INCREF() function call in the relaxation curve-fitting C
module.
This was deleted at r12632 along with Py_XDECREF() and Py_DECREF() calls.
The absence of a
Py_INCREF() function call causes the module to crash the Python interpreter
under certain
conditions. The problem was found in the relax_disp branch.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/gui/analyses/auto_model_free.py
branches/relax_disp/gui/analyses/auto_noe.py
branches/relax_disp/gui/analyses/auto_rx_base.py
branches/relax_disp/gui/analyses/base.py
branches/relax_disp/target_functions/relax_fit.c
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 28 11:32:23 2013
@@ -1,1 +1,1 @@
-/trunk:1-19590
+/trunk:1-19593
Modified: branches/relax_disp/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_model_free.py?rev=19594&r1=19593&r2=19594&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_model_free.py (original)
+++ branches/relax_disp/gui/analyses/auto_model_free.py Sun Apr 28 11:32:23
2013
@@ -548,7 +548,7 @@
box.AddStretchSpacer()
# Add the execution GUI element.
- self.button_exec_relax = self.add_execute_relax(box, self.execute)
+ self.button_exec_relax = self.add_execute_analysis(box, self.execute)
# Return the box.
return box
Modified: branches/relax_disp/gui/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_noe.py?rev=19594&r1=19593&r2=19594&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_noe.py (original)
+++ branches/relax_disp/gui/analyses/auto_noe.py Sun Apr 28 11:32:23 2013
@@ -212,7 +212,7 @@
box.AddStretchSpacer()
# Add the execution GUI element.
- self.button_exec_relax = self.add_execute_relax(box, self.execute)
+ self.button_exec_relax = self.add_execute_analysis(box, self.execute)
# Return the box.
return box
Modified: branches/relax_disp/gui/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_rx_base.py?rev=19594&r1=19593&r2=19594&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_rx_base.py (original)
+++ branches/relax_disp/gui/analyses/auto_rx_base.py Sun Apr 28 11:32:23 2013
@@ -227,7 +227,7 @@
box.AddStretchSpacer()
# Add the execution GUI element.
- self.button_exec_relax = self.add_execute_relax(box, self.execute)
+ self.button_exec_relax = self.add_execute_analysis(box, self.execute)
# Return the box.
return box
Modified: branches/relax_disp/gui/analyses/base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/base.py?rev=19594&r1=19593&r2=19594&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/base.py (original)
+++ branches/relax_disp/gui/analyses/base.py Sun Apr 28 11:32:23 2013
@@ -129,10 +129,10 @@
return button
- def add_execute_relax(self, box, method):
- """Create and add the relax execution GUI element to the given box.
-
- @param box: The box element to pack the relax execution GUI
element into.
+ def add_execute_analysis(self, box, method):
+ """Create and add the analysis execution GUI element to the given
box.
+
+ @param box: The box element to pack the analysis execution GUI
element into.
@type box: wx.BoxSizer instance
@param method: The method to execute when the button is clicked.
@type method: method
@@ -147,7 +147,7 @@
id = wx.NewId()
# The button.
- button = buttons.ThemedGenBitmapTextButton(self, id, None, " Execute
relax")
+ button = buttons.ThemedGenBitmapTextButton(self, id, None, " Execute
analysis")
button.SetBitmapLabel(wx.Bitmap(paths.IMAGE_PATH+'relax_start.gif',
wx.BITMAP_TYPE_ANY))
button.SetFont(font.normal)
self.gui.Bind(wx.EVT_BUTTON, method, button)
Modified: branches/relax_disp/target_functions/relax_fit.c
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_fit.c?rev=19594&r1=19593&r2=19594&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_fit.c (original)
+++ branches/relax_disp/target_functions/relax_fit.c Sun Apr 28 11:32:23 2013
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2012 Edward d'Auvergne
+ * Copyright (C) 2006-2013 Edward d'Auvergne
*
* This file is part of the program relax (http://www.nmr-relax.com).
*
@@ -76,6 +76,7 @@
}
/* Return nothing */
+ Py_INCREF(Py_None);
return Py_None;
}
r19594 - in /branches/relax_disp: ./ gui/analyses/ target_functions/