X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.graph%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fgraph%2FSpreadsheetBook.java;h=5a7dcd5ee0aae8f1f129158c284ac00cd666deba;hp=277b10cb0635f6e8401f78069a175f56104bc037;hb=664f37a026967c90a9a8a4ef3c5336ee426f67aa;hpb=81169c54002f4a9f89db5b6821f3e5a70dad2da7

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
index 277b10cb0..5a7dcd5ee 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
@@ -6,13 +6,18 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.StandardEngine;
+import org.simantics.simulator.toolkit.StandardNodeManagerSupport;
+import org.simantics.simulator.variable.exceptions.NodeManagerException;
 import org.simantics.spreadsheet.graph.formula.SpreadsheetEvaluationEnvironment;
 import org.simantics.spreadsheet.graph.synchronization.LineNodeUpdater;
 import org.simantics.spreadsheet.graph.synchronization.LineUpdater;
@@ -33,11 +38,13 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongArraySet;
 import it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet;
 
-public class SpreadsheetBook implements SpreadsheetElement<SpreadsheetElement, SpreadsheetElement>, StandardEngine<SheetNode>, Serializable, SheetNode<SpreadsheetEngine, SheetNode>, Solver, SolverNameUtil, ComponentFactory<SheetLineComponent>, ModuleUpdaterFactoryBase<SheetLineComponent> {
+public class SpreadsheetBook implements StandardNodeManagerSupport<SheetNode>, SpreadsheetElement<SpreadsheetElement, SpreadsheetElement>, Serializable, SheetNode<SpreadsheetEngine, SheetNode>, Solver, SolverNameUtil, ComponentFactory<SheetLineComponent>, ModuleUpdaterFactoryBase<SheetLineComponent> {
 
 	private static final long serialVersionUID = 7417208688311691396L;
 	
-	public Serializable NotAvailableError = new Serializable() {};
+	public Serializable NotAvailableError = new Serializable() {
+		private static final long serialVersionUID = 2535371785498129460L;
+	};
 	
 	public Long2ObjectOpenHashMap<AbstractLongSet> referenceMap = new Long2ObjectOpenHashMap<>();
 	
@@ -90,7 +97,17 @@ public class SpreadsheetBook implements SpreadsheetElement<SpreadsheetElement, S
 	}
 	
 	@Override
-	public Object getValue(SheetNode node) {
+	public Binding getEngineBinding(SheetNode node) throws NodeManagerException {
+		Object value = getEngineValue(node);
+		if(value instanceof Variant) return Bindings.VARIANT;
+		if(value instanceof String) return Bindings.STRING;
+		if(value instanceof Boolean) return Bindings.BOOLEAN;
+		else return Bindings.VOID;
+		
+	}
+	
+	@Override
+	public Object getEngineValue(SheetNode node) {
 		if(node instanceof SpreadsheetCellContent) {
 			try {
 				SpreadsheetCellContent scc = (SpreadsheetCellContent)node;
@@ -139,7 +156,7 @@ public class SpreadsheetBook implements SpreadsheetElement<SpreadsheetElement, S
 	}
 
 	@Override
-	public void setValue(SheetNode node, Object value) {
+	public void setEngineValue(SheetNode node, Object value) {
 	}
 
 	@Override
@@ -352,7 +369,26 @@ public class SpreadsheetBook implements SpreadsheetElement<SpreadsheetElement, S
 		v.visit(this);
 	}
 	
-	public List<SpreadsheetCell> invalidate(SpreadsheetCell cell) {
+	//Recursively find all SpreadsheetCells, invalidate them and return them all as a set
+	public Set<SpreadsheetCell> invalidate(SpreadsheetCell cell) {
+		Set<SpreadsheetCell> result = new HashSet<>();
+		result.add(cell);
+		cell.invalidate();
+		long refKey = cell.makeReferenceKey();
+		AbstractLongSet refs = referenceMap.remove(refKey);
+		if(refs == null) return result;
+		for(long ref : refs) {
+			long sheet = ref >> 40;
+			long row = (ref >> 20) & 0xFFFFF;
+			long col = (ref) & 0xFFFFF;
+			SpreadsheetCell referer = get(sheets.get((int)sheet), (int)row, (int)col);
+			result.addAll(invalidate(referer));
+		}
+		return result;
+	}
+	
+	@Deprecated
+	public List<SpreadsheetCell> invalidateShallow(SpreadsheetCell cell) {
 		ArrayList<SpreadsheetCell> result = new ArrayList<>();
 		result.add(cell);
 		cell.invalidate();