keyframes deleted when property deactivated finished

hpi-swa-teaching · Jun 26, 2022 · dee94bb · dee94bb
1 parent 5e5a5d6
commit dee94bb
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 34 deletions.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st
@@ -8,7 +8,7 @@ selectedTreeNode: aNode
 				insertMorph: (aNode buildUIWith: self toolBuilder)
 				Into: self propertyEditorPanel]
 				ifFalse: [ self
-				insertMorph: (aNode buildSelectPanelWith:  self toolBuilder) Into: self propertyEditorPanel
+				insertMorph: (aNode buildActivatePanelWith:  self toolBuilder) Into: self propertyEditorPanel
 					].	
 					].
 

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json
@@ -74,7 +74,7 @@
 		"seedProperties" : "Noel Bastubbe 6/14/2022 15:28",
 		"selectMorphByHand" : "FH 8/1/2021 18:49",
 		"selectedTreeNode" : "JIZ 5/27/2020 15:31",
-		"selectedTreeNode:" : "NR 6/26/2022 14:39",
+		"selectedTreeNode:" : "ob 6/26/2022 17:58",
 		"switchTimelineToMorphWith:" : "FH 8/1/2021 18:49",
 		"timeline" : "FH 8/1/2021 18:27",
 		"timeline:" : "FH 8/1/2021 18:27",

diff --git a/...d.class/instance/buildSelectFrameWith..st → ...class/instance/buildActivateFrameWith..st b/...d.class/instance/buildSelectFrameWith..st → ...class/instance/buildActivateFrameWith..st
@@ -1,5 +1,5 @@
 buildComponents
-buildSelectFrameWith: aBuilder 
+buildActivateFrameWith: aBuilder 
 	^ aBuilder pluggableButtonSpec new model: self;
 		 label: 'Activate property';
 		 enabled: true;

diff --git a/...d.class/instance/buildSelectPanelWith..st → ...class/instance/buildActivatePanelWith..st b/...d.class/instance/buildSelectPanelWith..st → ...class/instance/buildActivatePanelWith..st
@@ -1,5 +1,5 @@
 buildComponents
-buildSelectPanelWith: aBuilder 
+buildActivatePanelWith: aBuilder 
 	| aPluggablePanelSpec |
 
 	aPluggablePanelSpec := aBuilder pluggablePanelSpec new 
@@ -10,7 +10,7 @@ buildSelectPanelWith: aBuilder
 						leftFraction: 0.1;
 					 	rightFraction: 0.8;
 					 	yourself);
-			children: {self buildSelectFrameWith: aBuilder. 
+			children: {self buildActivateFrameWith: aBuilder. 
 						};
 			yourself.
 

diff --git a/...class/instance/buildDeselectFrameWith..st → ...ass/instance/buildDeactivateFrameWith..st b/...class/instance/buildDeselectFrameWith..st → ...ass/instance/buildDeactivateFrameWith..st
@@ -1,5 +1,5 @@
 buildComponents
-buildDeselectFrameWith: aBuilder 
+buildDeactivateFrameWith: aBuilder 
 	^ aBuilder pluggableButtonSpec new model: self;
 		 label: 'Deactivate property';
 		 enabled: true;

diff --git a/...itor-Core.package/AnimationsEditorPropertyAnimated.class/instance/buildStartPanelWith..st b/...itor-Core.package/AnimationsEditorPropertyAnimated.class/instance/buildStartPanelWith..st
@@ -10,7 +10,7 @@ buildStartPanelWith: aBuilder
 						leftFraction: 0.1;
 					 	rightFraction: 0.8;
 					 	yourself);
-			children: {self buildSelectFrameWith: aBuilder. 
+			children: {self buildActivateFrameWith: aBuilder. 
 						};
 			yourself.
 

diff --git a/...Editor-Core.package/AnimationsEditorPropertyAnimated.class/instance/deactivateProperty.st b/...Editor-Core.package/AnimationsEditorPropertyAnimated.class/instance/deactivateProperty.st
@@ -2,4 +2,4 @@ buildComponents
 deactivateProperty
 	self animationsEditor selectedTreeNode isActivated: false.
 	self animationsEditor selectedTreeNode: self.
-	self animationsEditor selectedTreeNode deleteAllKeyframesFrom: self.
+	self animationsEditor selectedTreeNode deleteAllKeyframes.
diff --git a/...Editor-Core.package/AnimationsEditorPropertyAnimated.class/instance/deleteAllKeyframes.st b/...Editor-Core.package/AnimationsEditorPropertyAnimated.class/instance/deleteAllKeyframes.st
@@ -0,0 +1,5 @@
+buildComponents
+deleteAllKeyframes
+	self targetValues keysDo: [:key | (key = 0) ifFalse: [self targetValues removeKey: key].].
+	self changed: #deleteKeyframes.
+
diff --git a/...r-Core.package/AnimationsEditorPropertyAnimated.class/instance/deleteAllKeyframesFrom..st b/...r-Core.package/AnimationsEditorPropertyAnimated.class/instance/deleteAllKeyframesFrom..st
diff --git a/...nimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/methodProperties.json b/...nimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/methodProperties.json
@@ -6,11 +6,11 @@
 		"addKeyframe" : "CL 8/2/2021 08:43",
 		"addStartFrame" : "FH 8/1/2021 19:13",
 		"animationProperty" : "CL 7/29/2021 11:55",
-		"buildDeselectFrameWith:" : "ob 6/21/2022 19:41",
+		"buildActivateFrameWith:" : "ob 6/26/2022 17:58",
+		"buildActivatePanelWith:" : "ob 6/26/2022 17:58",
+		"buildDeactivateFrameWith:" : "ob 6/26/2022 17:57",
 		"buildInputFrameWith:" : "FH 8/1/2021 19:13",
-		"buildSelectFrameWith:" : "ob 6/21/2022 19:55",
-		"buildSelectPanelWith:" : "ob 6/21/2022 20:46",
-		"buildStartPanelWith:" : "ob 6/21/2022 19:53",
+		"buildStartPanelWith:" : "ob 6/26/2022 17:58",
 		"buildTextFrameWith:" : "FH 8/1/2021 19:13",
 		"canCreateAnimation" : "MH 7/8/2021 11:37",
 		"canRenderUI" : "ob 6/20/2022 18:54",
@@ -20,10 +20,10 @@
 		"createCompositeAnimationWith:withKey:withPreviousKey:" : "FH 8/1/2021 19:10",
 		"currentValue" : "MH 7/8/2021 11:08",
 		"currentValue:" : "MH 7/8/2021 11:08",
-		"deactivateProperty" : "NR 6/26/2022 16:04",
+		"deactivateProperty" : "ob 6/26/2022 17:01",
 		"defaultFrame" : "MH 7/8/2021 11:33",
 		"defaultValue" : "MH 7/8/2021 11:33",
-		"deleteAllKeyframesFrom:" : "NR 6/26/2022 16:11",
+		"deleteAllKeyframes" : "ob 6/26/2022 17:59",
 		"executeCompositeAnimation:" : "FH 8/1/2021 19:11",
 		"frame" : "MH 7/8/2021 11:08",
 		"frame:" : "MH 7/8/2021 11:10",

diff --git a/...ationsEditor-Core.package/AnimationsEditorPropertyColor.class/instance/buildPanelWith..st b/...ationsEditor-Core.package/AnimationsEditorPropertyColor.class/instance/buildPanelWith..st
@@ -10,7 +10,7 @@ buildPanelWith: aBuilder
 						leftFraction: 0.1;
 					 	rightFraction: 0.8;
 					 	yourself);
-			children: {self buildDeselectFrameWith: aBuilder. 
+			children: {self buildDeactivateFrameWith: aBuilder. 
 						self buildColorPickerWith: aBuilder. 
 						self buildInputColorWith: aBuilder. 
 						self buildTextColorWith: aBuilder. 

diff --git a/...s/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json b/...s/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"animationString" : "FH 8/1/2021 19:19",
 		"buildColorPickerWith:" : "FH 8/1/2021 19:19",
 		"buildInputColorWith:" : "FH 8/1/2021 19:19",
-		"buildPanelWith:" : "ob 6/21/2022 19:45",
+		"buildPanelWith:" : "ob 6/26/2022 17:57",
 		"buildTextColorWith:" : "FH 8/1/2021 19:20",
 		"buildUIWith:" : "mjs 7/31/2021 18:00",
 		"colorPicker" : "MH 7/8/2021 10:03",

diff --git a/...Editor-Core.package/AnimationsEditorPropertyImageSource.class/instance/buildPanelWith..st b/...Editor-Core.package/AnimationsEditorPropertyImageSource.class/instance/buildPanelWith..st
@@ -10,7 +10,7 @@ buildPanelWith: aBuilder
 					 	leftFraction: 0.1;
 					 	rightFraction: 0.8;
 					 	yourself);
-			children: {self buildDeselectFrameWith: aBuilder. 
+			children: {self buildDeactivateFrameWith: aBuilder. 
 						self buildInputSourceWith: aBuilder. 
 						self buildSelectFileButtonWith: aBuilder. 
 						self buildTextImageSourceWith: aBuilder. 

diff --git a/...ationsEditor-Core.package/AnimationsEditorPropertyImageSource.class/methodProperties.json b/...ationsEditor-Core.package/AnimationsEditorPropertyImageSource.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"animationProperty" : "CL 7/29/2021 11:56",
 		"animationString" : "FH 8/1/2021 19:23",
 		"buildInputSourceWith:" : "FH 8/1/2021 19:21",
-		"buildPanelWith:" : "ob 6/21/2022 19:46",
+		"buildPanelWith:" : "ob 6/26/2022 17:57",
 		"buildSelectFileButtonWith:" : "FH 8/1/2021 19:22",
 		"buildTextImageSourceWith:" : "FH 8/1/2021 19:22",
 		"buildUIWith:" : "LW 6/5/2021 15:09",

diff --git a/...onsEditor-Core.package/AnimationsEditorPropertyPosition.class/instance/buildPanelWith..st b/...onsEditor-Core.package/AnimationsEditorPropertyPosition.class/instance/buildPanelWith..st
@@ -10,7 +10,7 @@ buildPanelWith: aBuilder
 						leftFraction: 0.1;
 						rightFraction: 0.8;
 						yourself);
-			children: {self buildDeselectFrameWith: aBuilder.
+			children: {self buildDeactivateFrameWith: aBuilder.
 						self buildInputXWith: aBuilder.
 						self buildTextXWith: aBuilder.
 						self buildInputYWith: aBuilder.

diff --git a/...nimationsEditor-Core.package/AnimationsEditorPropertyPosition.class/methodProperties.json b/...nimationsEditor-Core.package/AnimationsEditorPropertyPosition.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"animationString" : "MH 7/8/2021 10:08",
 		"buildInputXWith:" : "mjs 8/1/2021 12:56",
 		"buildInputYWith:" : "mjs 8/1/2021 12:56",
-		"buildPanelWith:" : "ob 6/21/2022 19:47",
+		"buildPanelWith:" : "ob 6/26/2022 17:57",
 		"buildTextXWith:" : "mjs 8/1/2021 12:57",
 		"buildTextYWith:" : "mjs 8/1/2021 12:57",
 		"buildUIWith:" : "JIZ 6/3/2020 17:10",

diff --git a/...onsEditor-Core.package/AnimationsEditorPropertyRotation.class/instance/buildPanelWith..st b/...onsEditor-Core.package/AnimationsEditorPropertyRotation.class/instance/buildPanelWith..st
@@ -10,7 +10,7 @@ buildPanelWith: aBuilder
 						leftFraction: 0.1;
 						rightFraction: 0.8;
 						yourself);
-			children: {self buildDeselectFrameWith: aBuilder.
+			children: {self buildDeactivateFrameWith: aBuilder.
 						self buildInputRotationWith: aBuilder. 
 						self buildTextRotationWith: aBuilder.
 						self buildInputFrameWith: aBuilder.

diff --git a/...nimationsEditor-Core.package/AnimationsEditorPropertyRotation.class/methodProperties.json b/...nimationsEditor-Core.package/AnimationsEditorPropertyRotation.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"animationProperty" : "CL 7/29/2021 11:57",
 		"animationString" : "FH 8/1/2021 19:25",
 		"buildInputRotationWith:" : "FH 8/1/2021 19:25",
-		"buildPanelWith:" : "ob 6/21/2022 19:47",
+		"buildPanelWith:" : "ob 6/26/2022 17:57",
 		"buildTextRotationWith:" : "FH 8/1/2021 19:26",
 		"buildUIWith:" : "JIZ 6/3/2020 17:10",
 		"createAnimationWith:withPreviousKey:" : "CL 7/29/2021 12:01",

diff --git a/...mationsEditor-Core.package/AnimationsEditorPropertySize.class/instance/buildPanelWith..st b/...mationsEditor-Core.package/AnimationsEditorPropertySize.class/instance/buildPanelWith..st
@@ -10,7 +10,7 @@ buildPanelWith: aBuilder
 						leftFraction: 0.1;
 						rightFraction: 0.8;
 						yourself);
-			children: {self buildDeselectFrameWith: aBuilder.
+			children: {self buildDeactivateFrameWith: aBuilder.
 						self buildInputWidthWith: aBuilder.
 						self buildInputHeightWith: aBuilder.
 						self buildTextWidthWith: aBuilder.

diff --git a/...es/AnimationsEditor-Core.package/AnimationsEditorPropertySize.class/methodProperties.json b/...es/AnimationsEditor-Core.package/AnimationsEditorPropertySize.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"animationString" : "FH 8/1/2021 19:27",
 		"buildInputHeightWith:" : "FH 8/1/2021 19:27",
 		"buildInputWidthWith:" : "FH 8/1/2021 19:27",
-		"buildPanelWith:" : "ob 6/21/2022 19:47",
+		"buildPanelWith:" : "ob 6/26/2022 17:57",
 		"buildTextHeightWith:" : "FH 8/1/2021 19:28",
 		"buildTextWidthWith:" : "FH 8/1/2021 19:28",
 		"buildUIWith:" : "JIZ 6/3/2020 17:10",

diff --git a/...mationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/findLastKey.st b/...mationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/findLastKey.st
@@ -2,8 +2,9 @@ updating
 findLastKey
 	| last |
 
-	last:= self endTime.
+	last:= self defaultEndTime.
 	self property subproperties do:[:subproperty | subproperty targetValues keysDo: [:key | key > last ifTrue:[last:= key]]].
+
 	^last
 
 
diff --git a/.../AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/update..st b/.../AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/update..st
@@ -3,4 +3,5 @@ update: aSymbol
 	aSymbol = #addKeyframes
 		ifTrue:[self endTime < self findLastKey ifTrue:[self endTime: self findLastKey]]. 
 
-
+	aSymbol = #deleteKeyframes
+		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,12 +17,12 @@
 		"endTime" : "FH 8/1/2021 19:29",
 		"endTime:" : "FH 8/1/2021 19:29",
 		"endTimeAsString" : "FH 8/1/2021 19:29",
-		"findLastKey" : "lka 5/30/2022 11:27",
+		"findLastKey" : "ob 6/26/2022 17:54",
 		"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",
-		"update:" : "lka 5/27/2022 12:25" } }
+		"update:" : "ob 6/26/2022 17:55" } }
diff --git a/...mationsEditor-Core.package/AnimationsEditorPropertyText.class/instance/buildPanelWith..st b/...mationsEditor-Core.package/AnimationsEditorPropertyText.class/instance/buildPanelWith..st
@@ -10,7 +10,7 @@ buildPanelWith: aBuilder
 						leftFraction: 0.1;
 						rightFraction: 0.8;
 						yourself);
-			children: {self buildDeselectFrameWith: aBuilder.
+			children: {self buildDeactivateFrameWith: aBuilder.
 						self buildInputTextWith: aBuilder.
 						self buildTextTextWith: aBuilder.
 						self buildInputFrameWith: aBuilder.

diff --git a/...es/AnimationsEditor-Core.package/AnimationsEditorPropertyText.class/methodProperties.json b/...es/AnimationsEditor-Core.package/AnimationsEditorPropertyText.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"animationProperty" : "FH 8/1/2021 19:28",
 		"animationString" : "MH 7/8/2021 10:16",
 		"buildInputTextWith:" : "mjs 8/1/2021 13:32",
-		"buildPanelWith:" : "ob 6/21/2022 19:48",
+		"buildPanelWith:" : "ob 6/26/2022 17:57",
 		"buildTextTextWith:" : "mjs 8/1/2021 13:33",
 		"buildUIWith:" : "LW 7/1/2021 17:45",
 		"createAnimationWith:withPreviousKey:" : "FH 7/26/2021 14:55",