changed color format to RGB array

hpi-swa-teaching · May 20, 2021 · b477da0 · b477da0
1 parent 6def47d
commit b477da0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/addColorFrame..st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/addColorFrame..st
@@ -7,7 +7,7 @@ addColorFrame: aTreeNode
 		with: #properties -> { 
 			Dictionary 
 				with: #name -> aTreeNode title asLowercase
-				with: #value -> aTreeNode targetColorAsString.
+				with: #value -> aTreeNode targetColor rgbTriplet. 
 		}.
 
 	^ jsonFrame.

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/addPositionFrame..st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/addPositionFrame..st
@@ -6,10 +6,10 @@ addPositionFrame: aTreeNode
 		with: #frame -> aTreeNode targetDuration
 		with: #properties -> { 
 			Dictionary 
-				with: #name -> (aTreeNode title, 'X') asLowercase 
+				with: #name -> (aTreeNode title asLowercase , 'X')
 				with: #value -> aTreeNode targetPosition x. 
 			Dictionary 
-				with: #name -> (aTreeNode title, 'Y') asLowercase
+				with: #name -> (aTreeNode title asLowercase, 'Y')
 				with: #value -> aTreeNode targetPosition y.			
 		}.
 

diff --git a/.../AnimationsEditor-Core.package/AnimationsEditor.class/instance/createStartInformation..st b/.../AnimationsEditor-Core.package/AnimationsEditor.class/instance/createStartInformation..st
@@ -21,5 +21,5 @@ createStartInformation: aMorph
 				with: #value -> aMorph height. 
 			Dictionary
 				with: #name -> 'color'
-				with: #value -> aMorph color asString.
+				with: #value -> aMorph color rgbTriplet.
 			}.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json
@@ -2,10 +2,10 @@
 	"class" : {
 		"open" : "DM 8/4/2020 13:18" },
 	"instance" : {
-		"addColorFrame:" : "NB 5/19/2021 12:43",
+		"addColorFrame:" : "MH 5/20/2021 09:25",
 		"addFrame:" : "NB 5/12/2021 09:25",
 		"addMorphToJson:with:" : "MH 5/15/2021 11:15",
-		"addPositionFrame:" : "NB 5/19/2021 12:43",
+		"addPositionFrame:" : "MH 5/20/2021 09:32",
 		"addRotationFrame:" : "NB 5/19/2021 12:43",
 		"addSelectedMorphFor:" : "DM 8/5/2020 21:11",
 		"addSizeFrame:" : "NB 5/19/2021 12:43",
@@ -29,7 +29,7 @@
 		"createPositionPropertyFrom:" : "DM 8/6/2020 10:09",
 		"createRotationPropertyFrom:" : "DM 7/8/2020 14:29",
 		"createSizePropertyFrom:" : "DM 7/8/2020 14:29",
-		"createStartInformation:" : "MH 5/20/2021 08:14",
+		"createStartInformation:" : "MH 5/20/2021 09:30",
 		"createStructure:with:" : "NB 5/13/2021 10:25",
 		"defaultEmptyPanels" : "DM 8/7/2020 17:37",
 		"defaultPropertyPanelPosition" : "DM 8/6/2020 10:38",

diff --git a/...s/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testAddColorFrame.st b/...s/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testAddColorFrame.st
@@ -12,16 +12,16 @@ testAddColorFrame
 	aTreeNode	
 		targetDuration: animationsEditorProperty defaultTargetDuration;
 		targetColor: 'red'.
-
-	jsonFrame := self animationsEditorInstance addColorFrame: aTreeNode.
 
+	jsonFrame := self animationsEditorInstance addColorFrame: aTreeNode.
+	self halt. 
 	"also extract instantiation of testFrame"
 	testFrame := Dictionary  
 		with: #frame->500
 		with: #properties->{
 			Dictionary
 				with: #name->'color'
-				with: #value->'Color red'.
+				with: #value-> #(1.0 0.0 0.0).
 		}. 
 
 	self assert: jsonFrame equals: testFrame.
diff --git a/...nimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testAddPositionFrame.st b/...nimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testAddPositionFrame.st
@@ -20,10 +20,10 @@ testAddPositionFrame
 		with: #frame -> 500
 		with: #properties -> { 
 			Dictionary 
-				with: #name -> 'positionx'  
+				with: #name -> 'positionX'  
 				with: #value -> 100. 
 			Dictionary 
-				with: #name -> 'positiony'
+				with: #name -> 'positionY'
 				with: #value -> 200.				
 		}.
 

diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json
@@ -6,8 +6,8 @@
 		"animationsEditorInstance:" : "MH 5/13/2021 13:19",
 		"setUp" : "NB 5/19/2021 10:25",
 		"tearDown" : "MH 5/17/2021 11:08",
-		"testAddColorFrame" : "MH 5/20/2021 08:23",
-		"testAddPositionFrame" : "MH 5/20/2021 08:23",
+		"testAddColorFrame" : "MH 5/20/2021 09:27",
+		"testAddPositionFrame" : "MH 5/20/2021 09:31",
 		"testAddRotationFrame" : "MH 5/20/2021 08:23",
 		"testAddSizeFrame" : "MH 5/20/2021 08:22",
 		"testCreateStartInformation" : "MH 5/20/2021 08:22",