Merge "SCL bindings to some G3D and Plant3D Java classes"

diff --git a/org.simantics.g3d.csg.ontology/.gitignore b/org.simantics.g3d.csg.ontology/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..e696a2182079ab6d74b7cf6e0887e6ea60dfe9e5 100644 (file)
--- a/org.simantics.g3d.csg.ontology/.gitignore
+++ b/org.simantics.g3d.csg.ontology/.gitignore
@@ -1 +1,2 @@
 /bin/
+/graph.tg

diff --git a/org.simantics.g3d.csg.ontology/graph.tg b/org.simantics.g3d.csg.ontology/graph.tg
deleted file mode 100644 (file)
index 525ba13..0000000
Binary files a/org.simantics.g3d.csg.ontology/graph.tg and /dev/null differ

diff --git a/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java b/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java
index 2efbbb01b4182cb2d47c13159995a4404c93b835..558522e3c56928407b28e372456bee900b68b98c 100644 (file)
--- a/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java
+++ b/org.simantics.g3d.csg.ontology/src/org/simantics/g3d/csg/ontology/CSG.java
@@ -1,249 +1,238 @@
-/*******************************************************************************\r
- * Copyright (c) 2012, 2013 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.g3d.csg.ontology;\r
-\r
-import org.simantics.db.RequestProcessor;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.db.Session;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.service.QueryControl;\r
-\r
-public class CSG {\r
-    \r
-    public final Resource Barrel;\r
-    public final Resource BooleanOperation;\r
-    public final Resource Box;\r
-    public final Resource CSGBrowseContext;\r
-    public final Resource CSGBrowseContext_ActiveLabelDecorationRule;\r
-    public final Resource CSGBrowseContext_RunLabelRule;\r
-    public final Resource CSGBrowseContext_ShapeTabContribution;\r
-    public final Resource Cone;\r
-    public final Resource Cylinder;\r
-    public final Resource Difference;\r
-    public final Resource EllipticCylinder;\r
-    public final Resource HasBottomRadius;\r
-    public final Resource HasBottomRadius_Inverse;\r
-    public final Resource HasCorners;\r
-    public final Resource HasCorners_Inverse;\r
-    public final Resource HasHeight;\r
-    public final Resource HasHeight_Inverse;\r
-    public final Resource HasMajorRadius;\r
-    public final Resource HasMajorRadius_Inverse;\r
-    public final Resource HasMinorRadius;\r
-    public final Resource HasMinorRadius_Inverse;\r
-    public final Resource HasRadius;\r
-    public final Resource HasRadius_Inverse;\r
-    public final Resource HasSizingProperty;\r
-    public final Resource HasSizingProperty_Inverse;\r
-    public final Resource HasTopRadius;\r
-    public final Resource HasTopRadius_Inverse;\r
-    public final Resource HasXAxisMaximumSize;\r
-    public final Resource HasXAxisMaximumSize_Inverse;\r
-    public final Resource HasXAxisMinimumSize;\r
-    public final Resource HasXAxisMinimumSize_Inverse;\r
-    public final Resource HasXAxisSize;\r
-    public final Resource HasXAxisSize_Inverse;\r
-    public final Resource HasYAxisSize;\r
-    public final Resource HasYAxisSize_Inverse;\r
-    public final Resource HasZAxisMaximumSize;\r
-    public final Resource HasZAxisMaximumSize_Inverse;\r
-    public final Resource HasZAxisMinimumSize;\r
-    public final Resource HasZAxisMinimumSize_Inverse;\r
-    public final Resource HasZAxisSize;\r
-    public final Resource HasZAxisSize_Inverse;\r
-    public final Resource Images;\r
-    public final Resource Images_Difference;\r
-    public final Resource Images_Intersection;\r
-    public final Resource Images_Ruby;\r
-    public final Resource Images_Union;\r
-    public final Resource Intersection;\r
-    public final Resource Model;\r
-    public final Resource Primitive;\r
-    public final Resource RectangularSolid;\r
-    public final Resource RegularPrism;\r
-    public final Resource Shape;\r
-    public final Resource Sphere;\r
-    public final Resource Torus;\r
-    public final Resource Union;\r
-    public final Resource hasChildShape;\r
-    public final Resource hasChildShape_Inverse;\r
-    public final Resource hasPrimaryShape;\r
-    public final Resource hasPrimaryShape_Inverse;\r
-    public final Resource hasSecondaryShape;\r
-    public final Resource hasSecondaryShape_Inverse;\r
-        \r
-    public static class URIs {\r
-        public static final String Barrel = "http://www.simantics.org/CSG-0.1/Barrel";\r
-        public static final String BooleanOperation = "http://www.simantics.org/CSG-0.1/BooleanOperation";\r
-        public static final String Box = "http://www.simantics.org/CSG-0.1/Box";\r
-        public static final String CSGBrowseContext = "http://www.simantics.org/CSG-0.1/CSGBrowseContext";\r
-        public static final String CSGBrowseContext_ActiveLabelDecorationRule = "http://www.simantics.org/CSG-0.1/CSGBrowseContext/ActiveLabelDecorationRule";\r
-        public static final String CSGBrowseContext_RunLabelRule = "http://www.simantics.org/CSG-0.1/CSGBrowseContext/RunLabelRule";\r
-        public static final String CSGBrowseContext_ShapeTabContribution = "http://www.simantics.org/CSG-0.1/CSGBrowseContext/ShapeTabContribution";\r
-        public static final String Cone = "http://www.simantics.org/CSG-0.1/Cone";\r
-        public static final String Cylinder = "http://www.simantics.org/CSG-0.1/Cylinder";\r
-        public static final String Difference = "http://www.simantics.org/CSG-0.1/Difference";\r
-        public static final String EllipticCylinder = "http://www.simantics.org/CSG-0.1/EllipticCylinder";\r
-        public static final String HasBottomRadius = "http://www.simantics.org/CSG-0.1/HasBottomRadius";\r
-        public static final String HasBottomRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasBottomRadius/Inverse";\r
-        public static final String HasCorners = "http://www.simantics.org/CSG-0.1/HasCorners";\r
-        public static final String HasCorners_Inverse = "http://www.simantics.org/CSG-0.1/HasCorners/Inverse";\r
-        public static final String HasHeight = "http://www.simantics.org/CSG-0.1/HasHeight";\r
-        public static final String HasHeight_Inverse = "http://www.simantics.org/CSG-0.1/HasHeight/Inverse";\r
-        public static final String HasMajorRadius = "http://www.simantics.org/CSG-0.1/HasMajorRadius";\r
-        public static final String HasMajorRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasMajorRadius/Inverse";\r
-        public static final String HasMinorRadius = "http://www.simantics.org/CSG-0.1/HasMinorRadius";\r
-        public static final String HasMinorRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasMinorRadius/Inverse";\r
-        public static final String HasRadius = "http://www.simantics.org/CSG-0.1/HasRadius";\r
-        public static final String HasRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasRadius/Inverse";\r
-        public static final String HasSizingProperty = "http://www.simantics.org/CSG-0.1/HasSizingProperty";\r
-        public static final String HasSizingProperty_Inverse = "http://www.simantics.org/CSG-0.1/HasSizingProperty/Inverse";\r
-        public static final String HasTopRadius = "http://www.simantics.org/CSG-0.1/HasTopRadius";\r
-        public static final String HasTopRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasTopRadius/Inverse";\r
-        public static final String HasXAxisMaximumSize = "http://www.simantics.org/CSG-0.1/HasXAxisMaximumSize";\r
-        public static final String HasXAxisMaximumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasXAxisMaximumSize/Inverse";\r
-        public static final String HasXAxisMinimumSize = "http://www.simantics.org/CSG-0.1/HasXAxisMinimumSize";\r
-        public static final String HasXAxisMinimumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasXAxisMinimumSize/Inverse";\r
-        public static final String HasXAxisSize = "http://www.simantics.org/CSG-0.1/HasXAxisSize";\r
-        public static final String HasXAxisSize_Inverse = "http://www.simantics.org/CSG-0.1/HasXAxisSize/Inverse";\r
-        public static final String HasYAxisSize = "http://www.simantics.org/CSG-0.1/HasYAxisSize";\r
-        public static final String HasYAxisSize_Inverse = "http://www.simantics.org/CSG-0.1/HasYAxisSize/Inverse";\r
-        public static final String HasZAxisMaximumSize = "http://www.simantics.org/CSG-0.1/HasZAxisMaximumSize";\r
-        public static final String HasZAxisMaximumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasZAxisMaximumSize/Inverse";\r
-        public static final String HasZAxisMinimumSize = "http://www.simantics.org/CSG-0.1/HasZAxisMinimumSize";\r
-        public static final String HasZAxisMinimumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasZAxisMinimumSize/Inverse";\r
-        public static final String HasZAxisSize = "http://www.simantics.org/CSG-0.1/HasZAxisSize";\r
-        public static final String HasZAxisSize_Inverse = "http://www.simantics.org/CSG-0.1/HasZAxisSize/Inverse";\r
-        public static final String Images = "http://www.simantics.org/CSG-0.1/Images";\r
-        public static final String Images_Difference = "http://www.simantics.org/CSG-0.1/Images/Difference";\r
-        public static final String Images_Intersection = "http://www.simantics.org/CSG-0.1/Images/Intersection";\r
-        public static final String Images_Ruby = "http://www.simantics.org/CSG-0.1/Images/Ruby";\r
-        public static final String Images_Union = "http://www.simantics.org/CSG-0.1/Images/Union";\r
-        public static final String Intersection = "http://www.simantics.org/CSG-0.1/Intersection";\r
-        public static final String Model = "http://www.simantics.org/CSG-0.1/Model";\r
-        public static final String Primitive = "http://www.simantics.org/CSG-0.1/Primitive";\r
-        public static final String RectangularSolid = "http://www.simantics.org/CSG-0.1/RectangularSolid";\r
-        public static final String RegularPrism = "http://www.simantics.org/CSG-0.1/RegularPrism";\r
-        public static final String Shape = "http://www.simantics.org/CSG-0.1/Shape";\r
-        public static final String Sphere = "http://www.simantics.org/CSG-0.1/Sphere";\r
-        public static final String Torus = "http://www.simantics.org/CSG-0.1/Torus";\r
-        public static final String Union = "http://www.simantics.org/CSG-0.1/Union";\r
-        public static final String hasChildShape = "http://www.simantics.org/CSG-0.1/hasChildShape";\r
-        public static final String hasChildShape_Inverse = "http://www.simantics.org/CSG-0.1/hasChildShape/Inverse";\r
-        public static final String hasPrimaryShape = "http://www.simantics.org/CSG-0.1/hasPrimaryShape";\r
-        public static final String hasPrimaryShape_Inverse = "http://www.simantics.org/CSG-0.1/hasPrimaryShape/Inverse";\r
-        public static final String hasSecondaryShape = "http://www.simantics.org/CSG-0.1/hasSecondaryShape";\r
-        public static final String hasSecondaryShape_Inverse = "http://www.simantics.org/CSG-0.1/hasSecondaryShape/Inverse";\r
-    }\r
-    \r
-    public static Resource getResourceOrNull(ReadGraph graph, String uri) {\r
-        try {\r
-            return graph.getResource(uri);\r
-        } catch(DatabaseException e) {\r
-            System.err.println(e.getMessage());\r
-            return null;\r
-        }\r
-    }\r
-    \r
-    public CSG(ReadGraph graph) {\r
-        Barrel = getResourceOrNull(graph, URIs.Barrel);\r
-        BooleanOperation = getResourceOrNull(graph, URIs.BooleanOperation);\r
-        Box = getResourceOrNull(graph, URIs.Box);\r
-        CSGBrowseContext = getResourceOrNull(graph, URIs.CSGBrowseContext);\r
-        CSGBrowseContext_ActiveLabelDecorationRule = getResourceOrNull(graph, URIs.CSGBrowseContext_ActiveLabelDecorationRule);\r
-        CSGBrowseContext_RunLabelRule = getResourceOrNull(graph, URIs.CSGBrowseContext_RunLabelRule);\r
-        CSGBrowseContext_ShapeTabContribution = getResourceOrNull(graph, URIs.CSGBrowseContext_ShapeTabContribution);\r
-        Cone = getResourceOrNull(graph, URIs.Cone);\r
-        Cylinder = getResourceOrNull(graph, URIs.Cylinder);\r
-        Difference = getResourceOrNull(graph, URIs.Difference);\r
-        EllipticCylinder = getResourceOrNull(graph, URIs.EllipticCylinder);\r
-        HasBottomRadius = getResourceOrNull(graph, URIs.HasBottomRadius);\r
-        HasBottomRadius_Inverse = getResourceOrNull(graph, URIs.HasBottomRadius_Inverse);\r
-        HasCorners = getResourceOrNull(graph, URIs.HasCorners);\r
-        HasCorners_Inverse = getResourceOrNull(graph, URIs.HasCorners_Inverse);\r
-        HasHeight = getResourceOrNull(graph, URIs.HasHeight);\r
-        HasHeight_Inverse = getResourceOrNull(graph, URIs.HasHeight_Inverse);\r
-        HasMajorRadius = getResourceOrNull(graph, URIs.HasMajorRadius);\r
-        HasMajorRadius_Inverse = getResourceOrNull(graph, URIs.HasMajorRadius_Inverse);\r
-        HasMinorRadius = getResourceOrNull(graph, URIs.HasMinorRadius);\r
-        HasMinorRadius_Inverse = getResourceOrNull(graph, URIs.HasMinorRadius_Inverse);\r
-        HasRadius = getResourceOrNull(graph, URIs.HasRadius);\r
-        HasRadius_Inverse = getResourceOrNull(graph, URIs.HasRadius_Inverse);\r
-        HasSizingProperty = getResourceOrNull(graph, URIs.HasSizingProperty);\r
-        HasSizingProperty_Inverse = getResourceOrNull(graph, URIs.HasSizingProperty_Inverse);\r
-        HasTopRadius = getResourceOrNull(graph, URIs.HasTopRadius);\r
-        HasTopRadius_Inverse = getResourceOrNull(graph, URIs.HasTopRadius_Inverse);\r
-        HasXAxisMaximumSize = getResourceOrNull(graph, URIs.HasXAxisMaximumSize);\r
-        HasXAxisMaximumSize_Inverse = getResourceOrNull(graph, URIs.HasXAxisMaximumSize_Inverse);\r
-        HasXAxisMinimumSize = getResourceOrNull(graph, URIs.HasXAxisMinimumSize);\r
-        HasXAxisMinimumSize_Inverse = getResourceOrNull(graph, URIs.HasXAxisMinimumSize_Inverse);\r
-        HasXAxisSize = getResourceOrNull(graph, URIs.HasXAxisSize);\r
-        HasXAxisSize_Inverse = getResourceOrNull(graph, URIs.HasXAxisSize_Inverse);\r
-        HasYAxisSize = getResourceOrNull(graph, URIs.HasYAxisSize);\r
-        HasYAxisSize_Inverse = getResourceOrNull(graph, URIs.HasYAxisSize_Inverse);\r
-        HasZAxisMaximumSize = getResourceOrNull(graph, URIs.HasZAxisMaximumSize);\r
-        HasZAxisMaximumSize_Inverse = getResourceOrNull(graph, URIs.HasZAxisMaximumSize_Inverse);\r
-        HasZAxisMinimumSize = getResourceOrNull(graph, URIs.HasZAxisMinimumSize);\r
-        HasZAxisMinimumSize_Inverse = getResourceOrNull(graph, URIs.HasZAxisMinimumSize_Inverse);\r
-        HasZAxisSize = getResourceOrNull(graph, URIs.HasZAxisSize);\r
-        HasZAxisSize_Inverse = getResourceOrNull(graph, URIs.HasZAxisSize_Inverse);\r
-        Images = getResourceOrNull(graph, URIs.Images);\r
-        Images_Difference = getResourceOrNull(graph, URIs.Images_Difference);\r
-        Images_Intersection = getResourceOrNull(graph, URIs.Images_Intersection);\r
-        Images_Ruby = getResourceOrNull(graph, URIs.Images_Ruby);\r
-        Images_Union = getResourceOrNull(graph, URIs.Images_Union);\r
-        Intersection = getResourceOrNull(graph, URIs.Intersection);\r
-        Model = getResourceOrNull(graph, URIs.Model);\r
-        Primitive = getResourceOrNull(graph, URIs.Primitive);\r
-        RectangularSolid = getResourceOrNull(graph, URIs.RectangularSolid);\r
-        RegularPrism = getResourceOrNull(graph, URIs.RegularPrism);\r
-        Shape = getResourceOrNull(graph, URIs.Shape);\r
-        Sphere = getResourceOrNull(graph, URIs.Sphere);\r
-        Torus = getResourceOrNull(graph, URIs.Torus);\r
-        Union = getResourceOrNull(graph, URIs.Union);\r
-        hasChildShape = getResourceOrNull(graph, URIs.hasChildShape);\r
-        hasChildShape_Inverse = getResourceOrNull(graph, URIs.hasChildShape_Inverse);\r
-        hasPrimaryShape = getResourceOrNull(graph, URIs.hasPrimaryShape);\r
-        hasPrimaryShape_Inverse = getResourceOrNull(graph, URIs.hasPrimaryShape_Inverse);\r
-        hasSecondaryShape = getResourceOrNull(graph, URIs.hasSecondaryShape);\r
-        hasSecondaryShape_Inverse = getResourceOrNull(graph, URIs.hasSecondaryShape_Inverse);\r
-    }\r
-    \r
-    public static CSG getInstance(ReadGraph graph) {\r
-        Session session = graph.getSession();\r
-        CSG ret = session.peekService(CSG.class);\r
-        if(ret == null) {\r
-            QueryControl qc = graph.getService(QueryControl.class);\r
-            ret = new CSG(qc.getIndependentGraph(graph));\r
-            session.registerService(CSG.class, ret);\r
-        }\r
-        return ret;\r
-    }\r
-    \r
-    public static CSG getInstance(RequestProcessor session) throws DatabaseException {\r
-        CSG ret = session.peekService(CSG.class);\r
-        if(ret == null) {\r
-            ret = session.syncRequest(new Read<CSG>() {\r
-                public CSG perform(ReadGraph graph) throws DatabaseException {\r
-                    QueryControl qc = graph.getService(QueryControl.class);\r
-                    return new CSG(qc.getIndependentGraph(graph));\r
-                }\r
-            });\r
-            session.registerService(CSG.class, ret);\r
-        }\r
-        return ret;\r
-    }\r
-    \r
-}\r
-\r
+package org.simantics.g3d.csg.ontology;
+
+import org.simantics.db.RequestProcessor;
+import org.simantics.db.Resource;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.request.Read;
+import org.simantics.db.Session;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.service.QueryControl;
+
+public class CSG {
+    
+    public final Resource Barrel;
+    public final Resource BooleanOperation;
+    public final Resource Box;
+    public final Resource CSGBrowseContext;
+    public final Resource CSGBrowseContext_ActiveLabelDecorationRule;
+    public final Resource CSGBrowseContext_RunLabelRule;
+    public final Resource CSGBrowseContext_ShapeTabContribution;
+    public final Resource Cone;
+    public final Resource Cylinder;
+    public final Resource Difference;
+    public final Resource EllipticCylinder;
+    public final Resource HasBottomRadius;
+    public final Resource HasBottomRadius_Inverse;
+    public final Resource HasCorners;
+    public final Resource HasCorners_Inverse;
+    public final Resource HasHeight;
+    public final Resource HasHeight_Inverse;
+    public final Resource HasMajorRadius;
+    public final Resource HasMajorRadius_Inverse;
+    public final Resource HasMinorRadius;
+    public final Resource HasMinorRadius_Inverse;
+    public final Resource HasRadius;
+    public final Resource HasRadius_Inverse;
+    public final Resource HasSizingProperty;
+    public final Resource HasSizingProperty_Inverse;
+    public final Resource HasTopRadius;
+    public final Resource HasTopRadius_Inverse;
+    public final Resource HasXAxisMaximumSize;
+    public final Resource HasXAxisMaximumSize_Inverse;
+    public final Resource HasXAxisMinimumSize;
+    public final Resource HasXAxisMinimumSize_Inverse;
+    public final Resource HasXAxisSize;
+    public final Resource HasXAxisSize_Inverse;
+    public final Resource HasYAxisSize;
+    public final Resource HasYAxisSize_Inverse;
+    public final Resource HasZAxisMaximumSize;
+    public final Resource HasZAxisMaximumSize_Inverse;
+    public final Resource HasZAxisMinimumSize;
+    public final Resource HasZAxisMinimumSize_Inverse;
+    public final Resource HasZAxisSize;
+    public final Resource HasZAxisSize_Inverse;
+    public final Resource Images;
+    public final Resource Images_Difference;
+    public final Resource Images_Intersection;
+    public final Resource Images_Ruby;
+    public final Resource Images_Union;
+    public final Resource Intersection;
+    public final Resource Model;
+    public final Resource Primitive;
+    public final Resource RectangularSolid;
+    public final Resource RegularPrism;
+    public final Resource Shape;
+    public final Resource Sphere;
+    public final Resource Torus;
+    public final Resource Union;
+    public final Resource hasChildShape;
+    public final Resource hasChildShape_Inverse;
+    public final Resource hasPrimaryShape;
+    public final Resource hasPrimaryShape_Inverse;
+    public final Resource hasSecondaryShape;
+    public final Resource hasSecondaryShape_Inverse;
+        
+    public static class URIs {
+        public static final String Barrel = "http://www.simantics.org/CSG-0.1/Barrel";
+        public static final String BooleanOperation = "http://www.simantics.org/CSG-0.1/BooleanOperation";
+        public static final String Box = "http://www.simantics.org/CSG-0.1/Box";
+        public static final String CSGBrowseContext = "http://www.simantics.org/CSG-0.1/CSGBrowseContext";
+        public static final String CSGBrowseContext_ActiveLabelDecorationRule = "http://www.simantics.org/CSG-0.1/CSGBrowseContext/ActiveLabelDecorationRule";
+        public static final String CSGBrowseContext_RunLabelRule = "http://www.simantics.org/CSG-0.1/CSGBrowseContext/RunLabelRule";
+        public static final String CSGBrowseContext_ShapeTabContribution = "http://www.simantics.org/CSG-0.1/CSGBrowseContext/ShapeTabContribution";
+        public static final String Cone = "http://www.simantics.org/CSG-0.1/Cone";
+        public static final String Cylinder = "http://www.simantics.org/CSG-0.1/Cylinder";
+        public static final String Difference = "http://www.simantics.org/CSG-0.1/Difference";
+        public static final String EllipticCylinder = "http://www.simantics.org/CSG-0.1/EllipticCylinder";
+        public static final String HasBottomRadius = "http://www.simantics.org/CSG-0.1/HasBottomRadius";
+        public static final String HasBottomRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasBottomRadius/Inverse";
+        public static final String HasCorners = "http://www.simantics.org/CSG-0.1/HasCorners";
+        public static final String HasCorners_Inverse = "http://www.simantics.org/CSG-0.1/HasCorners/Inverse";
+        public static final String HasHeight = "http://www.simantics.org/CSG-0.1/HasHeight";
+        public static final String HasHeight_Inverse = "http://www.simantics.org/CSG-0.1/HasHeight/Inverse";
+        public static final String HasMajorRadius = "http://www.simantics.org/CSG-0.1/HasMajorRadius";
+        public static final String HasMajorRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasMajorRadius/Inverse";
+        public static final String HasMinorRadius = "http://www.simantics.org/CSG-0.1/HasMinorRadius";
+        public static final String HasMinorRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasMinorRadius/Inverse";
+        public static final String HasRadius = "http://www.simantics.org/CSG-0.1/HasRadius";
+        public static final String HasRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasRadius/Inverse";
+        public static final String HasSizingProperty = "http://www.simantics.org/CSG-0.1/HasSizingProperty";
+        public static final String HasSizingProperty_Inverse = "http://www.simantics.org/CSG-0.1/HasSizingProperty/Inverse";
+        public static final String HasTopRadius = "http://www.simantics.org/CSG-0.1/HasTopRadius";
+        public static final String HasTopRadius_Inverse = "http://www.simantics.org/CSG-0.1/HasTopRadius/Inverse";
+        public static final String HasXAxisMaximumSize = "http://www.simantics.org/CSG-0.1/HasXAxisMaximumSize";
+        public static final String HasXAxisMaximumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasXAxisMaximumSize/Inverse";
+        public static final String HasXAxisMinimumSize = "http://www.simantics.org/CSG-0.1/HasXAxisMinimumSize";
+        public static final String HasXAxisMinimumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasXAxisMinimumSize/Inverse";
+        public static final String HasXAxisSize = "http://www.simantics.org/CSG-0.1/HasXAxisSize";
+        public static final String HasXAxisSize_Inverse = "http://www.simantics.org/CSG-0.1/HasXAxisSize/Inverse";
+        public static final String HasYAxisSize = "http://www.simantics.org/CSG-0.1/HasYAxisSize";
+        public static final String HasYAxisSize_Inverse = "http://www.simantics.org/CSG-0.1/HasYAxisSize/Inverse";
+        public static final String HasZAxisMaximumSize = "http://www.simantics.org/CSG-0.1/HasZAxisMaximumSize";
+        public static final String HasZAxisMaximumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasZAxisMaximumSize/Inverse";
+        public static final String HasZAxisMinimumSize = "http://www.simantics.org/CSG-0.1/HasZAxisMinimumSize";
+        public static final String HasZAxisMinimumSize_Inverse = "http://www.simantics.org/CSG-0.1/HasZAxisMinimumSize/Inverse";
+        public static final String HasZAxisSize = "http://www.simantics.org/CSG-0.1/HasZAxisSize";
+        public static final String HasZAxisSize_Inverse = "http://www.simantics.org/CSG-0.1/HasZAxisSize/Inverse";
+        public static final String Images = "http://www.simantics.org/CSG-0.1/Images";
+        public static final String Images_Difference = "http://www.simantics.org/CSG-0.1/Images/Difference";
+        public static final String Images_Intersection = "http://www.simantics.org/CSG-0.1/Images/Intersection";
+        public static final String Images_Ruby = "http://www.simantics.org/CSG-0.1/Images/Ruby";
+        public static final String Images_Union = "http://www.simantics.org/CSG-0.1/Images/Union";
+        public static final String Intersection = "http://www.simantics.org/CSG-0.1/Intersection";
+        public static final String Model = "http://www.simantics.org/CSG-0.1/Model";
+        public static final String Primitive = "http://www.simantics.org/CSG-0.1/Primitive";
+        public static final String RectangularSolid = "http://www.simantics.org/CSG-0.1/RectangularSolid";
+        public static final String RegularPrism = "http://www.simantics.org/CSG-0.1/RegularPrism";
+        public static final String Shape = "http://www.simantics.org/CSG-0.1/Shape";
+        public static final String Sphere = "http://www.simantics.org/CSG-0.1/Sphere";
+        public static final String Torus = "http://www.simantics.org/CSG-0.1/Torus";
+        public static final String Union = "http://www.simantics.org/CSG-0.1/Union";
+        public static final String hasChildShape = "http://www.simantics.org/CSG-0.1/hasChildShape";
+        public static final String hasChildShape_Inverse = "http://www.simantics.org/CSG-0.1/hasChildShape/Inverse";
+        public static final String hasPrimaryShape = "http://www.simantics.org/CSG-0.1/hasPrimaryShape";
+        public static final String hasPrimaryShape_Inverse = "http://www.simantics.org/CSG-0.1/hasPrimaryShape/Inverse";
+        public static final String hasSecondaryShape = "http://www.simantics.org/CSG-0.1/hasSecondaryShape";
+        public static final String hasSecondaryShape_Inverse = "http://www.simantics.org/CSG-0.1/hasSecondaryShape/Inverse";
+    }
+    
+    public static Resource getResourceOrNull(ReadGraph graph, String uri) {
+        try {
+            return graph.getResource(uri);
+        } catch(DatabaseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+    
+    public CSG(ReadGraph graph) {
+        Barrel = getResourceOrNull(graph, URIs.Barrel);
+        BooleanOperation = getResourceOrNull(graph, URIs.BooleanOperation);
+        Box = getResourceOrNull(graph, URIs.Box);
+        CSGBrowseContext = getResourceOrNull(graph, URIs.CSGBrowseContext);
+        CSGBrowseContext_ActiveLabelDecorationRule = getResourceOrNull(graph, URIs.CSGBrowseContext_ActiveLabelDecorationRule);
+        CSGBrowseContext_RunLabelRule = getResourceOrNull(graph, URIs.CSGBrowseContext_RunLabelRule);
+        CSGBrowseContext_ShapeTabContribution = getResourceOrNull(graph, URIs.CSGBrowseContext_ShapeTabContribution);
+        Cone = getResourceOrNull(graph, URIs.Cone);
+        Cylinder = getResourceOrNull(graph, URIs.Cylinder);
+        Difference = getResourceOrNull(graph, URIs.Difference);
+        EllipticCylinder = getResourceOrNull(graph, URIs.EllipticCylinder);
+        HasBottomRadius = getResourceOrNull(graph, URIs.HasBottomRadius);
+        HasBottomRadius_Inverse = getResourceOrNull(graph, URIs.HasBottomRadius_Inverse);
+        HasCorners = getResourceOrNull(graph, URIs.HasCorners);
+        HasCorners_Inverse = getResourceOrNull(graph, URIs.HasCorners_Inverse);
+        HasHeight = getResourceOrNull(graph, URIs.HasHeight);
+        HasHeight_Inverse = getResourceOrNull(graph, URIs.HasHeight_Inverse);
+        HasMajorRadius = getResourceOrNull(graph, URIs.HasMajorRadius);
+        HasMajorRadius_Inverse = getResourceOrNull(graph, URIs.HasMajorRadius_Inverse);
+        HasMinorRadius = getResourceOrNull(graph, URIs.HasMinorRadius);
+        HasMinorRadius_Inverse = getResourceOrNull(graph, URIs.HasMinorRadius_Inverse);
+        HasRadius = getResourceOrNull(graph, URIs.HasRadius);
+        HasRadius_Inverse = getResourceOrNull(graph, URIs.HasRadius_Inverse);
+        HasSizingProperty = getResourceOrNull(graph, URIs.HasSizingProperty);
+        HasSizingProperty_Inverse = getResourceOrNull(graph, URIs.HasSizingProperty_Inverse);
+        HasTopRadius = getResourceOrNull(graph, URIs.HasTopRadius);
+        HasTopRadius_Inverse = getResourceOrNull(graph, URIs.HasTopRadius_Inverse);
+        HasXAxisMaximumSize = getResourceOrNull(graph, URIs.HasXAxisMaximumSize);
+        HasXAxisMaximumSize_Inverse = getResourceOrNull(graph, URIs.HasXAxisMaximumSize_Inverse);
+        HasXAxisMinimumSize = getResourceOrNull(graph, URIs.HasXAxisMinimumSize);
+        HasXAxisMinimumSize_Inverse = getResourceOrNull(graph, URIs.HasXAxisMinimumSize_Inverse);
+        HasXAxisSize = getResourceOrNull(graph, URIs.HasXAxisSize);
+        HasXAxisSize_Inverse = getResourceOrNull(graph, URIs.HasXAxisSize_Inverse);
+        HasYAxisSize = getResourceOrNull(graph, URIs.HasYAxisSize);
+        HasYAxisSize_Inverse = getResourceOrNull(graph, URIs.HasYAxisSize_Inverse);
+        HasZAxisMaximumSize = getResourceOrNull(graph, URIs.HasZAxisMaximumSize);
+        HasZAxisMaximumSize_Inverse = getResourceOrNull(graph, URIs.HasZAxisMaximumSize_Inverse);
+        HasZAxisMinimumSize = getResourceOrNull(graph, URIs.HasZAxisMinimumSize);
+        HasZAxisMinimumSize_Inverse = getResourceOrNull(graph, URIs.HasZAxisMinimumSize_Inverse);
+        HasZAxisSize = getResourceOrNull(graph, URIs.HasZAxisSize);
+        HasZAxisSize_Inverse = getResourceOrNull(graph, URIs.HasZAxisSize_Inverse);
+        Images = getResourceOrNull(graph, URIs.Images);
+        Images_Difference = getResourceOrNull(graph, URIs.Images_Difference);
+        Images_Intersection = getResourceOrNull(graph, URIs.Images_Intersection);
+        Images_Ruby = getResourceOrNull(graph, URIs.Images_Ruby);
+        Images_Union = getResourceOrNull(graph, URIs.Images_Union);
+        Intersection = getResourceOrNull(graph, URIs.Intersection);
+        Model = getResourceOrNull(graph, URIs.Model);
+        Primitive = getResourceOrNull(graph, URIs.Primitive);
+        RectangularSolid = getResourceOrNull(graph, URIs.RectangularSolid);
+        RegularPrism = getResourceOrNull(graph, URIs.RegularPrism);
+        Shape = getResourceOrNull(graph, URIs.Shape);
+        Sphere = getResourceOrNull(graph, URIs.Sphere);
+        Torus = getResourceOrNull(graph, URIs.Torus);
+        Union = getResourceOrNull(graph, URIs.Union);
+        hasChildShape = getResourceOrNull(graph, URIs.hasChildShape);
+        hasChildShape_Inverse = getResourceOrNull(graph, URIs.hasChildShape_Inverse);
+        hasPrimaryShape = getResourceOrNull(graph, URIs.hasPrimaryShape);
+        hasPrimaryShape_Inverse = getResourceOrNull(graph, URIs.hasPrimaryShape_Inverse);
+        hasSecondaryShape = getResourceOrNull(graph, URIs.hasSecondaryShape);
+        hasSecondaryShape_Inverse = getResourceOrNull(graph, URIs.hasSecondaryShape_Inverse);
+    }
+    
+    public static CSG getInstance(ReadGraph graph) {
+        Session session = graph.getSession();
+        CSG ret = session.peekService(CSG.class);
+        if(ret == null) {
+            QueryControl qc = graph.getService(QueryControl.class);
+            ret = new CSG(qc.getIndependentGraph(graph));
+            session.registerService(CSG.class, ret);
+        }
+        return ret;
+    }
+    
+    public static CSG getInstance(RequestProcessor session) throws DatabaseException {
+        CSG ret = session.peekService(CSG.class);
+        if(ret == null) {
+            ret = session.syncRequest(new Read<CSG>() {
+                public CSG perform(ReadGraph graph) throws DatabaseException {
+                    QueryControl qc = graph.getService(QueryControl.class);
+                    return new CSG(qc.getIndependentGraph(graph));
+                }
+            });
+            session.registerService(CSG.class, ret);
+        }
+        return ret;
+    }
+    
+}
+

diff --git a/org.simantics.g3d.ontology/.gitignore b/org.simantics.g3d.ontology/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..e696a2182079ab6d74b7cf6e0887e6ea60dfe9e5 100644 (file)
--- a/org.simantics.g3d.ontology/.gitignore
+++ b/org.simantics.g3d.ontology/.gitignore
@@ -1 +1,2 @@
 /bin/
+/graph.tg

diff --git a/org.simantics.g3d.ontology/graph.tg b/org.simantics.g3d.ontology/graph.tg
deleted file mode 100644 (file)
index ed0e5d3..0000000
Binary files a/org.simantics.g3d.ontology/graph.tg and /dev/null differ

diff --git a/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java b/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java
index ee58a301ce154945c8cae01c5c674c9e593b1474..f58a9f6d0299fc839a2cad70ea62643764bbca04 100644 (file)
--- a/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java
+++ b/org.simantics.g3d.ontology/src/org/simantics/g3d/ontology/G3D.java
@@ -1,153 +1,142 @@
-/*******************************************************************************\r
- * Copyright (c) 2012, 2013 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.g3d.ontology;\r
-\r
-import org.simantics.db.RequestProcessor;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.db.Session;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.service.QueryControl;\r
-\r
-public class G3D {\r
-    \r
-    public final Resource BaseNode;\r
-    public final Resource Node;\r
-    public final Resource Orientation;\r
-    public final Resource Position;\r
-    public final Resource RootNode;\r
-    public final Resource Tuple3D;\r
-    public final Resource Tuple4D;\r
-    public final Resource children;\r
-    public final Resource geometryDefinition;\r
-    public final Resource geometryDefinitionOf;\r
-    public final Resource hasNodeProperty;\r
-    public final Resource hasNodeProperty_Inverse;\r
-    public final Resource hasNonTransformation;\r
-    public final Resource hasNonTransformation_Inverse;\r
-    public final Resource hasOrientation;\r
-    public final Resource hasOrientation_Inverse;\r
-    public final Resource hasPosition;\r
-    public final Resource hasPosition_Inverse;\r
-    public final Resource hasTransformation;\r
-    public final Resource hasTransformation_Inverse;\r
-    public final Resource hasWorldOrientation;\r
-    public final Resource hasWorldOrientation_Inverse;\r
-    public final Resource hasWorldPosition;\r
-    public final Resource hasWorldPosition_Inverse;\r
-    public final Resource nodes;\r
-    public final Resource parent;\r
-    public final Resource parentNode;\r
-    public final Resource publishes;\r
-    public final Resource publishes_Inverse;\r
-        \r
-    public static class URIs {\r
-        public static final String BaseNode = "http://www.simantics.org/G3D-0.1/BaseNode";\r
-        public static final String Node = "http://www.simantics.org/G3D-0.1/Node";\r
-        public static final String Orientation = "http://www.simantics.org/G3D-0.1/Orientation";\r
-        public static final String Position = "http://www.simantics.org/G3D-0.1/Position";\r
-        public static final String RootNode = "http://www.simantics.org/G3D-0.1/RootNode";\r
-        public static final String Tuple3D = "http://www.simantics.org/G3D-0.1/Tuple3D";\r
-        public static final String Tuple4D = "http://www.simantics.org/G3D-0.1/Tuple4D";\r
-        public static final String children = "http://www.simantics.org/G3D-0.1/children";\r
-        public static final String geometryDefinition = "http://www.simantics.org/G3D-0.1/geometryDefinition";\r
-        public static final String geometryDefinitionOf = "http://www.simantics.org/G3D-0.1/geometryDefinitionOf";\r
-        public static final String hasNodeProperty = "http://www.simantics.org/G3D-0.1/hasNodeProperty";\r
-        public static final String hasNodeProperty_Inverse = "http://www.simantics.org/G3D-0.1/hasNodeProperty/Inverse";\r
-        public static final String hasNonTransformation = "http://www.simantics.org/G3D-0.1/hasNonTransformation";\r
-        public static final String hasNonTransformation_Inverse = "http://www.simantics.org/G3D-0.1/hasNonTransformation/Inverse";\r
-        public static final String hasOrientation = "http://www.simantics.org/G3D-0.1/hasOrientation";\r
-        public static final String hasOrientation_Inverse = "http://www.simantics.org/G3D-0.1/hasOrientation/Inverse";\r
-        public static final String hasPosition = "http://www.simantics.org/G3D-0.1/hasPosition";\r
-        public static final String hasPosition_Inverse = "http://www.simantics.org/G3D-0.1/hasPosition/Inverse";\r
-        public static final String hasTransformation = "http://www.simantics.org/G3D-0.1/hasTransformation";\r
-        public static final String hasTransformation_Inverse = "http://www.simantics.org/G3D-0.1/hasTransformation/Inverse";\r
-        public static final String hasWorldOrientation = "http://www.simantics.org/G3D-0.1/hasWorldOrientation";\r
-        public static final String hasWorldOrientation_Inverse = "http://www.simantics.org/G3D-0.1/hasWorldOrientation/Inverse";\r
-        public static final String hasWorldPosition = "http://www.simantics.org/G3D-0.1/hasWorldPosition";\r
-        public static final String hasWorldPosition_Inverse = "http://www.simantics.org/G3D-0.1/hasWorldPosition/Inverse";\r
-        public static final String nodes = "http://www.simantics.org/G3D-0.1/nodes";\r
-        public static final String parent = "http://www.simantics.org/G3D-0.1/parent";\r
-        public static final String parentNode = "http://www.simantics.org/G3D-0.1/parentNode";\r
-        public static final String publishes = "http://www.simantics.org/G3D-0.1/publishes";\r
-        public static final String publishes_Inverse = "http://www.simantics.org/G3D-0.1/publishes/Inverse";\r
-    }\r
-    \r
-    public static Resource getResourceOrNull(ReadGraph graph, String uri) {\r
-        try {\r
-            return graph.getResource(uri);\r
-        } catch(DatabaseException e) {\r
-            System.err.println(e.getMessage());\r
-            return null;\r
-        }\r
-    }\r
-    \r
-    public G3D(ReadGraph graph) {\r
-        BaseNode = getResourceOrNull(graph, URIs.BaseNode);\r
-        Node = getResourceOrNull(graph, URIs.Node);\r
-        Orientation = getResourceOrNull(graph, URIs.Orientation);\r
-        Position = getResourceOrNull(graph, URIs.Position);\r
-        RootNode = getResourceOrNull(graph, URIs.RootNode);\r
-        Tuple3D = getResourceOrNull(graph, URIs.Tuple3D);\r
-        Tuple4D = getResourceOrNull(graph, URIs.Tuple4D);\r
-        children = getResourceOrNull(graph, URIs.children);\r
-        geometryDefinition = getResourceOrNull(graph, URIs.geometryDefinition);\r
-        geometryDefinitionOf = getResourceOrNull(graph, URIs.geometryDefinitionOf);\r
-        hasNodeProperty = getResourceOrNull(graph, URIs.hasNodeProperty);\r
-        hasNodeProperty_Inverse = getResourceOrNull(graph, URIs.hasNodeProperty_Inverse);\r
-        hasNonTransformation = getResourceOrNull(graph, URIs.hasNonTransformation);\r
-        hasNonTransformation_Inverse = getResourceOrNull(graph, URIs.hasNonTransformation_Inverse);\r
-        hasOrientation = getResourceOrNull(graph, URIs.hasOrientation);\r
-        hasOrientation_Inverse = getResourceOrNull(graph, URIs.hasOrientation_Inverse);\r
-        hasPosition = getResourceOrNull(graph, URIs.hasPosition);\r
-        hasPosition_Inverse = getResourceOrNull(graph, URIs.hasPosition_Inverse);\r
-        hasTransformation = getResourceOrNull(graph, URIs.hasTransformation);\r
-        hasTransformation_Inverse = getResourceOrNull(graph, URIs.hasTransformation_Inverse);\r
-        hasWorldOrientation = getResourceOrNull(graph, URIs.hasWorldOrientation);\r
-        hasWorldOrientation_Inverse = getResourceOrNull(graph, URIs.hasWorldOrientation_Inverse);\r
-        hasWorldPosition = getResourceOrNull(graph, URIs.hasWorldPosition);\r
-        hasWorldPosition_Inverse = getResourceOrNull(graph, URIs.hasWorldPosition_Inverse);\r
-        nodes = getResourceOrNull(graph, URIs.nodes);\r
-        parent = getResourceOrNull(graph, URIs.parent);\r
-        parentNode = getResourceOrNull(graph, URIs.parentNode);\r
-        publishes = getResourceOrNull(graph, URIs.publishes);\r
-        publishes_Inverse = getResourceOrNull(graph, URIs.publishes_Inverse);\r
-    }\r
-    \r
-    public static G3D getInstance(ReadGraph graph) {\r
-        Session session = graph.getSession();\r
-        G3D ret = session.peekService(G3D.class);\r
-        if(ret == null) {\r
-            QueryControl qc = graph.getService(QueryControl.class);\r
-            ret = new G3D(qc.getIndependentGraph(graph));\r
-            session.registerService(G3D.class, ret);\r
-        }\r
-        return ret;\r
-    }\r
-    \r
-    public static G3D getInstance(RequestProcessor session) throws DatabaseException {\r
-        G3D ret = session.peekService(G3D.class);\r
-        if(ret == null) {\r
-            ret = session.syncRequest(new Read<G3D>() {\r
-                public G3D perform(ReadGraph graph) throws DatabaseException {\r
-                    QueryControl qc = graph.getService(QueryControl.class);\r
-                    return new G3D(qc.getIndependentGraph(graph));\r
-                }\r
-            });\r
-            session.registerService(G3D.class, ret);\r
-        }\r
-        return ret;\r
-    }\r
-    \r
-}\r
-\r
+package org.simantics.g3d.ontology;
+
+import org.simantics.db.RequestProcessor;
+import org.simantics.db.Resource;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.request.Read;
+import org.simantics.db.Session;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.service.QueryControl;
+
+public class G3D {
+    
+    public final Resource BaseNode;
+    public final Resource Node;
+    public final Resource Orientation;
+    public final Resource Position;
+    public final Resource RootNode;
+    public final Resource Tuple3D;
+    public final Resource Tuple4D;
+    public final Resource children;
+    public final Resource geometryDefinition;
+    public final Resource geometryDefinitionOf;
+    public final Resource hasNodeProperty;
+    public final Resource hasNodeProperty_Inverse;
+    public final Resource hasNonTransformation;
+    public final Resource hasNonTransformation_Inverse;
+    public final Resource hasOrientation;
+    public final Resource hasOrientation_Inverse;
+    public final Resource hasPosition;
+    public final Resource hasPosition_Inverse;
+    public final Resource hasTransformation;
+    public final Resource hasTransformation_Inverse;
+    public final Resource hasWorldOrientation;
+    public final Resource hasWorldOrientation_Inverse;
+    public final Resource hasWorldPosition;
+    public final Resource hasWorldPosition_Inverse;
+    public final Resource nodes;
+    public final Resource parent;
+    public final Resource parentNode;
+    public final Resource publishes;
+    public final Resource publishes_Inverse;
+        
+    public static class URIs {
+        public static final String BaseNode = "http://www.simantics.org/G3D-0.1/BaseNode";
+        public static final String Node = "http://www.simantics.org/G3D-0.1/Node";
+        public static final String Orientation = "http://www.simantics.org/G3D-0.1/Orientation";
+        public static final String Position = "http://www.simantics.org/G3D-0.1/Position";
+        public static final String RootNode = "http://www.simantics.org/G3D-0.1/RootNode";
+        public static final String Tuple3D = "http://www.simantics.org/G3D-0.1/Tuple3D";
+        public static final String Tuple4D = "http://www.simantics.org/G3D-0.1/Tuple4D";
+        public static final String children = "http://www.simantics.org/G3D-0.1/children";
+        public static final String geometryDefinition = "http://www.simantics.org/G3D-0.1/geometryDefinition";
+        public static final String geometryDefinitionOf = "http://www.simantics.org/G3D-0.1/geometryDefinitionOf";
+        public static final String hasNodeProperty = "http://www.simantics.org/G3D-0.1/hasNodeProperty";
+        public static final String hasNodeProperty_Inverse = "http://www.simantics.org/G3D-0.1/hasNodeProperty/Inverse";
+        public static final String hasNonTransformation = "http://www.simantics.org/G3D-0.1/hasNonTransformation";
+        public static final String hasNonTransformation_Inverse = "http://www.simantics.org/G3D-0.1/hasNonTransformation/Inverse";
+        public static final String hasOrientation = "http://www.simantics.org/G3D-0.1/hasOrientation";
+        public static final String hasOrientation_Inverse = "http://www.simantics.org/G3D-0.1/hasOrientation/Inverse";
+        public static final String hasPosition = "http://www.simantics.org/G3D-0.1/hasPosition";
+        public static final String hasPosition_Inverse = "http://www.simantics.org/G3D-0.1/hasPosition/Inverse";
+        public static final String hasTransformation = "http://www.simantics.org/G3D-0.1/hasTransformation";
+        public static final String hasTransformation_Inverse = "http://www.simantics.org/G3D-0.1/hasTransformation/Inverse";
+        public static final String hasWorldOrientation = "http://www.simantics.org/G3D-0.1/hasWorldOrientation";
+        public static final String hasWorldOrientation_Inverse = "http://www.simantics.org/G3D-0.1/hasWorldOrientation/Inverse";
+        public static final String hasWorldPosition = "http://www.simantics.org/G3D-0.1/hasWorldPosition";
+        public static final String hasWorldPosition_Inverse = "http://www.simantics.org/G3D-0.1/hasWorldPosition/Inverse";
+        public static final String nodes = "http://www.simantics.org/G3D-0.1/nodes";
+        public static final String parent = "http://www.simantics.org/G3D-0.1/parent";
+        public static final String parentNode = "http://www.simantics.org/G3D-0.1/parentNode";
+        public static final String publishes = "http://www.simantics.org/G3D-0.1/publishes";
+        public static final String publishes_Inverse = "http://www.simantics.org/G3D-0.1/publishes/Inverse";
+    }
+    
+    public static Resource getResourceOrNull(ReadGraph graph, String uri) {
+        try {
+            return graph.getResource(uri);
+        } catch(DatabaseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+    
+    public G3D(ReadGraph graph) {
+        BaseNode = getResourceOrNull(graph, URIs.BaseNode);
+        Node = getResourceOrNull(graph, URIs.Node);
+        Orientation = getResourceOrNull(graph, URIs.Orientation);
+        Position = getResourceOrNull(graph, URIs.Position);
+        RootNode = getResourceOrNull(graph, URIs.RootNode);
+        Tuple3D = getResourceOrNull(graph, URIs.Tuple3D);
+        Tuple4D = getResourceOrNull(graph, URIs.Tuple4D);
+        children = getResourceOrNull(graph, URIs.children);
+        geometryDefinition = getResourceOrNull(graph, URIs.geometryDefinition);
+        geometryDefinitionOf = getResourceOrNull(graph, URIs.geometryDefinitionOf);
+        hasNodeProperty = getResourceOrNull(graph, URIs.hasNodeProperty);
+        hasNodeProperty_Inverse = getResourceOrNull(graph, URIs.hasNodeProperty_Inverse);
+        hasNonTransformation = getResourceOrNull(graph, URIs.hasNonTransformation);
+        hasNonTransformation_Inverse = getResourceOrNull(graph, URIs.hasNonTransformation_Inverse);
+        hasOrientation = getResourceOrNull(graph, URIs.hasOrientation);
+        hasOrientation_Inverse = getResourceOrNull(graph, URIs.hasOrientation_Inverse);
+        hasPosition = getResourceOrNull(graph, URIs.hasPosition);
+        hasPosition_Inverse = getResourceOrNull(graph, URIs.hasPosition_Inverse);
+        hasTransformation = getResourceOrNull(graph, URIs.hasTransformation);
+        hasTransformation_Inverse = getResourceOrNull(graph, URIs.hasTransformation_Inverse);
+        hasWorldOrientation = getResourceOrNull(graph, URIs.hasWorldOrientation);
+        hasWorldOrientation_Inverse = getResourceOrNull(graph, URIs.hasWorldOrientation_Inverse);
+        hasWorldPosition = getResourceOrNull(graph, URIs.hasWorldPosition);
+        hasWorldPosition_Inverse = getResourceOrNull(graph, URIs.hasWorldPosition_Inverse);
+        nodes = getResourceOrNull(graph, URIs.nodes);
+        parent = getResourceOrNull(graph, URIs.parent);
+        parentNode = getResourceOrNull(graph, URIs.parentNode);
+        publishes = getResourceOrNull(graph, URIs.publishes);
+        publishes_Inverse = getResourceOrNull(graph, URIs.publishes_Inverse);
+    }
+    
+    public static G3D getInstance(ReadGraph graph) {
+        Session session = graph.getSession();
+        G3D ret = session.peekService(G3D.class);
+        if(ret == null) {
+            QueryControl qc = graph.getService(QueryControl.class);
+            ret = new G3D(qc.getIndependentGraph(graph));
+            session.registerService(G3D.class, ret);
+        }
+        return ret;
+    }
+    
+    public static G3D getInstance(RequestProcessor session) throws DatabaseException {
+        G3D ret = session.peekService(G3D.class);
+        if(ret == null) {
+            ret = session.syncRequest(new Read<G3D>() {
+                public G3D perform(ReadGraph graph) throws DatabaseException {
+                    QueryControl qc = graph.getService(QueryControl.class);
+                    return new G3D(qc.getIndependentGraph(graph));
+                }
+            });
+            session.registerService(G3D.class, ret);
+        }
+        return ret;
+    }
+    
+}
+

diff --git a/org.simantics.g3d/build.properties b/org.simantics.g3d/build.properties
index 0016b86a8a7ba397108e2af99ec11e378e7fe907..3d85ef02316220ab5c122d85bdfff693b6867b03 100644 (file)
--- a/org.simantics.g3d/build.properties
+++ b/org.simantics.g3d/build.properties
@@ -13,4 +13,5 @@ source.. = src/
 output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
-               plugin.xml\r
+               plugin.xml,\\r
+               adapters.xml\r

diff --git a/org.simantics.plant3d.ontology/.gitignore b/org.simantics.plant3d.ontology/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..e696a2182079ab6d74b7cf6e0887e6ea60dfe9e5 100644 (file)
--- a/org.simantics.plant3d.ontology/.gitignore
+++ b/org.simantics.plant3d.ontology/.gitignore
@@ -1 +1,2 @@
 /bin/
+/graph.tg

diff --git a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
index e8558f2864fbfded90c5f26b81a86cd46e23ed32..3e430365d3327283b422b4d9a27f5b923b8606da 100644 (file)
--- a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
+++ b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
@@ -21,6 +21,8 @@ public class Plant3D {
     public final Resource Builtin_ConcentricReducer;
     public final Resource Builtin_EccentricReducer;
     public final Resource Builtin_Elbow;
+    public final Resource Builtin_Elbow45;
+    public final Resource Builtin_Elbow90;
     public final Resource Builtin_ElbowGeometryProvider;
     public final Resource Builtin_GateValve;
     public final Resource Builtin_GateValveGeometryProvider;
@@ -54,6 +56,8 @@ public class Plant3D {
     public final Resource HasBranch7;
     public final Resource HasBranch8;
     public final Resource HasBranch9;
+    public final Resource HasLength;
+    public final Resource HasLength_Inverse;
     public final Resource HasNext;
     public final Resource HasNozzle;
     public final Resource HasNozzleDefinition;
@@ -68,6 +72,8 @@ public class Plant3D {
     public final Resource HasPrevious;
     public final Resource HasRotationAngle;
     public final Resource HasRotationAngle_Inverse;
+    public final Resource HasTurnAngle;
+    public final Resource HasTurnAngle_Inverse;
     public final Resource HasTurnAxis;
     public final Resource HasTurnAxis_Inverse;
     public final Resource HasTurnRadius;
@@ -102,6 +108,7 @@ public class Plant3D {
     public final Resource PipelineComponentTag;
     public final Resource Plant;
     public final Resource PreviousInverse;
+    public final Resource ReverseComponent;
     public final Resource RotateComponent;
     public final Resource SingleConnectedComponent;
     public final Resource SizeChangeComponent;
@@ -126,6 +133,8 @@ public class Plant3D {
         public static final String Builtin_ConcentricReducer = "http://www.simantics.org/Plant3D-0.1/Builtin/ConcentricReducer";
         public static final String Builtin_EccentricReducer = "http://www.simantics.org/Plant3D-0.1/Builtin/EccentricReducer";
         public static final String Builtin_Elbow = "http://www.simantics.org/Plant3D-0.1/Builtin/Elbow";
+        public static final String Builtin_Elbow45 = "http://www.simantics.org/Plant3D-0.1/Builtin/Elbow45";
+        public static final String Builtin_Elbow90 = "http://www.simantics.org/Plant3D-0.1/Builtin/Elbow90";
         public static final String Builtin_ElbowGeometryProvider = "http://www.simantics.org/Plant3D-0.1/Builtin/ElbowGeometryProvider";
         public static final String Builtin_GateValve = "http://www.simantics.org/Plant3D-0.1/Builtin/GateValve";
         public static final String Builtin_GateValveGeometryProvider = "http://www.simantics.org/Plant3D-0.1/Builtin/GateValveGeometryProvider";
@@ -159,6 +168,8 @@ public class Plant3D {
         public static final String HasBranch7 = "http://www.simantics.org/Plant3D-0.1/HasBranch7";
         public static final String HasBranch8 = "http://www.simantics.org/Plant3D-0.1/HasBranch8";
         public static final String HasBranch9 = "http://www.simantics.org/Plant3D-0.1/HasBranch9";
+        public static final String HasLength = "http://www.simantics.org/Plant3D-0.1/HasLength";
+        public static final String HasLength_Inverse = "http://www.simantics.org/Plant3D-0.1/HasLength/Inverse";
         public static final String HasNext = "http://www.simantics.org/Plant3D-0.1/HasNext";
         public static final String HasNozzle = "http://www.simantics.org/Plant3D-0.1/HasNozzle";
         public static final String HasNozzleDefinition = "http://www.simantics.org/Plant3D-0.1/HasNozzleDefinition";
@@ -173,6 +184,8 @@ public class Plant3D {
         public static final String HasPrevious = "http://www.simantics.org/Plant3D-0.1/HasPrevious";
         public static final String HasRotationAngle = "http://www.simantics.org/Plant3D-0.1/HasRotationAngle";
         public static final String HasRotationAngle_Inverse = "http://www.simantics.org/Plant3D-0.1/HasRotationAngle/Inverse";
+        public static final String HasTurnAngle = "http://www.simantics.org/Plant3D-0.1/HasTurnAngle";
+        public static final String HasTurnAngle_Inverse = "http://www.simantics.org/Plant3D-0.1/HasTurnAngle/Inverse";
         public static final String HasTurnAxis = "http://www.simantics.org/Plant3D-0.1/HasTurnAxis";
         public static final String HasTurnAxis_Inverse = "http://www.simantics.org/Plant3D-0.1/HasTurnAxis/Inverse";
         public static final String HasTurnRadius = "http://www.simantics.org/Plant3D-0.1/HasTurnRadius";
@@ -207,6 +220,7 @@ public class Plant3D {
         public static final String PipelineComponentTag = "http://www.simantics.org/Plant3D-0.1/PipelineComponentTag";
         public static final String Plant = "http://www.simantics.org/Plant3D-0.1/Plant";
         public static final String PreviousInverse = "http://www.simantics.org/Plant3D-0.1/PreviousInverse";
+        public static final String ReverseComponent = "http://www.simantics.org/Plant3D-0.1/ReverseComponent";
         public static final String RotateComponent = "http://www.simantics.org/Plant3D-0.1/RotateComponent";
         public static final String SingleConnectedComponent = "http://www.simantics.org/Plant3D-0.1/SingleConnectedComponent";
         public static final String SizeChangeComponent = "http://www.simantics.org/Plant3D-0.1/SizeChangeComponent";
@@ -241,6 +255,8 @@ public class Plant3D {
         Builtin_ConcentricReducer = getResourceOrNull(graph, URIs.Builtin_ConcentricReducer);
         Builtin_EccentricReducer = getResourceOrNull(graph, URIs.Builtin_EccentricReducer);
         Builtin_Elbow = getResourceOrNull(graph, URIs.Builtin_Elbow);
+        Builtin_Elbow45 = getResourceOrNull(graph, URIs.Builtin_Elbow45);
+        Builtin_Elbow90 = getResourceOrNull(graph, URIs.Builtin_Elbow90);
         Builtin_ElbowGeometryProvider = getResourceOrNull(graph, URIs.Builtin_ElbowGeometryProvider);
         Builtin_GateValve = getResourceOrNull(graph, URIs.Builtin_GateValve);
         Builtin_GateValveGeometryProvider = getResourceOrNull(graph, URIs.Builtin_GateValveGeometryProvider);
@@ -274,6 +290,8 @@ public class Plant3D {
         HasBranch7 = getResourceOrNull(graph, URIs.HasBranch7);
         HasBranch8 = getResourceOrNull(graph, URIs.HasBranch8);
         HasBranch9 = getResourceOrNull(graph, URIs.HasBranch9);
+        HasLength = getResourceOrNull(graph, URIs.HasLength);
+        HasLength_Inverse = getResourceOrNull(graph, URIs.HasLength_Inverse);
         HasNext = getResourceOrNull(graph, URIs.HasNext);
         HasNozzle = getResourceOrNull(graph, URIs.HasNozzle);
         HasNozzleDefinition = getResourceOrNull(graph, URIs.HasNozzleDefinition);
@@ -288,6 +306,8 @@ public class Plant3D {
         HasPrevious = getResourceOrNull(graph, URIs.HasPrevious);
         HasRotationAngle = getResourceOrNull(graph, URIs.HasRotationAngle);
         HasRotationAngle_Inverse = getResourceOrNull(graph, URIs.HasRotationAngle_Inverse);
+        HasTurnAngle = getResourceOrNull(graph, URIs.HasTurnAngle);
+        HasTurnAngle_Inverse = getResourceOrNull(graph, URIs.HasTurnAngle_Inverse);
         HasTurnAxis = getResourceOrNull(graph, URIs.HasTurnAxis);
         HasTurnAxis_Inverse = getResourceOrNull(graph, URIs.HasTurnAxis_Inverse);
         HasTurnRadius = getResourceOrNull(graph, URIs.HasTurnRadius);
@@ -322,6 +342,7 @@ public class Plant3D {
         PipelineComponentTag = getResourceOrNull(graph, URIs.PipelineComponentTag);
         Plant = getResourceOrNull(graph, URIs.Plant);
         PreviousInverse = getResourceOrNull(graph, URIs.PreviousInverse);
+        ReverseComponent = getResourceOrNull(graph, URIs.ReverseComponent);
         RotateComponent = getResourceOrNull(graph, URIs.RotateComponent);
         SingleConnectedComponent = getResourceOrNull(graph, URIs.SingleConnectedComponent);
         SizeChangeComponent = getResourceOrNull(graph, URIs.SizeChangeComponent);

diff --git a/pom.xml b/pom.xml
index 0abf255ba203f364424617351f7dc3a229ef56e6..e278711e7e4edbf3f8e40108b1abad75b29d8638 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,33 @@
                </repository>
        </repositories>
 
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>graph-builder-snapshot</id>
+                       <name>Graph Builder Repository</name>
+                       <url>https://repo.simupedia.com/repository/graph-builder-release</url>
+                       <layout>default</layout>
+                       <releases>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <updatePolicy>always</updatePolicy>
+                       </snapshots>
+               </pluginRepository>
+       </pluginRepositories>
+
        <build>
                <plugins>
+                       <plugin>
+                               <groupId>org.simantics</groupId>
+                               <artifactId>graph-builder-maven-plugin</artifactId>
+                               <version>0.0.9</version>
+                               <executions>
+                                       <execution>
+                                               <goals><goal>compile-graphs</goal></goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <groupId>org.eclipse.tycho</groupId>
                                <artifactId>tycho-compiler-plugin</artifactId>

diff --git a/vtk.rendering.win32.win32.x86_64/.classpath b/vtk.rendering.win32.win32.x86_64/.classpath
index eca7bdba8f03f22510b7980a94dbfe10c16c0901..dbc0de13c3f3062651c6c05918505dd90112518d 100644 (file)
--- a/vtk.rendering.win32.win32.x86_64/.classpath
+++ b/vtk.rendering.win32.win32.x86_64/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r

diff --git a/vtk.rendering.win32.win32.x86_64/.gitignore b/vtk.rendering.win32.win32.x86_64/.gitignore
new file mode 100644 (file)
index 0000000..ae3c172
--- /dev/null
+++ b/vtk.rendering.win32.win32.x86_64/.gitignore
@@ -0,0 +1 @@
+/bin/

diff --git a/vtk.win32.win32.x86_64/.classpath b/vtk.win32.win32.x86_64/.classpath
index eca7bdba8f03f22510b7980a94dbfe10c16c0901..dbc0de13c3f3062651c6c05918505dd90112518d 100644 (file)
--- a/vtk.win32.win32.x86_64/.classpath
+++ b/vtk.win32.win32.x86_64/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r