Renamed hooke.plugin.macro -> hooke.plugin.command_stack

[hooke.git] / hooke / plugin / __init__.py

diff --git a/hooke/plugin/__init__.py b/hooke/plugin/__init__.py
index 3d3efd9b93a48666a8cda0739d55fd199eae5881..7f58b82e4cae6076f11799e2e3972db9b64b7a97 100644 (file)
--- a/hooke/plugin/__init__.py
+++ b/hooke/plugin/__init__.py
@@ -34,15 +34,14 @@ PLUGIN_MODULES = [
     ('convfilt', True),
     ('cut', True),
 #    ('fclamp', True),
-#    ('fit', True),
 #    ('flatfilts-rolf', True),
     ('flatfilt', True),
 #    ('jumpstat', True),
-#    ('macro', True),
 #    ('massanalysis', True),
 #    ('multidistance', True),
 #    ('multifit', True),
 #    ('pcluster', True),
+    ('polymer_fit', True),
 #    ('procplots', True),
 #    ('review', True),
 #    ('showconvoluted', True),
@@ -124,11 +123,15 @@ def argument_to_setting(section_name, argument):
     """Convert an :class:`~hooke.command.Argument` to a
     `~hooke.conf.Setting`.
 
-    This is a lossy transition, because
+    This is useful if, for example, you want to define arguments with
+    configurable default values.
+
+    Conversion is lossy transition, because
     :class:`~hooke.command.Argument`\s store more information than
     `~hooke.conf.Setting`\s.
     """
     return Setting(section_name, option=argument.name, value=argument.default,
+                   type=argument.type, count=argument.count,
                    help=argument._help)
 
 
@@ -166,6 +169,7 @@ def default_settings():
 def load_graph(graph, config, include_section):
     enabled = {}
     items = []
+    conditions = config.items('conditions')
     for node in graph:
         item = node.data
         try:
@@ -185,6 +189,9 @@ def load_graph(graph, config, include_section):
             try:
                 item.config = dict(config.items(item.setting_section))
             except configparser.NoSectionError:
-                pass
+                item.config = {}
+            for key,value in conditions:
+                if key not in item.config:
+                    item.config[key] = value
             items.append(item)
     return items