Changed Axis signals onStarted, onStopped to single signal onRunning(bool)HEADmaster

1 files changed, 35 insertions, 0 deletions

diff --git a/MotionControl/MotionStage.py b/MotionControl/MotionStage.py
index 90f811a..a25b1c7 100644
--- a/MotionControl/MotionStage.py
+++ b/MotionControl/MotionStage.py
@@ -21,8 +21,18 @@ class MotionStage(object):
 
 		self.onDestinationChanged = Signal()
 
+		self.onRunning = Signal()
+		self.onInitializing = Signal()
+		self.onInitialized = Signal()
+		self.onInitiatorMinus = Signal()
+		self.onInitiatorPlus = Signal()
 		self.onPositionChanged = Signal()
 		for axis in self.axes:
+			axis.onInitializing.connect(self.onInitializing_repeat)
+			axis.onInitialized.connect(self.onInitialized_repeat)
+			axis.onInitiatorMinus.connect(self.onInitiatorMinus_repeat)
+			axis.onInitiatorPlus.connect(self.onInitiatorPlus_repeat)
+			axis.onRunning.connect(self.onRunning_repeat)
 			axis.onPosition.connect(self.onPosition_repeat)
 
 		self.worker_thread = None
@@ -45,11 +55,36 @@ class MotionStage(object):
 		self.action_queue.put(action)
 
 	@property
+	def running(self):
+		return tuple([axis.running for axis in self.axes])
+	@property
+	def initializing(self):
+		return tuple([axis.initializing for axis in self.axes])
+	@property
+	def initialized(self):
+		return tuple([axis.initialized for axis in self.axes])
+	@property
+	def initiator_minus(self):
+		return tuple([axis.initiator_minus for axis in self.axes])
+	@property
+	def initiator_plus(self):
+		return tuple([axis.initiator_plus for axis in self.axes])
+	@property
 	def position(self):
 		return tuple([axis.position for axis in self.axes])
 
+	def onRunning_repeat(self, sender, running):
+		self.onRunning.send(self, axis=self.axes_idx[sender], running=running)
 	def onPosition_repeat(self, sender, position):
 		self.onPositionChanged.send(self, axis=self.axes_idx[sender], position=position)
+	def onInitializing_repeat(self, sender, initializing):
+		self.onInitializing.send(self, axis=self.axes_idx[sender], initializing=initializing)
+	def onInitialized_repeat(self, sender, initialized):
+		self.onInitialized.send(self, axis=self.axes_idx[sender], initialized=initialized)
+	def onInitiatorMinus_repeat(self, sender, active):
+		self.onInitiatorMinus.send(self, axis=self.axes_idx[sender], active=active)
+	def onInitiatorPlus_repeat(self, sender, active):
+		self.onInitiatorPlus.send(self, axis=self.axes_idx[sender], active=active)
 
 	def update(self):
 		old_position = self.position