X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fadapter%2FCompositeImage.java;h=d4e20230185f18ae59c94824132ed88b401a772f;hb=617b9475710b80a125597f222f9777224972ce72;hp=93957f0698fc0643691d0676039ce676e78f4b3c;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/CompositeImage.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/CompositeImage.java
index 93957f069..d4e202301 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/CompositeImage.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/CompositeImage.java
@@ -18,11 +18,13 @@ import java.util.EnumSet;
 import java.util.List;
 
 import org.simantics.g2d.element.ElementClass;
+import org.simantics.g2d.element.ElementHints;
 import org.simantics.g2d.element.ElementUtils;
 import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.element.SceneGraphNodeKey;
 import org.simantics.g2d.element.handler.SceneGraph;
 import org.simantics.g2d.image.Image;
+import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.Node;
 import org.simantics.scenegraph.g2d.G2DParentNode;
 import org.simantics.scenegraph.g2d.nodes.SingleElementNode;
@@ -102,7 +104,7 @@ public class CompositeImage implements Image {
 //    }
 
     // Rendering is single-threaded, this is used while rendering.
-    Rectangle2D tempBounds = new Rectangle2D.Double(0, 0, 0, 0);
+    //Rectangle2D tempBounds = new Rectangle2D.Double(0, 0, 0, 0);
 
     @Override
     public Node init(G2DParentNode parent) {
@@ -110,7 +112,7 @@ public class CompositeImage implements Image {
             // Optimization for 0..1 element composites
             for (IElement e : elements) {
                 ElementClass ec = e.getElementClass();
-                G2DParentNode node = parent.getOrCreateNode("composite_image_"+this.hashCode(), G2DParentNode.class);
+                G2DParentNode node = getOrCreateParentNode(parent);
                 List<SceneGraph> nodeHandlers = ec.getItemsByClass(SceneGraph.class);
                 for (SceneGraph n : nodeHandlers) {
 //                    n.init(e, parent);
@@ -122,9 +124,7 @@ public class CompositeImage implements Image {
 
         // For N element composites
 
-        // Removed this grouping node as unnecessary, just use the given parent node
-        G2DParentNode node = parent.getOrCreateNode("composite_image_"+this.hashCode(), G2DParentNode.class);
-
+        G2DParentNode node = getOrCreateParentNode(parent);
 //        Rectangle2D bounds = tempBounds;
 
         int zIndex = 0;
@@ -140,6 +140,8 @@ public class CompositeImage implements Image {
             SingleElementNode holder = node.getOrCreateNode(ElementUtils.generateNodeId(e), SingleElementNode.class);
             //SingleElementNode holder = parent.getOrCreateNode(ElementUtils.generateNodeId(e), SingleElementNode.class);
             holder.setZIndex(++zIndex);
+            holder.setKey(e.getHint(ElementHints.KEY_OBJECT));
+            holder.setTypeClass(e.getHint(ElementHints.KEY_TYPE_CLASS));
 
             List<SceneGraph> nodeHandlers = ec.getItemsByClass(SceneGraph.class);
             for(SceneGraph n : nodeHandlers) {
@@ -150,38 +152,18 @@ public class CompositeImage implements Image {
         return node; // Valid node must be returned because transform is set afterwards
     }
 
-//    public static class TypeProxyElement extends ProxyElement {
-//        IHintContext instanceHints;
-//        public TypeProxyElement(IElement orig, IHintContext instanceHints) {
-//            super(orig);
-//            this.instanceHints = instanceHints;
-//        }
-//        @Override
-//        public <E> E getHint(Key key) {
-//            // TODO: need some mechanism to tell whether it is allowed to look for this key in the instance hints or not
-//            // This version is broken because some hints MUST come from the original element.
-//            E e = null;
-//            if (instanceHints != null)
-//                e = instanceHints.getHint(key);
-//            if (e == null)
-//                e = orig.getHint(key);
-//            return e;
-//        }
-//        @Override
-//        public Map<Key, Object> getHints() {
-//            throw new UnsupportedOperationException();
-//        }
-//        @Override
-//        public <E extends Key> Map<E, Object> getHintsOfClass(Class<E> clazz) {
-//            throw new UnsupportedOperationException();
-//        }
-//        @Override
-//        public void setHint(Key key, Object value) {
-//            if (instanceHints != null)
-//                instanceHints.setHint(key, value);
-//            else
-//                orig.setHint(key, value);
-//        }
-//    }
+    private G2DParentNode getOrCreateParentNode(G2DParentNode parent) {
+        G2DParentNode node = (G2DParentNode)parent.getNode("composite_image_"+this.hashCode());
+        if (node == null) {
+            for (INode n : parent.getNodes()) {
+                // #7663: prevent the code from removing other element graphics from directly under another element
+                if (!(n instanceof SingleElementNode))
+                    n.remove();
+            }
+            // Removed this grouping node as unnecessary, just use the given parent node
+            node = parent.getOrCreateNode("composite_image_"+this.hashCode(), G2DParentNode.class);
+        }
+        return node;
+    }
 
 }