From: Reino Ruusu Date: Wed, 6 Nov 2019 13:07:58 +0000 (+0200) Subject: Updates to SCL interfaces X-Git-Tag: v1.43.0~138 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F3461%2F1;p=simantics%2F3d.git Updates to SCL interfaces refs #28 Change-Id: I94aa6a565b16237d5a9b9f9e36f4f2f38cfa0d71 --- diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl index f887b24b..68d61701 100644 --- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl +++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl @@ -7,6 +7,8 @@ importJava "org.simantics.plant3d.scenegraph.InlineComponent" where getRotationAngle :: InlineComponent -> Maybe Double setRotationAngle :: InlineComponent -> Maybe Double -> () + isSizeChange :: InlineComponent -> Boolean + isReversed :: InlineComponent -> Maybe Boolean setReversed :: InlineComponent -> Maybe Boolean -> () diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl index 6017c07a..40af0ec2 100644 --- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl +++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl @@ -1,12 +1,17 @@ include "G3D/Scenegraph/Node" include "G3D/Scenegraph/G3DNode" +import "Simantics/DB" (Resource) + importJava "org.simantics.plant3d.scenegraph.P3DRootNode" where data P3DRootNode addChild :: P3DRootNode -> Node -> () getChild :: P3DRootNode -> [Node] - remChild :: P3DRootNode -> Node -> () + remChild :: P3DRootNode -> Node -> () + + getNodeResource :: P3DRootNode -> Node -> Resource + getResourceNode :: P3DRootNode -> Resource -> Node instance NodeClass P3DRootNode instance ParentNodeClass P3DRootNode diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl index 820e787a..cc75aab2 100644 --- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl +++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl @@ -99,7 +99,7 @@ class PipelineComponentClass a where getType c = getType' (asPipelineComponent c) getControlPoint :: a -> PipeControlPoint - getControlPoint c = getControlPoint (asPipelineComponent c) + getControlPoint c = getControlPoint' (asPipelineComponent c) remove :: a -> () remove c = remove' (asPipelineComponent c) @@ -164,6 +164,8 @@ importJava "org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint" wher getPipelineComponent :: PipeControlPoint -> PipelineComponent + getTurnAngle :: PipeControlPoint -> Maybe Double + //@JavaName getType //getPointType :: PipeControlPoint -> PointType diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl index 19cc533e..3db98ddd 100644 --- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl +++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl @@ -9,6 +9,8 @@ importJava "org.simantics.plant3d.scenegraph.TurnComponent" where getTurnAngle :: TurnComponent -> Maybe Double setTurnAngle :: TurnComponent -> Maybe Double -> () + getTurnRadius :: TurnComponent -> Maybe Double + getTurnAxis :: TurnComponent -> Vector3d getRotationAngle :: TurnComponent -> Maybe Double