package org.simantics.district.network.ui.adapters;
+import java.awt.Color;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import org.simantics.g2d.element.handler.SceneGraph;
import org.simantics.g2d.element.handler.impl.DefaultTransform;
import org.simantics.g2d.element.handler.impl.SimpleElementLayers;
+import org.simantics.scenegraph.INode;
import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.scenegraph.g2d.nodes.SVGNode;
import org.simantics.utils.datastructures.hints.IHintContext.Key;
import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
public static final Key KEY_DN_VERTEX = new KeyOf(DistrictNetworkVertex.class, "DN_VERTEX");
public static final Key KEY_DN_VERTEX_NODE = new SceneGraphNodeKey(DistrictNetworkVertexNode.class, "DN_VERTEX_NODE");
+ public static final Key KEY_DN_VERTEX_SYMBOL_NODE = new SceneGraphNodeKey(SVGNode.class, "DN_VERTEX_SYMBOL_NODE");
public static final ElementClass CLASS =
ElementClass.compile(
DefaultTransform.INSTANCE,
DNVertexInternalSize.INSTANCE,
DNVertexSceneGraph.INSTANCE,
- SimpleElementLayers.INSTANCE
+ SimpleElementLayers.INSTANCE,
+ DistrictNetworkAdditionalColor.INSTANCE
).setId(DistrictNetworkVertexElement.class.getSimpleName());
static final class DNVertexSceneGraph implements SceneGraph {
private static final long serialVersionUID = 8894367073815556871L;
@Override
- public void init(IElement edgeElement, G2DParentNode parent) {
- DistrictNetworkVertex vertex = edgeElement.getHint(KEY_DN_VERTEX);
+ public void init(IElement vertexElement, G2DParentNode parent) {
+ DistrictNetworkVertex vertex = vertexElement.getHint(KEY_DN_VERTEX);
if (vertex == null) {
- cleanup(edgeElement);
+ cleanup(vertexElement);
} else {
- DistrictNetworkVertexNode node = edgeElement.getHint(KEY_DN_VERTEX_NODE);
+ DistrictNetworkVertexNode node = vertexElement.getHint(KEY_DN_VERTEX_NODE);
if (node == null) {
- node = parent.addNode(ElementUtils.generateNodeId(edgeElement), DistrictNetworkVertexNode.class);
- edgeElement.setHint(KEY_DN_VERTEX_NODE, node);
+ node = parent.addNode(ElementUtils.generateNodeId(vertexElement), DistrictNetworkVertexNode.class);
+ vertexElement.setHint(KEY_DN_VERTEX_NODE, node);
+
+ SVGNode symbol = node.addNode(ElementUtils.generateNodeId(vertexElement), SVGNode.class);
+ vertexElement.setHint(KEY_DN_VERTEX_SYMBOL_NODE, symbol);
}
+
node.setVertex(vertex);
- AffineTransform at = ElementUtils.getTransform(edgeElement);
+ node.setColor(ElementUtils.getAdditionalColor(vertexElement, Color.BLUE));
+
+ AffineTransform at = ElementUtils.getTransform(vertexElement);
if(at != null)
node.setTransform(at);
}
@Override
public void cleanup(IElement edge) {
- ElementUtils.removePossibleNode(edge, KEY_DN_VERTEX_NODE);
+ ElementUtils.removePossibleNode(edge, KEY_DN_VERTEX_SYMBOL_NODE);
+ INode node = ElementUtils.removePossibleNode(edge, KEY_DN_VERTEX_NODE);
+ if (node != null)
+ node.getParent().remove();
+
edge.removeHint(KEY_DN_VERTEX_NODE);
+ edge.removeHint(KEY_DN_VERTEX_SYMBOL_NODE);
}
}
@Override
public Rectangle2D getBounds(IElement e, Rectangle2D size) {
- if (size == null)
- size = new Rectangle2D.Double();
- size.setFrame(-0.5, -0.5, 1, 1);
+ DistrictNetworkVertexNode node = e.getHint(KEY_DN_VERTEX_NODE);
+ Rectangle2D boundsInLocal = node.getBoundsInLocal();
+ size.setFrame(boundsInLocal);
return size;
}