X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fadapters%2FDistrictNetworkVertexElementFactory.java;h=431beb52d60280de30d44d5bf31c11c5a129a18e;hb=00e4eca98cef6d77d5023f4b424f9e8da0487463;hp=6fa19c422a2d9439f36a265650f3b3cc051e7409;hpb=02ecca5e61d2eb17de40cc058be678b414aaad00;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElementFactory.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElementFactory.java index 6fa19c42..431beb52 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElementFactory.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkVertexElementFactory.java @@ -1,7 +1,5 @@ package org.simantics.district.network.ui.adapters; -import java.awt.geom.AffineTransform; - import org.simantics.db.AsyncReadGraph; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; @@ -13,7 +11,6 @@ import org.simantics.diagram.synchronization.IModifiableSynchronizationContext; import org.simantics.diagram.synchronization.SynchronizationHints; import org.simantics.diagram.synchronization.graph.GraphSynchronizationHints; import org.simantics.diagram.synchronization.graph.layer.GraphLayerManager; -import org.simantics.district.network.ModelledCRS; import org.simantics.district.network.ontology.DistrictNetworkResource; import org.simantics.g2d.canvas.ICanvasContext; import org.simantics.g2d.diagram.DiagramHints; @@ -23,6 +20,7 @@ import org.simantics.g2d.element.ElementUtils; import org.simantics.g2d.element.IElement; import org.simantics.g2d.element.handler.impl.StaticObjectAdapter; import org.simantics.g2d.layers.ILayersEditor; +import org.simantics.maps.MapScalingTransform; public class DistrictNetworkVertexElementFactory extends SyncElementFactory { @@ -55,15 +53,8 @@ public class DistrictNetworkVertexElementFactory extends SyncElementFactory { element.setHint(DistrictNetworkAdditionalColor.KEY_DN_MAPPING_RESOURCE, mapping); element.setHint(DistrictNetworkVertexElement.KEY_DN_VERTEX, vertex); - // TODO: set element transform based on layer SRS and coords - - double x = ModelledCRS.longitudeToX(coords[0]); - double y = ModelledCRS.latitudeToY(coords[1]); - - double scale = 100000; - - AffineTransform at = new AffineTransform(1, 0, 0, 1, x * scale, y * scale); - ElementUtils.setTransform(element, at); + // set scaling transform for vertices + ElementUtils.setTransform(element, MapScalingTransform.INSTANCE); IModifiableSynchronizationContext context = diagram.getHint(SynchronizationHints.CONTEXT); GraphLayerManager layerManager = context.get(GraphSynchronizationHints.GRAPH_LAYER_MANAGER);