mailRe: r22182 - in /trunk: relax.py status.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by Edward d'Auvergne on February 14, 2014 - 11:13:
Hi Troels,

Actually, I would suggest changing the text:

"execute the given script and continue into the prompt mode to allow
for interactive inspection"

to something like:

"launch relax in prompt mode after running any optionally supplied scripts"

This is simply to allow this option to be given without a script -
relax should support this so that a user doesn't get too confused when
trying to start in prompt mode with the --prompt flag.  This is the
second option at the bottom of my message at
http://thread.gmane.org/gmane.science.nmr.relax.devel/5000/focus=5012.
 We must support the --prompt argument without a script being
supplied.

Cheers,

Edward



On 14 February 2014 10:32,  <tlinnet@xxxxxxxxxxxxx> wrote:
Author: tlinnet
Date: Fri Feb 14 10:32:17 2014
New Revision: 22182

URL: http://svn.gna.org/viewcvs/relax?rev=22182&view=rev
Log:
Added the -p --prompt option for running a relax script and inspect 
interactively.

Fix for sr #3117, (https://gna.org/support/?3117) - Functionality to 
inspect interactively after running script - The equivalence to python -i

Modified:
    trunk/relax.py
    trunk/status.py

Modified: trunk/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/relax.py?rev=22182&r1=22181&r2=22182&view=diff
==============================================================================
--- trunk/relax.py (original)
+++ trunk/relax.py Fri Feb 14 10:32:17 2014
@@ -280,6 +280,7 @@
         parser.add_option('-t', '--tee', action='store', type='string', 
dest='tee', help='tee relax output to stdout and the file LOG_FILE', 
metavar='LOG_FILE')
         parser.add_option('-g', '--gui', action='store_true', dest='gui', 
default=0, help='launch the relax GUI')
         parser.add_option('-e', '--escalate', action='store_true', 
dest='escalate', default=0, help='escalate all warnings to errors')
+        parser.add_option('-p', '--prompt', action='store_true', 
dest='prompt', default=0, help='execute the given script and continue into 
the prompt mode to allow for interactive inspection')
         parser.add_option('--test', action='store_true', dest='test', 
default=0, help='run relax in test mode')
         parser.add_option('-x', '--test-suite', action='store_true', 
dest='test_suite', default=0, help='execute the relax test suite')
         parser.add_option('-s', '--system-tests', action='store_true', 
dest='system_tests', default=0, help='execute the relax system/functional 
tests (part of the test suite)')
@@ -305,6 +306,10 @@
         if options.escalate:
             status.escalate = True

+        # Script prompt interactive inspection flag.
+        if options.prompt:
+            status.prompt = True
+
         # Logging.
         if options.log:
             # Exclusive modes.

Modified: trunk/status.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/status.py?rev=22182&r1=22181&r2=22182&view=diff
==============================================================================
--- trunk/status.py (original)
+++ trunk/status.py Fri Feb 14 10:32:17 2014
@@ -52,6 +52,7 @@
             # Initialise some variables.
             self._instance.debug = False
             self._instance.escalate = False
+            self._instance.prompt = False
             self._instance.test_mode = False
             self._instance.uf_intro = False
             self._instance.show_gui = False


_______________________________________________
relax (http://www.nmr-relax.com)

This is the relax-commits mailing list
relax-commits@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-commits



Related Messages


Powered by MHonArc, Updated Fri Feb 14 11:40:19 2014