From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 31 Dec 2013 11:31:55 +0000 (+0000)
Subject: Minor adjustments to vensim import. Vensim import not in use.
X-Git-Tag: 1.8.1~176
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b659a44382faed9408a3969fcc69b91e7ef31abc;p=simantics%2Fsysdyn.git

Minor adjustments to vensim import. Vensim import not in use.
refs #2924

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

diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index e5e0b510..889e8de3 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -24,8 +24,9 @@ SYSDYN.ImportedOntologies : PROJ.NamespaceRequirement
         "http://www.simantics.org/Sysdyn-1.1" : L0.URI
         "http://www.simantics.org/Layer0-1.1" : L0.URI
         "http://www.simantics.org/SelectionView-1.2" : L0.URI
-        //"http://www.semantum.fi/Simupedia-1.0" : L0.URI // Experimental Simupedia
-        //"http://www.semantum.fi/SimupediaWorkbench-1.0" : L0.URI // Experimental Simupedia
+//        "http://www.semantum.fi/Simupedia-1.0" : L0.URI // Experimental Simupedia
+//        "http://www.semantum.fi/SimupediaWorkbench-1.0" : L0.URI // Experimental Simupedia
+//        "http://www.simantics.org/Documentation-1.2" : L0.URI // Experimental Simupedia
                 
 SYSDYN.SharedFunctionOntology <T L0.Ontology
 SYSDYN.SharedModuleOntology <T L0.Ontology      
diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index d0ecb92e..b71d836e 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -1097,6 +1097,16 @@
                      checkEnabled="true">
                </visibleWhen>
             </command>
+            <!--
+            <command
+                  commandId="org.simantics.sysdyn.ui.importMdl"
+                  label="Vensim model"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="true">
+               </visibleWhen>
+            </command>
+            -->
             <command
                   commandId="org.simantics.image.ui.importImage"
                   icon="platform:/plugin/com.famfamfam.silk/icons/image_add.png"
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java
index 86a6a397..5239aec0 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/FindReplaceHandler.java
@@ -31,7 +31,7 @@ public class FindReplaceHandler extends AbstractHandler {
             return null;
         
         // If there is something else in the diagram view, do not allow search in current diagram
-        if (!(editor instanceof DiagramEditor)) {
+        if (!(editor instanceof DiagramEditor) || !(((DiagramEditor) editor).getViewer() instanceof DiagramViewer)) {
             if (workbenchPart != null && workbenchPart instanceof SysdynBrowser) {
             	// If focus is on model browser, allow search in all models.
                 FindReplaceDialog dialog = new FindReplaceDialog(shell, Scope.ALL_MODELS, false);
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/ImportUtils.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/ImportUtils.java
index cba41737..761663cc 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/ImportUtils.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/ImportUtils.java
@@ -53,8 +53,6 @@ public class ImportUtils {
 			string = sb.toString();
 		}
 		
-		string = toCamelCase(string);
-		
 		return string;
 
 	}
@@ -65,40 +63,7 @@ public class ImportUtils {
 		string = string.replace("ö", "o");
 		string = string.replace("Ö", "O");
 		string = string.replaceAll("[^a-zA-Z 0-9]+", "");
-		return toCamelCase(string);
-	}
-	
-	
-	public static String toCamelCase(String string) {
-		if(string.length() < 1) {
-			return string;
-		}
-		
-		try {
-			String result = new String(string);
-			BufferedReader br = new BufferedReader(new StringReader(string));
-			Pattern p = Pattern.compile("[a-zA-Z0-9]+");
-			Matcher m;
-			m = p.matcher(br.readLine());
-			String word;
-			boolean first = true;
-			while (m.find()) {
-				word = m.group();
-				String replacement;
-				if(first) {
-					replacement = word;
-					first = false;
-				} else {
-					replacement = word.substring(0, 1).toUpperCase() + word.substring(1);
-				}
-				result = result.replace(word, replacement);
-			}
-			return result.replace(" ", "");
-		} catch (IOException e) {
-			e.printStackTrace();
-			return string;
-		}
-		
+		return string;
 	}
 
 }
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java
index 3e0caf6d..dcc7d0d1 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java
@@ -16,17 +16,11 @@ import java.util.HashMap;
 
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
-import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.adapter.Template;
-import org.simantics.document.DocumentResource;
 import org.simantics.layer0.Layer0;
-import org.simantics.layer0.utils.direct.GraphUtils;
-import org.simantics.modeling.ModelingResources;
-import org.simantics.operation.Layer0X;
 import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.sysdyn.SysdynResource;
-import org.simantics.utils.datastructures.ArrayMap;
+import org.simantics.sysdyn.utils.ModelUtils;
 
 public class Model implements IWriteableMDLObject {
 
@@ -216,67 +210,20 @@ public class Model implements IWriteableMDLObject {
 			return;
 		
 		try {
+		    
+		    
 			SysdynResource sr = SysdynResource.getInstance(graph);
 			Layer0 l0 = Layer0.getInstance(graph);
-			Layer0X L0X = Layer0X.getInstance(graph);
 			SimulationResource simu = SimulationResource.getInstance(graph);
-			DocumentResource DOC = DocumentResource.getInstance(graph);
-
-			// Diagram creation copied from SysdynProject. 
-			// Could the same code be reused? 
-			
-			Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.1");
-			Resource layer0 = graph.getResource("http://www.simantics.org/Layer0-1.1");
-
-			Resource model = GraphUtils.create2(
-					graph,
-					sr.SysdynModel,
-					l0.PartOf, parent,
-					l0.HasName, NameUtils.findFreshName(graph, getName(), parent, l0.ConsistsOf, "%s%d"),
-					l0.HasLabel, getName(),
-					sr.SysdynModel_startTime, startTime,
-					sr.SysdynModel_stopTime, endTime,
-					l0.IsLinkedTo, sysdyn,
-					l0.IsLinkedTo, layer0
-			);
 
+            Resource model = ModelUtils.createModelAt(graph, parent);
+            graph.claimLiteral(model, l0.HasLabel, getName());
+            graph.claimLiteral(model, sr.SysdynModel_startTime, startTime);
+            graph.claimLiteral(model, sr.SysdynModel_stopTime, endTime);
+
 
-			Resource conf = GraphUtils.create2(graph,
-					sr.Configuration,
-					l0.PartOf, model,
-					l0.HasName, getName()
-			);
-			
-			Resource diagram = graph.newResource();
-            graph.adapt(sr.ConfigurationDiagramTemplate, Template.class).apply(graph,
-                    ArrayMap
-                    .keys("", "diagram", "name")
-                    .values(conf, diagram, "Diagrammi")
-            );
-            
+            Resource conf = graph.getSingleObject(model, simu.HasConfiguration);
             
-            ModelingResources mr = ModelingResources.getInstance(graph);
-            // Remove default mapping and add sysdyn mapping
-            for(Resource trigger : graph.getObjects(diagram, L0X.HasTrigger)) {
-            	if(graph.isInstanceOf(trigger, mr.DiagramToCompositeMapping)) {
-            		graph.deny(diagram, L0X.HasTrigger, trigger);
-            	}
-            }
-            Resource mapping = graph.newResource();
-            graph.claim(mapping, l0.InstanceOf, null, sr.DiagramToCompositeMapping);
-            graph.claim(diagram, L0X.HasTrigger, mapping);
-
-			graph.claim(model, simu.HasConfiguration, conf);
-			graph.claim(model, L0X.HasBaseRealization, conf);
-
-			Resource report = GraphUtils.create2(graph, DOC.Report,  DOC.HasDocumentation, "===Report===");
-
-			GraphUtils.create2(graph, simu.Experiment,
-					l0.HasName, "Experiment",
-					l0.HasLabel, "Experiment",
-					DOC.HasReportFactory, report,
-					l0.PartOf, model);
-
 			for(Subscript s : subscripts) {
 				s.write(graph, conf, 0, 0);
 			}