implemented clickable Keyframes that show right property

hpi-swa-teaching · Jun 22, 2022 · c27cef9 · c27cef9
1 parent 944f69c
commit c27cef9
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 14 deletions.
diff --git a/...nsEditorKeyframe.class/class/on.withPosition.withFrame.withValue.withAnimationsEditor..st b/...nsEditorKeyframe.class/class/on.withPosition.withFrame.withValue.withAnimationsEditor..st
@@ -0,0 +1,9 @@
+initialization
+on: anAnimationsEditorTrack withPosition: aPoint withFrame: aFrame withValue: aValue withAnimationsEditor: anAnimationsEditor
+	^ self basicNew track: anAnimationsEditorTrack;
+		 frame: aFrame;
+		 value: aValue;
+		 initialize;
+		 setCenteredPosition: aPoint;
+		 animationsEditor: anAnimationsEditor;
+		 yourself.
diff --git a/...nimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/animationsEditor..st b/...nimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/animationsEditor..st
@@ -0,0 +1,3 @@
+accessing
+animationsEditor: anObject
+	animationsEditor := anObject
diff --git a/...AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/animationsEditor.st b/...AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/animationsEditor.st
@@ -0,0 +1,3 @@
+accessing
+animationsEditor
+	^ animationsEditor
diff --git a/...nimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/handlesMouseDown..st b/...nimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/handlesMouseDown..st
@@ -0,0 +1,3 @@
+as yet unclassified
+handlesMouseDown: anEvent 
+	^ true
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/mouseDown..st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/mouseDown..st
@@ -0,0 +1,4 @@
+as yet unclassified
+mouseDown: anEvent
+	anEvent redButtonPressed 
+		ifTrue: [self animationsEditor selectedTreeNode: self selectedProperty].
diff --git a/...AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/selectedProperty.st b/...AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/selectedProperty.st
@@ -0,0 +1,8 @@
+as yet unclassified
+selectedProperty
+	|selectedMorph property|
+	selectedMorph := self animationsEditor propertyList second.
+	selectedMorph hasSubproperties 
+			ifTrue: [property := selectedMorph subproperties detect: [:each| self track property asString match: each asString]].
+	^property
+	"^ self animationsEditor propertyList second subproperties at: self track property ."
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/methodProperties.json
@@ -1,10 +1,16 @@
 {
 	"class" : {
-		"on:withPosition:withFrame:withValue:" : "FH 8/1/2021 19:05" },
+		"on:withPosition:withFrame:withValue:" : "FH 8/1/2021 19:05",
+		"on:withPosition:withFrame:withValue:withAnimationsEditor:" : "SG 6/17/2022 15:45" },
 	"instance" : {
+		"animationsEditor" : "SG 6/17/2022 15:43",
+		"animationsEditor:" : "SG 6/17/2022 15:43",
 		"frame" : "mjs 7/31/2021 15:46",
 		"frame:" : "mjs 7/31/2021 15:46",
+		"handlesMouseDown:" : "SG 6/17/2022 14:57",
 		"initialize" : "mjs 7/31/2021 15:45",
+		"mouseDown:" : "SG 6/22/2022 14:15",
+		"selectedProperty" : "SG 6/22/2022 14:15",
 		"setCenteredPosition:" : "FH 8/1/2021 19:04",
 		"track" : "mjs 7/31/2021 15:46",
 		"track:" : "mjs 7/31/2021 15:46",

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/properties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/properties.json
@@ -8,7 +8,8 @@
 	"instvars" : [
 		"track",
 		"frame",
-		"value" ],
+		"value",
+		"animationsEditor" ],
 	"name" : "AnimationsEditorKeyframe",
 	"pools" : [
 		 ],

diff --git a/...ages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json b/...ages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json
@@ -4,9 +4,12 @@
 		"on:withPosition:withExtent:" : "ob 6/9/2022 21:39",
 		"on:withPositionY:withExtent:" : "ob 6/9/2022 21:40" },
 	"instance" : {
+		"addMovingLine" : " 6/17/2022 14:09:28",
 		"animationDuration" : "ob 6/9/2022 21:31",
 		"initialize" : "ob 6/9/2022 21:29",
 		"lineWidth" : "ob 6/9/2022 20:18",
+		"movingLine" : " 6/17/2022 14:09:28",
+		"movingLine:" : " 6/17/2022 14:09:28",
 		"positionY" : "ob 6/9/2022 21:26",
 		"positionY:" : "ob 6/9/2022 21:26",
 		"setMovingSpeedPerHundredMilliseconds" : "ob 6/9/2022 21:31",

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json
@@ -5,10 +5,22 @@
 		"addEndLine" : "MH 8/1/2021 19:30",
 		"addIntermediateLines" : "Noel Bastubbe 6/14/2022 15:23",
 		"addLineFrom:to:" : "MH 8/1/2021 19:22",
+		"addLineLabelFor:to:" : " 6/17/2022 14:09:28",
 		"addMovingLine" : "SG 5/23/2022 17:59",
 		"addStartEndLine" : "MH 8/1/2021 19:24",
 		"addStartLine" : "MH 8/1/2021 19:28",
+		"createDuration" : " 6/17/2022 14:09:28",
+		"deleteDuration" : " 6/17/2022 14:09:28",
+		"duration" : " 6/17/2022 14:09:28",
+		"duration:" : " 6/17/2022 14:09:28",
+		"endTime" : " 6/17/2022 14:09:28",
+		"endTime:" : " 6/17/2022 14:09:28",
+		"getDurationString:" : " 6/17/2022 14:09:28",
 		"initialize" : "ob 6/13/2022 13:21",
+		"initializeDuration" : " 6/17/2022 14:09:28",
+		"intermediateLineDistance" : " 6/17/2022 14:09:28",
+		"labelXOffset" : " 6/17/2022 14:09:28",
+		"labelYOffset" : " 6/17/2022 14:09:28",
 		"lineHeight" : "MH 8/1/2021 19:00",
 		"lineWidth" : "MH 8/1/2021 19:22",
 		"movingLine" : "SG 5/23/2022 17:22",

diff --git a/...sEditor-Core.package/AnimationsEditorTimeline.class/instance/addTrackFor.withPosition..st b/...sEditor-Core.package/AnimationsEditorTimeline.class/instance/addTrackFor.withPosition..st
@@ -6,6 +6,7 @@ addTrackFor: aProperty withPosition: aNumber
 				on: self
 				withProperty: aProperty
 				withPosition: 0 @ aNumber
-				withExtent: self width @ self trackHeight.
+				withExtent: self width @ self trackHeight
+				withAnimationsEditor: self animationsEditor.
 	aProperty addDependent: track.
 	self addMorph: track.
diff --git a/...nimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/switchTimelineTo..st b/...nimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/switchTimelineTo..st
@@ -1,6 +1,6 @@
 creation
 switchTimelineTo: aProperty 
-Transcript show: self endTime.
+
 	self updateExtent.
 	self property: aProperty.
 	self createTracks.

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json
@@ -4,7 +4,7 @@
 	"instance" : {
 		"addTimebar" : "NR 6/13/2022 15:14",
 		"addTimebarWithEndTime:" : "NR 6/13/2022 15:15",
-		"addTrackFor:withPosition:" : "MH 8/1/2021 18:58",
+		"addTrackFor:withPosition:" : "SG 6/17/2022 15:42",
 		"animationsEditor" : "MH 8/1/2021 18:56",
 		"animationsEditor:" : "MH 8/1/2021 18:56",
 		"createMovingLine" : "ob 6/9/2022 21:38",
@@ -23,9 +23,10 @@
 		"setDefaultProperty" : "MH 8/1/2021 18:58",
 		"startTime" : "MH 8/1/2021 18:57",
 		"startTime:" : "MH 8/1/2021 18:57",
-		"switchTimelineTo:" : "SG 5/23/2022 18:40",
+		"switchTimelineTo:" : "SG 6/17/2022 16:00",
 		"timebar" : "MH 8/1/2021 18:57",
 		"timebar:" : "MH 8/1/2021 18:57",
 		"trackHeight" : "MH 8/1/2021 18:57",
 		"update:" : "SG 5/23/2022 18:40",
-		"updateExtent" : "MH 8/1/2021 18:58" } }
+		"updateExtent" : "MH 8/1/2021 18:58",
+		"updateStartEndProperty" : " 6/17/2022 14:09:28" } }
diff --git a/...sEditorTrack.class/class/on.withProperty.withPosition.withExtent.withAnimationsEditor..st b/...sEditorTrack.class/class/on.withProperty.withPosition.withExtent.withAnimationsEditor..st
@@ -0,0 +1,10 @@
+initialization
+on: anAnimationsEditorTimeline withProperty: aProperty withPosition: aPoint withExtent: anotherPoint withAnimationsEditor: anAnimationsEditor
+	^ self basicNew timeline: anAnimationsEditorTimeline;
+		 property: aProperty;
+		 initialize;
+		 position: aPoint;
+		 extent: anotherPoint;
+		 animationsEditor: anAnimationsEditor;
+		 initializeTrack;
+		 yourself.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/addKeyframes.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/addKeyframes.st
@@ -8,5 +8,6 @@ addKeyframes
 						on: self
 						withPosition: (self convertFrameToPosition: key) @ (self position y - self keyframeMargin)
 						withFrame: key
-						withValue: value.
+						withValue: value
+						withAnimationsEditor: self animationsEditor.
 			self addMorph: keyframeMorph].
diff --git a/...s/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/animationsEditor..st b/...s/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/animationsEditor..st
@@ -0,0 +1,3 @@
+accessing
+animationsEditor: anObject
+	animationsEditor := anObject
diff --git a/...es/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/animationsEditor.st b/...es/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/animationsEditor.st
@@ -0,0 +1,3 @@
+accessing
+animationsEditor
+	^ animationsEditor
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json
@@ -1,8 +1,11 @@
 {
 	"class" : {
-		"on:withProperty:withPosition:withExtent:" : "NR 6/13/2022 12:28" },
+		"on:withProperty:withPosition:withExtent:" : "NR 6/13/2022 12:28",
+		"on:withProperty:withPosition:withExtent:withAnimationsEditor:" : "SG 6/17/2022 15:45" },
 	"instance" : {
-		"addKeyframes" : "MH 8/1/2021 19:02",
+		"addKeyframes" : "SG 6/17/2022 15:46",
+		"animationsEditor" : "SG 6/17/2022 15:40",
+		"animationsEditor:" : "SG 6/17/2022 15:40",
 		"initialize" : "ob 6/13/2022 13:20",
 		"initializeMorph" : "MH 8/1/2021 19:01",
 		"initializeText" : "MH 8/1/2021 19:51",

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/properties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/properties.json
@@ -6,6 +6,7 @@
 		 ],
 	"commentStamp" : "CL 8/2/2021 08:48",
 	"instvars" : [
+		"animationsEditor",
 		"property" ],
 	"name" : "AnimationsEditorTrack",
 	"pools" : [

diff --git a/...s/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json b/...s/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"animationsEditorInstance" : "MH 8/1/2021 18:42",
 		"animationsEditorInstance:" : "MH 8/1/2021 18:42",
 		"calculateKeyframeCenterOn:" : "NB 8/1/2021 14:07",
-		"createKeyframeWith:on:" : "NB 8/1/2021 14:21",
+		"createKeyframeWith:on:" : "SG 6/22/2022 14:15",
 		"endFrame" : "MH 8/1/2021 18:42",
 		"endMargin" : "ob 5/29/2022 17:48",
 		"frameNumber100" : "NB 8/1/2021 14:52",
@@ -20,16 +20,19 @@
 		"paddingDistance" : "NB 8/1/2021 16:04",
 		"positionTrack" : "MH 8/1/2021 18:42",
 		"positionTrack:" : "MH 8/1/2021 18:42",
-		"propertyPosition" : "MH 8/1/2021 18:42",
+		"propertyPosition" : "SG 6/22/2022 14:15",
 		"secondLastOn:" : "NB 8/1/2021 12:16",
-		"setUp" : "ob 5/27/2022 17:02",
+		"setUp" : "SG 6/22/2022 14:15",
 		"startFrame" : "MH 8/1/2021 18:42",
 		"startMargin" : "ob 5/29/2022 17:46",
-		"tearDown" : "NB 8/1/2021 12:38",
+		"tearDown" : "SG 6/22/2022 14:15",
 		"testAddKeyframeToRightPosition" : "Noel Bastubbe 6/13/2022 19:27",
 		"testDistanceBetweenKeyframes" : "mjs 8/1/2021 16:45",
+		"testHeightOfTimeline" : " 6/17/2022 14:09:29",
 		"testMovingLineInRightPosition" : "ob 6/13/2022 18:16",
 		"testMovingLineInitializedInRightPosition" : "ob 5/29/2022 17:34",
+		"testMovingLineStoppedAtEndMargin" : " 6/17/2022 14:09:29",
+		"testWidthOfTimeline" : " 6/17/2022 14:09:29",
 		"timeline" : "MH 8/1/2021 18:43",
 		"timeline:" : "MH 8/1/2021 18:43",
 		"wait:" : "ob 5/27/2022 16:59",