X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a94f85f169ef00d552d3fa4e2706fd8ccbf4c708..01f6932815a6a21ab46bb420be093685378b43dd:/lib/python/Components/Pixmap.py

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index fc7bfe27..211b772c 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -17,9 +17,6 @@ class Pixmap(Widget):
 	def removeWidget(self, w):
 		pass
 
-	def move(self, x, y):
-		self.instance.move(ePoint(int(x), int(y)))
-
 class PixmapConditional(ConditionalWidget, Pixmap):
 	def __init__(self, withTimer = True):
 		ConditionalWidget.__init__(self)
@@ -35,26 +32,58 @@ class MovingPixmap(Pixmap):
 		self.x = 0.0
 		self.y = 0.0
 		
+		self.clearPath()
+		
 		self.moveTimer = eTimer()
 		self.moveTimer.timeout.get().append(self.doMove)
 		
+	def clearPath(self, repeated = False):
+		if (self.moving):
+			self.moving = False
+			self.moveTimer.stop()
+			
+		self.path = []
+		self.currDest = 0
+		self.repeated = repeated
+		
+	def addMovePoint(self, x, y, time = 20):
+		self.path.append((x, y, time))
+	
 	def moveTo(self, x, y, time = 20):
-		self.time = time
-		self.destX = x
-		self.destY = y
-		self.stepX = (self.destX - self.x) / float(time)
-		self.stepY = (self.destY - self.y) / float(time)
+		self.clearPath()
+		self.addMovePoint(x, y, time)
 		
 	def startMoving(self):
 		if not self.moving:
+			self.time = self.path[self.currDest][2]
+			self.stepX = (self.path[self.currDest][0] - self.x) / float(self.time)
+			self.stepY = (self.path[self.currDest][1] - self.y) / float(self.time)
+
 			self.moving = True
-			self.moveTimer.start(10)
+			self.moveTimer.start(100)
+			
+	def stopMoving(self):
+		self.moving = False
+		self.moveTimer.stop()
 		
 	def doMove(self):
 		self.x += self.stepX
 		self.y += self.stepY
 		self.time -= 1
-		self.move(int(self.x), int(self.y))
+		try:
+			self.move(int(self.x), int(self.y))
+		except: # moving not possible... widget not there any more... stop moving
+			self.stopMoving()
+			
 		if (self.time == 0):
+			self.currDest += 1
 			self.moveTimer.stop()
-			self.moving = False
\ No newline at end of file
+			self.moving = False
+			if (self.currDest >= len(self.path)): # end of path
+				if (self.repeated):
+					self.currDest = 0
+					self.moving = False
+					self.startMoving()
+			else:
+				self.moving = False
+				self.startMoving()