Merge "Re-export Simantics/DB/findFreshName from Rename" into release/1.43.1

[simantics/platform.git] / bundles / org.simantics.modeling / scl / Simantics / Scenegraph.scl

diff --git a/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl b/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl
index 92738469719e2a0a165a89378879701ab1146d7f..401f2d8afaaaec6dc6816c38ec507930a101ca8b 100644 (file)
--- a/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl
+++ b/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl
@@ -5,6 +5,9 @@ import "Simantics/Rename"
 importJava "org.simantics.g2d.canvas.ICanvasContext" where
     data ICanvasContext
     
+    @JavaName dispose
+    disposeCanvasContext :: ICanvasContext -> <Proc> ()
+    
 importJava "org.simantics.g2d.scenegraph.ICanvasSceneGraphProvider" where
     data ICanvasSceneGraphProvider
     
@@ -44,9 +47,17 @@ importJava "org.simantics.modeling.SCLScenegraph" where
     @JavaName getNodeTransform
     getTransform :: ICanvasContext -> String -> String
     
-    getICanvasSceneGraphProvider :: Model -> Resource -> String -> ICanvasSceneGraphProvider
+    getBackgroundColor :: ICanvasContext -> Maybe [Integer]
+    
+    @Deprecated
+    getICanvasSceneGraphProvider :: Model -> Resource -> String -> <Proc> ICanvasSceneGraphProvider
+    
+    @Deprecated
+    disposeSceneGraphProvider :: ICanvasSceneGraphProvider -> <Proc> ()
+    
+    doWithICanvasSceneGraphProvider :: Resource -> (ICanvasSceneGraphProvider -> <e> a) -> <Proc, Exception> a
     
-    disposeSceneGraphProvider :: ICanvasSceneGraphProvider -> ()
+    doWithCanvasContext :: Resource -> (ICanvasContext -> <e> a) -> <Proc, Exception> a
     
     editNodeText :: ICanvasContext -> String -> String -> String -> <Proc> String
     
@@ -54,6 +65,30 @@ importJava "org.simantics.modeling.SCLScenegraph" where
     
     renderSVG :: ICanvasContext -> <Proc> String
 
+    "Render an SVG with known width and height in pixels: `renderScaledSVG context width height`"
+    @JavaName renderSVG
+    renderScaledSVG :: ICanvasContext -> Double -> Double -> <Proc> String
+    
+    @JavaName renderSVG
+    renderScaledAndAlignedSVG :: ICanvasContext -> Double -> Double -> Integer -> Integer -> <Proc> String
+
+importJava "org.eclipse.swt.SWT" where
+    
+    @JavaName LEFT
+    ALIGN_LEFT :: Integer
+    
+    @JavaName RIGHT
+    ALIGN_RIGHT :: Integer
+    
+    @JavaName CENTER
+    ALIGN_CENTER :: Integer
+    
+    @JavaName TOP
+    ALIGN_TOP :: Integer
+    
+    @JavaName BOTTOM
+    ALIGN_BOTTOM :: Integer
+
 getSceneGraphProvider :: Diagram -> <Proc> ICanvasSceneGraphProvider
 getSceneGraphProvider diagram = do
     diagramName = syncRead(\() -> getSafeName diagram)
@@ -100,10 +135,19 @@ importJava "org.simantics.scenegraph.g2d.G2DNodeModification" where
     data G2DNodeModification
     @JavaName "<init>"
     createG2DNodeModification :: [SVGNodeAssignment] -> [TransformationAssignment] -> G2DNodeModification 
+    @JavaName "<init>"
+    createG2DNodeModification3 :: [SVGNodeAssignment] -> [TargetedSVGNodeAssignment] -> [TransformationAssignment] -> G2DNodeModification 
     
 importJava "org.simantics.scenegraph.g2d.nodes.SVGNodeAssignment" where
     data SVGNodeAssignment
+    @JavaName "<init>"
+    createSVGNodeAssignment :: String -> String -> String -> SVGNodeAssignment 
     
+importJava "org.simantics.scenegraph.g2d.nodes.TargetedSVGNodeAssignment" where
+    data TargetedSVGNodeAssignment
+    @JavaName "<init>"
+    createTargetedSVGNodeAssignment :: a -> String -> String -> String -> TargetedSVGNodeAssignment 
+
 importJava "org.simantics.scenegraph.g2d.nodes.TransformationAssignment" where
     data TransformationAssignment
     @JavaName "<init>"