aboutsummaryrefslogtreecommitdiff
path: root/MotionControl/Axis.py
diff options
context:
space:
mode:
authorWolfgang Draxinger (root@gar-ex-erdastep) <Wolfgang.Draxinger@physik.uni-muenchen.de>2011-12-08 21:21:49 +0100
committerWolfgang Draxinger (root@gar-ex-erdastep) <Wolfgang.Draxinger@physik.uni-muenchen.de>2011-12-08 21:21:49 +0100
commit4b19fc744937e53c8689733f25dedf80fa8fd396 (patch)
tree6355592f0b39c1594e98e0f38c7d72dc6b71caae /MotionControl/Axis.py
parent835da32571c08259fc81c89f711047a80bc16a5b (diff)
downloadPyMotionControl-4b19fc744937e53c8689733f25dedf80fa8fd396.tar.gz
PyMotionControl-4b19fc744937e53c8689733f25dedf80fa8fd396.tar.bz2
motiond started, MotionControl now keeps a dictionary of axis instance to index (for signal forwarding)
Diffstat (limited to 'MotionControl/Axis.py')
-rw-r--r--MotionControl/Axis.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/MotionControl/Axis.py b/MotionControl/Axis.py
index ff8c900..4d669c5 100644
--- a/MotionControl/Axis.py
+++ b/MotionControl/Axis.py
@@ -2,6 +2,7 @@
class Axis(object):
def __init__(self, inverted = False, scale={}):
+ from blinker import Signal
self.inverted = inverted
self.scale = scale
self.position = None
@@ -35,13 +36,13 @@ class Axis(object):
self.do_update()
if last_position != self.position:
- self.onPosition.send(position = self.position)
+ self.onPosition.send(self, position = self.position)
if last_running != self.running:
if self.running:
- self.onStarted.send()
+ self.onStarted.send(self)
else:
- self.onStopped.send()
+ self.onStopped.send(self)
if last_initializing != self.initializing:
self.onInitializing.send(self, initializing = self.initializing)