added simple cache for the image, added tests

hpi-swa-teaching · Jun 5, 2021 · 2be690e · 2be690e
1 parent ca8e99c
commit 2be690e
Show file tree

Hide file tree

Showing 20 changed files with 106 additions and 8 deletions.
diff --git a/...ge/AnimationsEditorPropertyImageSource.class/instance/createAnimationFor.withDuration..st b/...ge/AnimationsEditorPropertyImageSource.class/instance/createAnimationFor.withDuration..st
@@ -1,13 +1,14 @@
 codeGeneration
 createAnimationFor: aMorph withDuration: aNumber
 	self targetDuration: aNumber.
+	self updateTargetImage.
 	^ AnimCompositeAnimation new
 			add: (AnimAlphaBlendAnimation new
 				morph: aMorph;
 				startValue: 1.0;
 				endValue: 0.0;
 				duration: (aNumber//2);
-				finishBlock: [aMorph image: (Form fromFileNamed: self targetSource)]);
+				finishBlock: [aMorph image: self targetImage]);
 			add: (AnimAlphaBlendAnimation new
 				morph: aMorph;
 				startValue: 0.0;

diff --git a/...nsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/loadedSource..st b/...nsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/loadedSource..st
@@ -0,0 +1,4 @@
+accessing
+loadedSource: aFilename
+
+	loadedSource := aFilename.
diff --git a/...onsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/loadedSource.st b/...onsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/loadedSource.st
@@ -0,0 +1,6 @@
+accessing
+loadedSource
+	loadedSource
+		ifNil: [self loadedSource: self defaultTargetSource].
+
+	 ^ loadedSource.
diff --git a/...onsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetImage..st b/...onsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetImage..st
@@ -0,0 +1,4 @@
+accessing
+targetImage: aForm
+
+	targetImage := aForm.
diff --git a/...ionsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetImage.st b/...ionsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetImage.st
@@ -0,0 +1,4 @@
+accessing
+targetImage
+
+	^ targetImage.
diff --git a/...nsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetSource..st b/...nsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetSource..st
@@ -1,4 +1,4 @@
 accessing
-targetSource: anSource
+targetSource: aFilename
 
-	targetSource := anSource.
+	targetSource := aFilename.
diff --git a/...onsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetSource.st b/...onsEditor-Core.package/AnimationsEditorPropertyImageSource.class/instance/targetSource.st
@@ -2,5 +2,5 @@ accessing
 targetSource
 	targetSource
 		ifNil: [self targetSource: self defaultTargetSource].
-	
+
 	 ^ targetSource.
diff --git a/...itor-Core.package/AnimationsEditorPropertyImageSource.class/instance/updateTargetImage.st b/...itor-Core.package/AnimationsEditorPropertyImageSource.class/instance/updateTargetImage.st
@@ -0,0 +1,5 @@
+codeGeneration
+updateTargetImage
+
+	self targetSource == self loadedSource
+		ifFalse: [self targetImage: (Form fromFileNamed: self targetSource)].
diff --git a/...ationsEditor-Core.package/AnimationsEditorPropertyImageSource.class/methodProperties.json b/...ationsEditor-Core.package/AnimationsEditorPropertyImageSource.class/methodProperties.json
@@ -9,9 +9,14 @@
 		"canCreateAnimation" : "LW 6/5/2021 15:10",
 		"canRenderUI" : "LW 6/5/2021 15:10",
 		"createAnimationFor:" : "LW 6/5/2021 15:10",
-		"createAnimationFor:withDuration:" : "LW 6/5/2021 15:10",
+		"createAnimationFor:withDuration:" : "LW 6/5/2021 15:59",
 		"defaultTargetSource" : "LW 6/5/2021 15:10",
 		"initialize" : "LW 6/5/2021 15:10",
+		"loadedSource" : "LW 6/5/2021 16:00",
+		"loadedSource:" : "LW 6/5/2021 15:54",
 		"resetTargetMorph" : "LW 6/5/2021 15:10",
-		"targetSource" : "LW 6/5/2021 15:11",
-		"targetSource:" : "LW 6/5/2021 15:11" } }
+		"targetImage" : "LW 6/5/2021 15:50",
+		"targetImage:" : "LW 6/5/2021 15:50",
+		"targetSource" : "LW 6/5/2021 15:47",
+		"targetSource:" : "LW 6/5/2021 15:51",
+		"updateTargetImage" : "LW 6/5/2021 15:55" } }
diff --git a/...s/AnimationsEditor-Core.package/AnimationsEditorPropertyImageSource.class/properties.json b/...s/AnimationsEditor-Core.package/AnimationsEditorPropertyImageSource.class/properties.json
@@ -6,7 +6,9 @@
 		 ],
 	"commentStamp" : "LW 6/5/2021 15:08",
 	"instvars" : [
-		"targetSource" ],
+		"targetSource",
+		"targetImage",
+		"loadedSource" ],
 	"name" : "AnimationsEditorPropertyImageSource",
 	"pools" : [
 		 ],

diff --git a/...onsEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/README.md b/...onsEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/README.md
diff --git a/...Editor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/instance/dummyImage.st b/...Editor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/instance/dummyImage.st
@@ -0,0 +1,7 @@
+as yet unclassified
+dummyImage
+	^ Form
+		extent: 4 @ 4
+		depth: 32
+		fromArray: #(4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080 4278190080)
+		offset: 0 @ 0.
diff --git a/...ts.package/AnimationsEditorPropertyImageSourceTest.class/instance/propertyImageSource..st b/...ts.package/AnimationsEditorPropertyImageSourceTest.class/instance/propertyImageSource..st
@@ -0,0 +1,4 @@
+accessing
+propertyImageSource: anObject
+
+	propertyImageSource := anObject.
diff --git a/...sts.package/AnimationsEditorPropertyImageSourceTest.class/instance/propertyImageSource.st b/...sts.package/AnimationsEditorPropertyImageSourceTest.class/instance/propertyImageSource.st
@@ -0,0 +1,4 @@
+accessing
+propertyImageSource
+
+	^ propertyImageSource.
diff --git a/...tionsEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/instance/setUp.st b/...tionsEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/instance/setUp.st
@@ -0,0 +1,5 @@
+as yet unclassified
+setUp
+	super setUp.
+	self propertyImageSource: AnimationsEditorPropertyImageSource new.
+	self propertyImageSource targetDuration: 0.
diff --git a/....package/AnimationsEditorPropertyImageSourceTest.class/instance/testCreateAnimationFor.st b/....package/AnimationsEditorPropertyImageSourceTest.class/instance/testCreateAnimationFor.st
@@ -0,0 +1,7 @@
+as yet unclassified
+testCreateAnimationFor
+	| imageMorph animation |
+	imageMorph := ImageMorph new openInWorld.
+	animation := self propertyImageSource createAnimationFor: imageMorph.
+	self assert: (animation isKindOf: AnimAnimation).
+	imageMorph abandon.
diff --git a/...ts.package/AnimationsEditorPropertyImageSourceTest.class/instance/testInstanceCreation.st b/...ts.package/AnimationsEditorPropertyImageSourceTest.class/instance/testInstanceCreation.st
@@ -0,0 +1,3 @@
+as yet unclassified
+testInstanceCreation
+	self assert: (self propertyImageSource = nil) not.
diff --git a/...kage/AnimationsEditorPropertyImageSourceTest.class/instance/testPropertyAfterAnimation.st b/...kage/AnimationsEditorPropertyImageSourceTest.class/instance/testPropertyAfterAnimation.st
@@ -0,0 +1,12 @@
+as yet unclassified
+testPropertyAfterAnimation
+	| imageMorph animation |
+	imageMorph := ImageMorph new openInWorld.
+	self propertyImageSource targetImage: self dummyImage.
+	animation := self propertyImageSource createAnimationFor: imageMorph.
+	animation register;
+		start.
+
+	(Delay forSeconds: 1) wait.
+	self assert: (imageMorph image asString = self dummyImage asString).
+	imageMorph abandon.
diff --git a/...sEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/methodProperties.json b/...sEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/methodProperties.json
@@ -0,0 +1,11 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"dummyImage" : "LW 6/5/2021 15:35",
+		"propertyImageSource" : "LW 6/5/2021 15:37",
+		"propertyImageSource:" : "LW 6/5/2021 15:34",
+		"setUp" : "LW 6/5/2021 15:41",
+		"testCreateAnimationFor" : "LW 6/5/2021 15:57",
+		"testInstanceCreation" : "LW 6/5/2021 15:35",
+		"testPropertyAfterAnimation" : "LW 6/5/2021 16:35" } }
diff --git a/...mationsEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/properties.json b/...mationsEditor-Tests.package/AnimationsEditorPropertyImageSourceTest.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "AnimationsEditor-Tests",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"propertyImageSource" ],
+	"name" : "AnimationsEditorPropertyImageSourceTest",
+	"pools" : [
+		 ],
+	"super" : "TestCase",
+	"type" : "normal" }