-# Copyright (C) 2008-2010 Fabrizio Benedetti
-# Massimo Sandal <devicerandom@gmail.com>
+# Copyright (C) 2008-2012 Massimo Sandal <devicerandom@gmail.com>
# Rolf Schmidt <rschmidt@alcor.concordia.ca>
-# W. Trevor King <wking@drexel.edu>
+# W. Trevor King <wking@tremily.us>
#
# This file is part of Hooke.
#
-# Hooke is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
#
-# Hooke is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
-# Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with Hooke. If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with Hooke. If not, see <http://www.gnu.org/licenses/>.
"""Hooke - A force spectroscopy review & analysis tool.
"""
feed(buffer, notempty, s, writelock, close)
multiprocessing.queues.Queue._feed = staticmethod(new_feed)
+from ConfigParser import NoSectionError
import logging
import logging.config
import multiprocessing
from . import plugin as plugin_mod
from . import driver as driver_mod
from . import ui
-from .compat import forking as forking # dynamically patch multiprocessing.forking
class Hooke (object):
self.load_drivers()
self.load_ui()
self.engine = engine.CommandEngine()
- self.playlists = playlist.NoteIndexList()
+ self.playlists = playlist.Playlists()
def load_log(self):
config_file = StringIO.StringIO()
# Don't attach the logger because it contains an unpicklable
# thread.lock. Instead, grab it directly every time you need it.
#self.log = logging.getLogger('hooke')
+ log = logging.getLogger('hooke')
+ log.debug('config paths: %s' % self.config._config_paths)
def load_plugins(self):
self.plugins = plugin_mod.load_graph(
plugin_mod.PLUGIN_GRAPH, self.config, include_section='plugins')
+ self.configure_plugins()
self.commands = []
for plugin in self.plugins:
self.commands.extend(plugin.commands())
def load_drivers(self):
self.drivers = plugin_mod.load_graph(
driver_mod.DRIVER_GRAPH, self.config, include_section='drivers')
+ self.configure_drivers()
def load_ui(self):
self.ui = ui.load_ui(self.config)
+ self.configure_ui()
+
+ def configure_plugins(self):
+ for plugin in self.plugins:
+ self._configure_item(plugin)
+
+ def configure_drivers(self):
+ for driver in self.drivers:
+ self._configure_item(driver)
+
+ def configure_ui(self):
+ self._configure_item(self.ui)
+
+ def _configure_item(self, item):
+ conditions = self.config.items('conditions')
+ try:
+ item.config = dict(self.config.items(item.setting_section))
+ except NoSectionError:
+ item.config = {}
+ for key,value in conditions:
+ if key not in item.config:
+ item.config[key] = value
def close(self, save_config=False):
if save_config == True:
hooke = command_to_ui.get(block=True)
log.debug('cleanup got %s instance' % type(hooke))
command.join()
+ for playlist in hooke.playlists: # Curve._hooke is not pickled.
+ for curve in playlist:
+ curve.set_hooke(hooke)
return hooke
p.add_option(
'-p', '--persist', dest='persist', action='store_true', default=False,
help="Don't exit after running a script or commands.")
+ p.add_option(
+ '-u', '--ui', dest='user_interface',
+ help="Override the configured user interface (for easy switching).")
+ p.add_option(
+ '--config', dest='config', metavar='FILE',
+ help="Override the default config file chain.")
p.add_option(
'--save-config', dest='save_config',
action='store_true', default=False,
% (sys.argv[0], arguments)
p.print_help(sys.stderr)
sys.exit(1)
+ if options.config != None:
+ config_mod.DEFAULT_PATHS = [
+ os.path.abspath(os.path.expanduser(options.config))]
hooke = Hooke(debug=__debug__)
runner = HookeRunner()
hooke.config.set(
section='handler_hand1', option='level', value='NOTSET')
hooke.load_log()
+ if options.user_interface not in [None, hooke.ui.name]:
+ hooke.config.set(
+ ui.USER_INTERFACE_SETTING_SECTION, hooke.ui.name, False)
+ hooke.config.set(
+ ui.USER_INTERFACE_SETTING_SECTION, options.user_interface, True)
+ hooke.load_ui()
if options.script != None:
with open(os.path.expanduser(options.script), 'r') as f:
options.commands.extend(f.readlines())
projects / hooke.git / blobdiff