Add --command-no-exit to bin/hooke, making hardcoded testing calls to execute_command...

diff --git a/hooke/hooke.py b/hooke/hooke.py
index 52834df7ab77a607c27c9e410fa3027457b9c238..54f0f0fb695b7ec734f0ee91ff7d5d526b5d8f78 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -182,6 +182,10 @@ def main():
         '-c', '--command', dest='commands', metavar='COMMAND',
         action='append', default=[],
         help='Add a command line Hooke command to run.')
+    p.add_option(
+        '--command-no-exit', dest='command_exit',
+        action='store_false', default=True,
+        help="Don't exit after running a script or commands.")
     options,arguments = p.parse_args()
     if len(arguments) > 0:
         print >> sys.stderr, 'More than 0 arguments to %s: %s' \
@@ -196,15 +200,15 @@ def main():
         print version()
         sys.exit(0)
     if options.script != None:
-        f = open(os.path.expanduser(options.script), 'r')
-        options.commands.extend(f.readlines())
-        f.close
+        with open(os.path.expanduser(options.script), 'r') as f:
+            options.commands.extend(f.readlines())
     if len(options.commands) > 0:
         try:
             hooke = runner.run_lines(hooke, options.commands)
         finally:
-            hooke.close()
-        sys.exit(0)
+            if options.command_exit == True:
+                hooke.close()
+                sys.exit(0)
 
     try:
         hooke = runner.run(hooke)

diff --git a/hooke/ui/gui/__init__.py b/hooke/ui/gui/__init__.py
index 1c646f4396cc82429da7eb82cc55a601902b18f8..38bf191d4a2629377bdbec58fff0e1757d1b324b 100644 (file)
--- a/hooke/ui/gui/__init__.py
+++ b/hooke/ui/gui/__init__.py
@@ -114,19 +114,6 @@ class HookeFrame (wx.Frame):
 
         self._setup_perspectives()
         self._bind_events()
-
-        self.execute_command(
-                command=self._command_by_name('load playlist'),
-                args={'input':'test/data/test'},#vclamp_picoforce/playlist'},
-                )
-        self.execute_command(
-                command=self._command_by_name('load playlist'),
-                args={'input':'test/data/vclamp_picoforce/playlist'},
-                )
-        self.execute_command(
-                command=self._command_by_name('polymer fit'),
-                args={'block':1, 'bounds':[918, 1103]},
-                )
         return # TODO: cleanup
         self.playlists = self._c['playlist'].Playlists
         self._displayed_plot = None