From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Sat, 24 May 2014 11:07:44 +0000 (+0000)
Subject: refs #4854
X-Git-Tag: 1.8.1~48
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ee60b20a2159e3234b71565f5442757594831647;p=simantics%2Fsysdyn.git

refs #4854

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

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
index 1a014557..013f8893 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
@@ -51,17 +51,10 @@ public class Solver {
 	}
 	
 	public void setStep(double step) {
-		
-		new Exception().printStackTrace();
-		
 		this.step = step;
-		
 	}
 	
 	public void setStart(double start) {
-		
-		new Exception().printStackTrace();
-
 		this.start = start;
 		ready = false;
 	}
diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index b16564db..58e73242 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -1246,6 +1246,14 @@
                      checkEnabled="true">
                </visibleWhen>
             </command>
+            <command
+                  commandId="org.simantics.sysdyn.ui.importSharedLibrary"
+                  label="Shared Library"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="true">
+               </visibleWhen>
+            </command>
             <!--
             <command
                   commandId="org.simantics.sysdyn.ui.importMdl"
@@ -1580,6 +1588,11 @@
                label="Import Model"
                style="push">
          </command>
+         <command
+               commandId="org.simantics.sysdyn.ui.importSharedLibrary"
+               label="Import Shared Library"
+               style="push">
+         </command>
       </menuContribution>
       <menuContribution
             allPopups="false"
@@ -1757,6 +1770,10 @@
             id="org.simantics.sysdyn.ui.importModel"
             name="Import Model">
       </command>
+      <command
+            id="org.simantics.sysdyn.ui.importSharedLibrary"
+            name="Import Shared Library">
+      </command>
       <command
             id="org.simantics.sysdyn.ui.newEnumeration"
             name="New Enumeration">
@@ -2190,6 +2207,10 @@
             class="org.simantics.sysdyn.ui.handlers.imports.ImportModelHandler"
             commandId="org.simantics.sysdyn.ui.importModel">
       </handler>
+      <handler
+            class="org.simantics.sysdyn.ui.handlers.imports.ImportSharedLibraryHandler"
+            commandId="org.simantics.sysdyn.ui.importSharedLibrary">
+      </handler>
       <handler
             class="org.simantics.sysdyn.ui.handlers.exports.ExportModelHandler"
             commandId="org.simantics.sysdyn.ui.exportModel">
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportSharedLibraryHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportSharedLibraryHandler.java
new file mode 100644
index 00000000..4190860d
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportSharedLibraryHandler.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2011 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.handlers.imports;
+
+import java.io.File;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.simantics.DatabaseJob;
+import org.simantics.modeling.ModelingUtils;
+import org.simantics.sysdyn.ui.Activator;
+import org.simantics.sysdyn.ui.utils.imports.ImportUtilsUI;
+
+public class ImportSharedLibraryHandler extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+
+        // Get imported transferable graph file using FileDialog
+        Shell shell = HandlerUtil.getActiveShellChecked(event);
+        FileDialog fd = new FileDialog(shell, SWT.OPEN);
+        fd.setText("Import Model");
+
+        String path = Activator.getDefault().getPreferenceStore().getString(ImportUtilsUI.IMPORTMODELTPATH);
+        if(path.isEmpty() || !(new File(path).exists())){
+        	String execDir = System.getProperty("user.dir");
+        	String slash = System.getProperty("file.separator");
+        	path = execDir + slash + "sampleModels"; 
+        }
+        
+        fd.setFilterPath(path);
+        String[] filterExt = {"*.sharedLibrary; *.tg", "*.*"};
+        fd.setFilterExtensions(filterExt);
+        final String selected = fd.open();
+        if(selected == null) return null;
+
+        Job job = new DatabaseJob("Import model") {
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+            	ModelingUtils.importSharedOntology(selected);
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(true);
+        job.schedule();
+
+        return null;
+
+    }
+}
diff --git a/org.simantics.sysdyn/scl/Sysdyn.scl b/org.simantics.sysdyn/scl/Sysdyn.scl
index a3c4a81f..d9ea7c17 100644
--- a/org.simantics.sysdyn/scl/Sysdyn.scl
+++ b/org.simantics.sysdyn/scl/Sysdyn.scl
@@ -98,7 +98,9 @@ importJava "org.simantics.sysdyn.manager.SysdynExperiments" where
     
     activateExperiment :: Resource -> String
     run :: String -> ()
-    saveIC :: Variable -> String -> <WriteGraph> Resource
+    saveIC :: Variable -> String -> <WriteGraph> Maybe Resource
     assignIC :: Variable -> String -> <WriteGraph> ()
+    applyIC :: Variable -> String -> <WriteGraph> ()
+    deleteIC :: Variable -> String -> <WriteGraph> ()
 
     
\ No newline at end of file
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariableBase.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariableBase.java
index 567b1874..1e7bf51b 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariableBase.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariableBase.java
@@ -104,6 +104,7 @@ abstract public class ValueIndexVariableBase<T> extends IndexVariable<T> {
 					}
 
 				}
+				exp.refresh();
 				exp.updateSubscriptions();
 			
 			} catch (Exception e) {
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
index 3b333601..ebb8092f 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
@@ -172,15 +172,21 @@ public class SysdynExperiments {
     	
 		Resource model = Variables.getModel(graph, input);
     	Resource child = Layer0Utils.getPossibleChild(graph, model, name);
-    	if(child != null)
-    		RemoverUtil.remove(graph, child);
+    	SysdynResource SYSDYN = SysdynResource.getInstance(graph);
+    	
+    	if(child != null) {
+    		if(graph.isInstanceOf(child, SYSDYN.InitialCondition)) {
+    			RemoverUtil.remove(graph, child);
+    		} else {
+    			return null;
+    		}
+    	}
     	
 		PartialIC IC = new PartialIC();
 		processChild(graph, input, IC);
 
 		Layer0 L0 = Layer0.getInstance(graph);
 		ModelingResources MOD = ModelingResources.getInstance(graph);
-		SysdynResource SYSDYN = SysdynResource.getInstance(graph);
 		Resource ic = graph.newResource();
 		graph.claim(ic, L0.InstanceOf, SYSDYN.InitialCondition);
 		graph.addLiteral(ic, L0.HasName, L0.NameOf, L0.String, name, Bindings.STRING);
@@ -213,5 +219,41 @@ public class SysdynExperiments {
 		graph.claim(exp, SYSDYN.Experiment_ic, ic);
     	
     }
+
+    public static void applyIC(WriteGraph graph, Variable experiment, String name) throws DatabaseException {
+
+    	System.err.println("applyIC " + experiment.getURI(graph));
+
+		Layer0 L0 = Layer0.getInstance(graph);
+		SysdynResource SYSDYN = SysdynResource.getInstance(graph);
+
+    	Resource run = experiment.getPossibleRepresents(graph);
+    	if(run == null) return;
+    	Resource exp = graph.getPossibleObject(run, L0.PartOf);
+    	if(exp == null) return;
+
+    	Resource model = Variables.getModel(graph, experiment);
+    	Resource ic = Layer0Utils.getPossibleChild(graph, model, name);
+    	if(ic == null) return;
+    	
+    	if(!graph.isInstanceOf(ic, SYSDYN.InitialCondition)) return;
+    	
+		Variable base = Variables.getVariable(graph, run);
+		
+		PartialIC data = graph.getPossibleRelatedValue(ic, SYSDYN.InitialCondition_HasInitialValues, PartialIC.BINDING);
+		data.apply(graph, base);
+    	
+    }
+    
+    public static void deleteIC(WriteGraph graph, Variable input, String name) throws DatabaseException {
+
+    	Resource model = Variables.getModel(graph, input);
+    	Resource child = Layer0Utils.getPossibleChild(graph, model, name);
+    	SysdynResource SYSDYN = SysdynResource.getInstance(graph);
+
+    	if((child != null) && graph.isInstanceOf(child, SYSDYN.InitialCondition))
+    		RemoverUtil.remove(graph, child);
+    	
+    }
     
 }
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java
index 16ab3a52..7c5a8ede 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java
@@ -127,6 +127,9 @@ abstract public class SysdynGameExperimentBase extends OldSysdynExperiment {
 		job.schedule();
 	}
 	
+	public void refresh() {
+	}
+	
     public abstract ISolver getSolver();
     
 }
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
index c67ba488..924455f0 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
@@ -152,6 +152,19 @@ public class SysdynGameExperimentInternal extends SysdynGameExperimentBase {
 		}
     }
 	
+	@Override
+	public void refresh() {
+		try {
+			setSubscribedResults(new NullProgressMonitor(), solver.getTime());
+	
+			((MemoryResult)getCurrentResult()).setResult(new GameResult(this, this.results, this.subscription));
+	
+			resultsChanged(true);
+		} catch (Exception e) {
+			Logger.defaultLogError(e);
+		}			
+	}
+	
 	@Override
     public void rewindTo(double time) {