Added drivers

AUTHORS

@@ -7,3 +7,4 @@ Martin Masip <martinmasip@gmail.com>
 Pablo Jais <jaisp@df.uba.ar>
 Martin Caldarola <caldarolamartin@gmail.com>
 Federico Barabas <fede.barabas@gmail.com>
+Vasco Tenner <v.t.tenner@vu.nl>

lantz/action.py

@@ -20,7 +20,7 @@
 from .processors import (Processor, FromQuantityProcessor,
                          MapProcessor, RangeProcessor)
 
-from .feat import MISSING
+from .feat import MISSING, FeatActionUpdateModifiersMixing
 
 
 def _dget(adict, instance=MISSING):
@@ -46,7 +46,7 @@ def _dset(adict, value, instance=MISSING):
         adict[instance] = value
 
 
-class Action(object):
+class ActionBase(object):
     """Wraps a Driver method with Lantz. Can be used as a decorator.
 
     Processors can registered for each arguments to modify their values before
@@ -63,10 +63,11 @@ class Action(object):
                 changed but only tested to belong to the container.
     :param units: `Quantity` or string that can be interpreted as units.
     :param procs: Other callables to be applied to input arguments.
+    :param log_output: Store the functions output in log
 
     """
 
-    def __init__(self, func=None, *, values=None, units=None, limits=None, procs=None):
+    def __init__(self, func=None, *, values=None, units=None, limits=None, procs=None, log_output=True):
 
         #: instance: key: value
         self.modifiers = WeakKeyDictionary()
@@ -76,6 +77,7 @@ def __init__(self, func=None, *, values=None, units=None, limits=None, procs=Non
                                    'units': units,
                                    'limits': limits,
                                    'processors': procs}
+        self.log_output = log_output
         self.func = func
         self.args = ()
 
@@ -126,7 +128,10 @@ def call(self, instance, *args, **kwargs):
                 tic = time.time()
                 out = self.func(instance, *t_values)
                 instance.timing.add(name, time.time() - tic)
-                instance.log_info('{} returned {}', name, out)
+                if self.log_output:
+                    instance.log_info('{} returned {}', name, out)
+                else:
+                    instance.log_info('{} returned a value of type {}', name, type(out))
 
                 return out
             except Exception as e:
@@ -196,6 +201,10 @@ def rebuild(self, instance=MISSING, build_doc=False, modifiers=None, store=False
         return procs
 
 
+class Action(ActionBase, FeatActionUpdateModifiersMixing):
+    pass
+
+
 class ActionProxy(object):
     """Proxy object for Actions that allows to
     store instance specific modifiers.

lantz/driver.py

@@ -15,12 +15,14 @@
 from functools import wraps
 from concurrent import futures
 from collections import defaultdict
+import itertools
 
 from .utils.qt import MetaQObject, SuperQObject, QtCore
 from .feat import Feat, DictFeat, MISSING, FeatProxy
 from .action import Action, ActionProxy
 from .stats import RunningStats
 from .log import get_logger
+from . import Q_
 
 logger = get_logger('lantz.driver', False)
 
@@ -42,6 +44,17 @@ def _merge_dicts(*args):
 
     return out
 
+def unit_to_string(units):
+    return str(Q_(units).units)
+
+def unit_replace(unit, old, new):
+    unit = unit.split(' ')
+    for i, part in enumerate(unit):
+        if part == old:
+            unit[i] = new
+
+    return ' '.join(unit)
+
 
 class MetaSelf(type):
     """Metaclass for Self object
@@ -466,6 +479,25 @@ def feats(self):
     def actions(self):
         return Proxy(self, self._lantz_actions, ActionProxy)
 
+    def update_units(self, old_units, units):
+        """Updates the units of all feats and actions and actions from self.units to units.
+
+        E.g. mm/s -> radian.s
+
+        :param old_units: string or units
+        :param units: string or units
+        :return:
+        """
+
+        old_units_str = unit_to_string(old_units)
+        units_str = unit_to_string(units)
+
+        for featname, feat in itertools.chain(self.feats.items(), self.actions.items()):
+            old_feat_units_str = unit_to_string(feat.feat.modifiers[MISSING][MISSING]['units'])
+            new_feat_units = unit_replace(old_feat_units_str, old_units_str, units_str)
+            self.log_debug("Updating units of feat {} from {} to {}", featname, old_feat_units_str, new_feat_units)
+            feat.feat.change_units(units=new_feat_units)
+
 
 def _solve_dependencies(dependencies, all_members=None):
     """Solve a dependency graph.

lantz/drivers/alliedvision/__init__.py

@@ -1,3 +1,3 @@
-from .vimba import VimbaCam
+from .vimba2 import VimbaCam, list_cameras
 
-__all__ = ['VimbaCam']
+__all__ = ['VimbaCam', 'list_cameras']

lantz/drivers/alliedvision/tests/vimbatest.py

@@ -0,0 +1,4 @@
+from lantz.drivers.alliedvision import list_cameras
+
+if __name__ == '__main__':
+    print(list_cameras())