X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fprofile%2FDynamicVisualisationsRequest.java;h=c2b473c5a50163668ad50af2c38a897c17f27cce;hb=0a1b7351ff6fcf3724ee2b8e4121779ee6d42929;hp=c4d9d209a5e70420ffb4fe128a2cf5ed26fba82f;hpb=dab24824da1b284b8a4734a069cfba72fb1f05de;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java b/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java
index c4d9d209..c2b473c5 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/DynamicVisualisationsRequest.java
@@ -1,43 +1,42 @@
 package org.simantics.district.network.profile;
 
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.common.NamedResource;
 import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.district.network.DistrictNetworkUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
-import org.simantics.district.network.visualisations.model.ColorBarOptions;
-import org.simantics.district.network.visualisations.model.DynamicColorContribution;
-import org.simantics.district.network.visualisations.model.DynamicSizeContribution;
-import org.simantics.district.network.visualisations.model.DynamicVisualisation;
-import org.simantics.district.network.visualisations.model.SizeBarOptions;
 import org.simantics.layer0.Layer0;
 
 /**
  * @author Jani Simomaa
  */
-public class DynamicVisualisationsRequest extends ResourceRead<DynamicVisualisation> {
+public class DynamicVisualisationsRequest extends ResourceRead<Collection<NamedResource>> {
 
-    public DynamicVisualisationsRequest(Resource diagram) {
-        super(diagram);
+    public DynamicVisualisationsRequest(Resource parent) {
+        super(parent);
     }
 
     @Override
-    public DynamicVisualisation perform(ReadGraph graph) throws DatabaseException {
+    public Collection<NamedResource> perform(ReadGraph graph) throws DatabaseException {
         DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-        Resource visualisationResource = graph.getPossibleObject(resource, DN.Diagram_hasVisualisation);
-        if (visualisationResource != null) {
-            String name = graph.getRelatedValue(visualisationResource, Layer0.getInstance(graph).HasName);
-            Map<String, DynamicColorContribution> colorContributions = DistrictNetworkUtil.colorContributions(graph, resource);
-            ColorBarOptions colorBarOptions = DistrictNetworkUtil.colorBarOptions(graph, resource);
-            Map<String, DynamicSizeContribution> sizeContributions = DistrictNetworkUtil.sizeContributions(graph, resource);
-            SizeBarOptions sizeBarOptions = DistrictNetworkUtil.sizeBarOptions(graph, resource);
-            DynamicVisualisation visualisation = new DynamicVisualisation(name, colorContributions, colorBarOptions, sizeContributions, sizeBarOptions);
-            return visualisation; 
+        List<NamedResource> results = new ArrayList<>();
+        Resource visualisationFolder = DistrictNetworkUtil.getVisualisationFolder(graph, resource);
+        if (visualisationFolder != null) {
+            Collection<Resource> visualisationResources = graph.getObjects(visualisationFolder, DN.Diagram_hasVisualisation);
+            if (visualisationResources != null && !visualisationResources.isEmpty()) {
+                for (Resource visualisationResource : visualisationResources) {
+                    String name = graph.getRelatedValue(visualisationResource, Layer0.getInstance(graph).HasName);
+                    results.add(new NamedResource(name, visualisationResource));
+                }
+            }
         }
-        return null;
+        return results;
     }
 
 }