Moving line deleted after the end of the animation

hpi-swa-teaching · Jun 9, 2022 · 6d6e067 · 6d6e067
1 parent c440e42
commit 6d6e067
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 41 deletions.
diff --git a/.../AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/addMovingLine.st b/.../AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/addMovingLine.st
diff --git a/...es/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine..st b/...es/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine..st
diff --git a/...ges/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine.st b/...ges/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine.st
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/step.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/step.st
@@ -3,7 +3,7 @@ step
 	|duration offset endPositionX| 
 	endPositionX := self timeline width - (self endMargin).
 	"duration :=  (self timeline endTime - self timeline startTime)/100. --> richtige Zeit"
-	(self position x >= endPositionX) ifTrue: [self position: endPositionX @ (self position y)"self abandon"]
+	(self position x >= endPositionX) ifTrue: [self abandon]
 	ifFalse:
 		[
 

diff --git a/...ages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json b/...ages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json
@@ -2,10 +2,7 @@
 	"class" : {
 		"on:" : "SG 5/21/2022 16:01" },
 	"instance" : {
-		"addMovingLine" : "SG 5/23/2022 18:37",
 		"initialize" : "SG 5/23/2022 18:57",
 		"lineWidth" : "SG 5/23/2022 18:47",
-		"movingLine" : "SG 5/23/2022 18:48",
-		"movingLine:" : "SG 5/23/2022 18:48",
-		"step" : "ob 5/29/2022 17:26",
+		"step" : "ob 6/9/2022 19:29",
 		"stepTime" : "SG 5/23/2022 18:37" } }
diff --git a/...ests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInRightPosition.st b/...ests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInRightPosition.st
@@ -14,15 +14,15 @@ positionProperty := (self animationsEditorInstance propertyList at: 2) subproper
 	d:= Morph new  extent: 3@100;
 				color: Color black;
 				position: 105@25.
-	1000 timesRepeat: [self moveMovingLine: d]. 
+	500 timesRepeat: [self moveMovingLine: d]. 
 	Transcript show: d position x.
 	d comeToFront.
 	"delay := Delay forMilliseconds: 500."
 	"Delay forMilliseconds: 500. "
 
 	"self movingLine stopStepping. "
 
-	self assert: (d position) = ((self timeline width - 25)@ self timeline trackHeight). 
+	self assert: (d position) =  ((self timeline width - 130)/2+105).
 
 
 

diff --git a/...s.package/AnimationsEditorTimelineTest.class/instance/testMovingLineStoppedAtEndMargin.st b/...s.package/AnimationsEditorTimelineTest.class/instance/testMovingLineStoppedAtEndMargin.st
diff --git a/...s/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json b/...s/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json
@@ -27,9 +27,8 @@
 		"tearDown" : "NB 8/1/2021 12:38",
 		"testAddKeyframeToRightPosition" : "NB 8/1/2021 15:22",
 		"testDistanceBetweenKeyframes" : "mjs 8/1/2021 16:45",
-		"testMovingLineInRightPosition" : "ob 5/29/2022 17:40",
+		"testMovingLineInRightPosition" : "ob 5/29/2022 17:56",
 		"testMovingLineInitializedInRightPosition" : "ob 5/29/2022 17:34",
-		"testMovingLineStoppedAtEndMargin" : "ob 5/29/2022 17:48",
 		"timeline" : "MH 8/1/2021 18:43",
 		"timeline:" : "MH 8/1/2021 18:43",
 		"wait:" : "ob 5/27/2022 16:59",