length of end frame to last keyframe automatically

hpi-swa-teaching · May 30, 2022 · a4cedb5 · a4cedb5
1 parent 657c66b
commit a4cedb5
Show file tree

Hide file tree

Showing 21 changed files with 105 additions and 13 deletions.
diff --git a/...mationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/findLastKey.st b/...mationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/findLastKey.st
@@ -0,0 +1,9 @@
+updating
+findLastKey
+	| last |
+
+	last:= self endTime.
+	self property subproperties do:[:subproperty | subproperty targetValues keysDo: [:key | key > last ifTrue:[last:= key]]].
+	^last
+
+
diff --git a/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/property..st b/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/property..st
@@ -0,0 +1,3 @@
+accessing
+property: anObject
+	property := anObject
diff --git a/...AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/property.st b/...AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/property.st
@@ -0,0 +1,3 @@
+accessing
+property
+	^ property
diff --git a/.../AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/update..st b/.../AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/update..st
@@ -0,0 +1,6 @@
+updating
+update: aSymbol 
+	aSymbol = #addKeyframes
+		ifTrue:[self endTime < self findLastKey ifTrue:[self endTime: self findLastKey]]. 
+
+
diff --git a/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/methodProperties.json b/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/methodProperties.json
@@ -17,8 +17,12 @@
 		"endTime" : "FH 8/1/2021 19:29",
 		"endTime:" : "FH 8/1/2021 19:29",
 		"endTimeAsString" : "FH 8/1/2021 19:29",
-		"initialize" : "mjs 7/31/2021 17:24",
+		"findLastKey" : "lka 5/30/2022 11:27",
+		"initialize" : "lka 5/30/2022 11:44",
 		"isStartEnd" : "mjs 7/31/2021 17:19",
+		"property" : "lka 5/27/2022 11:52",
+		"property:" : "lka 5/27/2022 11:52",
 		"startTime" : "FH 8/1/2021 19:29",
 		"startTime:" : "FH 8/1/2021 19:29",
-		"startTimeAsString" : "FH 8/1/2021 19:30" } }
+		"startTimeAsString" : "FH 8/1/2021 19:30",
+		"update:" : "lka 5/27/2022 12:25" } }
diff --git a/...ages/AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/properties.json b/...ages/AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/properties.json
@@ -7,7 +7,8 @@
 	"commentStamp" : "tk 8/7/2020 17:54",
 	"instvars" : [
 		"endTime",
-		"startTime" ],
+		"startTime",
+		"property" ],
 	"name" : "AnimationsEditorPropertyStartEnd",
 	"pools" : [
 		 ],

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st
@@ -4,5 +4,5 @@ initialize
     self 
 	extent: self initialExtent;
 	color: Color lightGray;
-	initializeStartEndTime;
-	setDefaultProperty.
+	setDefaultProperty;
+	initializeStartEndTime.
diff --git a/...nimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/switchTimelineTo..st b/...nimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/switchTimelineTo..st
@@ -3,4 +3,5 @@ switchTimelineTo: aProperty
 	self updateExtent.
 	self property: aProperty.
 	self createTracks.
-	self addTimebar.
+	self addTimebar.
+	self updateStartEndProperty.
diff --git a/...ionsEditor-Core.package/AnimationsEditorTimeline.class/instance/updateStartEndProperty.st b/...ionsEditor-Core.package/AnimationsEditorTimeline.class/instance/updateStartEndProperty.st
@@ -0,0 +1,8 @@
+updating
+updateStartEndProperty
+| startEndProperty | 
+
+     startEndProperty := self animationsEditor propertyStartEnd. 
+	startEndProperty property: self property.
+   	self property subproperties
+		do:[:subproperty | subproperty addDependent: startEndProperty].
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json
@@ -11,17 +11,18 @@
 		"endTime" : "MH 8/1/2021 18:57",
 		"endTime:" : "MH 8/1/2021 18:57",
 		"initialExtent" : "MH 8/1/2021 18:57",
-		"initialize" : "MH 8/1/2021 18:48",
-		"initializeStartEndTime" : "mjs 7/31/2021 17:38",
+		"initialize" : "lka 5/27/2022 10:51",
+		"initializeStartEndTime" : "lka 5/27/2022 12:32",
 		"property" : "MH 8/1/2021 18:57",
 		"property:" : "MH 8/1/2021 18:57",
 		"scrollPane" : "MH 8/1/2021 18:57",
 		"setDefaultProperty" : "MH 8/1/2021 18:58",
 		"startTime" : "MH 8/1/2021 18:57",
 		"startTime:" : "MH 8/1/2021 18:57",
-		"switchTimelineTo:" : "MH 8/1/2021 18:58",
+		"switchTimelineTo:" : "lka 5/27/2022 12:31",
 		"timebar" : "MH 8/1/2021 18:57",
 		"timebar:" : "MH 8/1/2021 18:57",
 		"trackHeight" : "MH 8/1/2021 18:57",
 		"update:" : "CL 8/2/2021 08:51",
-		"updateExtent" : "MH 8/1/2021 18:58" } }
+		"updateExtent" : "MH 8/1/2021 18:58",
+		"updateStartEndProperty" : "lka 5/27/2022 12:33" } }
diff --git a/....package/AnimationsEditorPropertyStartEndTest.class/instance/animationsEditorInstance..st b/....package/AnimationsEditorPropertyStartEndTest.class/instance/animationsEditorInstance..st
@@ -0,0 +1,3 @@
+accessing
+animationsEditorInstance: anObject
+	animationsEditorInstance := anObject
diff --git a/...s.package/AnimationsEditorPropertyStartEndTest.class/instance/animationsEditorInstance.st b/...s.package/AnimationsEditorPropertyStartEndTest.class/instance/animationsEditorInstance.st
@@ -0,0 +1,3 @@
+accessing
+animationsEditorInstance
+	^ animationsEditorInstance
diff --git a/...mationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/morph..st b/...mationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/morph..st
@@ -0,0 +1,3 @@
+accessing
+morph: anObject
+	morph := anObject
diff --git a/...imationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/morph.st b/...imationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/morph.st
@@ -0,0 +1,3 @@
+accessing
+morph
+	^ morph
diff --git a/...ionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/property..st b/...ionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/property..st
@@ -0,0 +1,3 @@
+accessing
+property: anObject
+	property := anObject
diff --git a/...tionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/property.st b/...tionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/property.st
@@ -0,0 +1,3 @@
+accessing
+property
+	^ property
diff --git a/...imationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/setUp.st b/...imationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/setUp.st
@@ -1,4 +1,8 @@
 running
 setUp
 	super setUp.
-	self propertyStartEnd: AnimationsEditorPropertyStartEnd new.
+	self animationsEditorInstance: AnimationsEditor open.
+	self propertyStartEnd: self animationsEditorInstance propertyStartEnd.
+	self morph: Morph new openInWorld.
+	self animationsEditorInstance addTargetMorph: self morph.
+	self property: self animationsEditorInstance propertyList second.
diff --git a/...tionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/tearDown.st b/...tionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/instance/tearDown.st
@@ -0,0 +1,6 @@
+running
+tearDown 
+	self morph isFlexed
+		ifTrue: [self morph owner abandon].
+	self morph abandon. 
+	self animationsEditorInstance windowReference abandon.
diff --git a/...ackage/AnimationsEditorPropertyStartEndTest.class/instance/testAddKeyframeAfterEndtime.st b/...ackage/AnimationsEditorPropertyStartEndTest.class/instance/testAddKeyframeAfterEndtime.st
@@ -0,0 +1,17 @@
+testing
+testAddKeyframeAfterEndtime
+	| positionProperty oldEndtime propertyStartEnd newEndtime|
+
+	positionProperty := self property subproperties at: 'position'.
+	propertyStartEnd := self animationsEditorInstance propertyStartEnd.
+	oldEndtime := propertyStartEnd endTime. 
+		positionProperty 
+		positionX: 555;
+		positionY: 555;
+		frame: oldEndtime + 1;
+		addKeyframe.
+	newEndtime := propertyStartEnd endTime.
+	self assert: oldEndtime + 1 =newEndtime.
+
+
+
diff --git a/...ionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/methodProperties.json b/...ionsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/methodProperties.json
@@ -2,7 +2,15 @@
 	"class" : {
 		 },
 	"instance" : {
+		"animationsEditorInstance" : "lka 5/30/2022 10:38",
+		"animationsEditorInstance:" : "lka 5/30/2022 10:38",
+		"morph" : "lka 5/30/2022 10:38",
+		"morph:" : "lka 5/30/2022 10:38",
+		"property" : "lka 5/30/2022 10:38",
+		"property:" : "lka 5/30/2022 10:38",
 		"propertyStartEnd" : "MH 8/1/2021 18:35",
 		"propertyStartEnd:" : "MH 8/1/2021 18:35",
-		"setUp" : "MH 7/8/2021 12:08",
+		"setUp" : "lka 5/30/2022 11:43",
+		"tearDown" : "lka 5/30/2022 10:39",
+		"testAddKeyframeAfterEndtime" : "lka 5/30/2022 11:55",
 		"testInstanceCreation" : "LW 6/27/2021 13:09" } }
diff --git a/...AnimationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/properties.json b/...AnimationsEditor-Tests.package/AnimationsEditorPropertyStartEndTest.class/properties.json
@@ -6,7 +6,10 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"propertyStartEnd" ],
+		"propertyStartEnd",
+		"animationsEditorInstance",
+		"morph",
+		"property" ],
 	"name" : "AnimationsEditorPropertyStartEndTest",
 	"pools" : [
 		 ],