Change G2D.Color specification to RGBA (was BGRA)

Pretty much all the implementation assumes RGBA.

Connection colors defined in ontologies must be fixed.

gitlab #606

Change-Id: I62fa43c62421db66e6e18b34202be0ced0be6a24

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java
index 802881e1610efa52d787e0670edddb4c291e45de..d89c07c4f3a82034fa5700e819dc8a299f3c2224 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java
@@ -46,8 +46,8 @@ public class ConnectionVisuals {
         if (color == null)
             return null;
         if (color.length == 3)
-            return new Color(color[2], color[1], color[0]);
-        return new Color(color[2], color[1], color[0], color[3]);
+            return new Color(color[0], color[1], color[2]);
+        return new Color(color[0], color[1], color[2], color[3]);
     }
 
     @Override

diff --git a/bundles/org.simantics.document.base.ontology/graph/ConnectionPoints.pgraph b/bundles/org.simantics.document.base.ontology/graph/ConnectionPoints.pgraph
index 73b795343d9c5d9b65acbf9643263a0948314690..01d730c0c30b0d2f14277434b3c29264caf7bc4d 100644 (file)
--- a/bundles/org.simantics.document.base.ontology/graph/ConnectionPoints.pgraph
+++ b/bundles/org.simantics.document.base.ontology/graph/ConnectionPoints.pgraph
@@ -14,7 +14,7 @@ DOC.Document.ChildRelation <T STR.ConnectionRelation
 DOC.Document.IsConnectedToChild <R STR.IsConnectedTo : DOC.Document.ChildRelation
 
 DOC.ConnectionType : STR.ConnectionType
-    G2D.HasColor [0.8,0.64,0.0] : G2D.Color
+    G2D.HasColor [0.0,0.64,0.8,1.0] : G2D.Color
     G2D.HasStrokeType G2D.StrokeType.Scaling
     G2D.HasStroke _ : G2D.Stroke
         G2D.HasStrokeWidth 0.2 : L0.Float
@@ -166,7 +166,7 @@ DOC.Document.CommandRelation <T STR.ConnectionRelation
 DOC.Document.IsConnectedToCommand <R STR.IsConnectedTo : DOC.Document.CommandRelation
 
 DOC.CommandConnectionType : STR.ConnectionType
-    G2D.HasColor [1.0,0.0,1.0] : G2D.Color
+    G2D.HasColor [1.0,0.0,1.0,1.0] : G2D.Color
     G2D.HasStrokeType G2D.StrokeType.Scaling
     G2D.HasStroke _ : G2D.Stroke
         G2D.HasStrokeWidth 0.2 : L0.Float
@@ -683,7 +683,7 @@ DOC.DataStroke : G2D.Stroke
     G2D.HasLineJoin G2D.LineJoin.MiterJoin
 
 DOC.DataConnectionType : STR.ConnectionType
-    G2D.HasColor [0,0.65,1.0] : G2D.Color
+    G2D.HasColor [1,0.65,0.0,1.0] : G2D.Color
     G2D.HasStrokeType G2D.StrokeType.Scaling
     G2D.HasStroke DOC.DataStroke
     G2D.HasRounding 3.0
@@ -757,7 +757,7 @@ DOC.Document.DataDefinitionRelation <T STR.ConnectionRelation
 DOC.Document.IsConnectedToDataDefinition <R STR.IsConnectedTo : DOC.Document.DataDefinitionRelation
 
 DOC.DataDefinitionConnectionType : STR.ConnectionType
-    G2D.HasColor [0,0.65,1.0] : G2D.Color
+    G2D.HasColor [1.0,0.65,0.0,1.0] : G2D.Color
     G2D.HasStrokeType G2D.StrokeType.Scaling
     G2D.HasStroke DOC.DataStroke
     G2D.HasRounding 3.0

diff --git a/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph b/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph
index b08fbdaaedafe459f24ae90a5e18698fcbf2e4b1..37deca7b3508dc1426f06845a9b850afdccc87d8 100644 (file)
--- a/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph
+++ b/bundles/org.simantics.g2d.ontology/graph/G2D.pgraph
@@ -211,7 +211,7 @@ G2D.HasVerticalAlignment <R L0.IsRelatedTo : L0.FunctionalRelation
 G2D.Color <T L0.Literal
     @L0.assert L0.HasDataType $(Float[4])
     @L0.assert L0.HasValueType "Vector Float"
-    L0.HasDescription "A 4-component BGRA color as floats."
+    L0.HasDescription "A 4-component RGBA color as floats."
     
 G2D.HasColor <R L0.HasProperty : L0.FunctionalRelation
     L0.HasLabel "Color"