From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 3 Aug 2012 14:15:58 +0000 (+0000)
Subject: SVG properties to property view (refs #3511)
X-Git-Tag: simantics-1.7~8
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=5c00b35f183fe15c0e89e27241ee9972177e6e91;p=simantics%2Fsysdyn.git

SVG properties to property view (refs #3511)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@25388 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index 6ca829ae..a35fda80 100644
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index b7582078..e3f629d7 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -23,10 +23,10 @@ SYSDYN.ImportedOntologies : PROJ.NamespaceRequirement
         "http://www.simantics.org/Sysdyn-1.1" : L0.URI
         "http://www.simantics.org/Layer0-1.0" : L0.URI
         "http://www.simantics.org/Documentation-1.0" : L0.URI // Experimental documentation tool
-        "http://www.simantics.org/SelectionView-1.1" : L0.URI        
-        
+        "http://www.simantics.org/SelectionView-1.1" : L0.URI
+                
 SYSDYN.SharedFunctionOntology <T L0.Ontology
-SYSDYN.SharedModuleOntolofgy <T L0.Ontology      
+SYSDYN.SharedModuleOntology <T L0.Ontology      
 
 FUNCTIONS = SYSDYN.Functions : L0.Library
     @L0.new  
diff --git a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
index 747663da..66c58010 100644
--- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
@@ -273,7 +273,7 @@ public class SysdynResource {
     public final Resource Right;
     public final Resource SelectedSharedFunctionLibraries;
     public final Resource SharedFunctionOntology;
-    public final Resource SharedModuleOntolofgy;
+    public final Resource SharedModuleOntology;
     public final Resource SimulateOnChangeExperiment;
     public final Resource SimulationPlaybackProfile;
     public final Resource SimulationPlaybackStyle;
@@ -645,7 +645,7 @@ public class SysdynResource {
         public static final String Right = "http://www.simantics.org/Sysdyn-1.1/Right";
         public static final String SelectedSharedFunctionLibraries = "http://www.simantics.org/Sysdyn-1.1/SelectedSharedFunctionLibraries";
         public static final String SharedFunctionOntology = "http://www.simantics.org/Sysdyn-1.1/SharedFunctionOntology";
-        public static final String SharedModuleOntolofgy = "http://www.simantics.org/Sysdyn-1.1/SharedModuleOntolofgy";
+        public static final String SharedModuleOntology = "http://www.simantics.org/Sysdyn-1.1/SharedModuleOntology";
         public static final String SimulateOnChangeExperiment = "http://www.simantics.org/Sysdyn-1.1/SimulateOnChangeExperiment";
         public static final String SimulationPlaybackProfile = "http://www.simantics.org/Sysdyn-1.1/SimulationPlaybackProfile";
         public static final String SimulationPlaybackStyle = "http://www.simantics.org/Sysdyn-1.1/SimulationPlaybackStyle";
@@ -1027,7 +1027,7 @@ public class SysdynResource {
         Right = getResourceOrNull(graph, URIs.Right);
         SelectedSharedFunctionLibraries = getResourceOrNull(graph, URIs.SelectedSharedFunctionLibraries);
         SharedFunctionOntology = getResourceOrNull(graph, URIs.SharedFunctionOntology);
-        SharedModuleOntolofgy = getResourceOrNull(graph, URIs.SharedModuleOntolofgy);
+        SharedModuleOntology = getResourceOrNull(graph, URIs.SharedModuleOntology);
         SimulateOnChangeExperiment = getResourceOrNull(graph, URIs.SimulateOnChangeExperiment);
         SimulationPlaybackProfile = getResourceOrNull(graph, URIs.SimulationPlaybackProfile);
         SimulationPlaybackStyle = getResourceOrNull(graph, URIs.SimulationPlaybackStyle);
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
index e17e65db..c866309c 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
@@ -29,10 +29,10 @@ import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;
 import org.simantics.db.exception.ServiceException;
 import org.simantics.db.layer0.request.PossibleActiveVariableFromVariable;
 import org.simantics.db.layer0.variable.Variable;
-import org.simantics.db.layer0.variable.Variables;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
+import org.simantics.modeling.ui.property.svg.SVGElementComposite;
 import org.simantics.selectionview.ComparableTabContributor;
 import org.simantics.selectionview.SelectionProcessor;
 import org.simantics.simulation.ontology.SimulationResource;
@@ -118,7 +118,7 @@ public class ResourceSelectionProcessor implements SelectionProcessor<Object, Re
 			if(r == null) {
 				// Selection is not directly a resource, try if it is a variable 
 				var = AdaptionUtils.adaptToSingle(selection, Variable.class);
-						r = (Resource)var.getPropertyValue(backend, Variables.REPRESENTS);
+						r = var.getRepresents(backend);
 			}
 
 			if(r == null) {
@@ -146,6 +146,10 @@ public class ResourceSelectionProcessor implements SelectionProcessor<Object, Re
 							"Shared Functions"));
 				}
 			}
+			
+			// SVG elements in symbol editor
+            if (backend.isInstanceOf(r, dr.SVGElement))
+                return Collections.singleton(SVGElementComposite.make(r, 1, "SVG"));
 
 			// if r == diagram element, change it to component
 					if (backend.isInstanceOf(r, dr.Element)) {