import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import org.simantics.db.ReadGraph;
import org.simantics.db.Session;
+import org.simantics.db.UndoContext;
import org.simantics.db.WriteGraph;
import org.simantics.db.common.request.ReadRequest;
import org.simantics.db.common.request.WriteRequest;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.layer0.util.Layer0Utils;
+import org.simantics.db.service.UndoRedoSupport;
import org.simantics.g3d.ontology.G3D;
import org.simantics.g3d.scenegraph.RenderListener;
import org.simantics.g3d.scenegraph.base.INode;
import org.simantics.g3d.scenegraph.base.NodeListener;
import org.simantics.g3d.scenegraph.base.ParentNode;
+import org.simantics.objmap.exceptions.MappingException;
import org.simantics.objmap.graph.IMapping;
import org.simantics.objmap.graph.IMappingListener;
import org.simantics.utils.datastructures.Callback;
import vtk.vtkProp;
-public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<E>, IMappingListener, RenderListener, NodeListener{
+public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<E>, IMappingListener, RenderListener, NodeListener, UndoRedoSupport.ChangeListener{
private static final boolean DEBUG = false;
protected ParentNode<E> rootNode;
+ protected UndoRedoSupport undoRedoSupport;
+ protected int undoOpCount = 0;
+ protected int redoOpCount = 0;
+ protected boolean runUndo = false;
+ protected boolean runRedo = false;
public AbstractVTKNodeMap(Session session, IMapping<Object,E> mapping, VtkView view, ParentNode<E> rootNode) {
this.session = session;
this.mapping = mapping;
view.addListener(this);
mapping.addMappingListener(this);
rootNode.addListener(this);
+
+ undoRedoSupport = session.getService(UndoRedoSupport.class);
+ undoRedoSupport.subscribe(this);
+ try {
+ UndoContext undoContext = undoRedoSupport.getUndoContext(session);
+ undoOpCount = undoContext.getAll().size();
+ redoOpCount = undoContext.getRedoList().size();
+ } catch(DatabaseException e) {
+ e.printStackTrace();
+ }
}
+
protected abstract void addActor(E node);
protected abstract void removeActor(E node);
protected abstract void updateActor(E node,Set<String> ids);
private List<Pair<E,String>> added = new ArrayList<Pair<E,String>>();
private List<Pair<E,String>> removed = new ArrayList<Pair<E,String>>();
- //private List<Pair<E,String>> updated = new ArrayList<Pair<E,String>>();
private MapSet<E, String> updated = new MapSet.Hash<E, String>();
private boolean rangeModified = false;
+ @Override
+ public void onChanged() {
+ try {
+ UndoContext undoContext = undoRedoSupport.getUndoContext(session);
+ int ucount = undoContext.getAll().size();
+ int rcount = undoContext.getRedoList().size();
+ if (DEBUG) System.out.println("Previous U:" + undoOpCount +" R:" + redoOpCount +" Current U:"+ucount+" R:"+rcount);
+ if (ucount < undoOpCount) {
+ runUndo = true;
+ } else {
+ runUndo = false;
+ }
+ if (!runUndo && rcount > 0)
+ runRedo = true;
+ else
+ runRedo = false;
+ undoOpCount = ucount;
+ redoOpCount = rcount;
+
+ if (DEBUG) System.out.println("Undo " + runUndo + " Redo " + runRedo);
+ } catch (DatabaseException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+
@SuppressWarnings("unchecked")
@Override
- public void updateRenderObjectsFor(INode node) {
+ public void updateRenderObjectsFor(E node) {
List<vtkProp> toDelete = new ArrayList<vtkProp>();
view.lock();
for (vtkProp prop : nodeToActor.getValues((E)node)) {
view.unlock();
nodeToActor.remove((E)node);
Collection<vtkProp> coll = getActors((E)node);
- if (coll == null)
- return;
- for (vtkProp prop : coll) {
- nodeToActor.add((E)node,prop);
- actorToNode.put(prop, (E)node);
- toDelete.remove(prop);
+ if (coll != null) {
+ for (vtkProp prop : coll) {
+ nodeToActor.add((E)node,prop);
+ actorToNode.put(prop, (E)node);
+ toDelete.remove(prop);
+ }
}
for (vtkProp p : toDelete)
p.Delete();
@SuppressWarnings("unchecked")
private void receiveAdd(E node, String id, boolean db) {
- if (DEBUG) System.out.println("receiveAdd " + node + " " + id + " " + db);
+ if (DEBUG) System.out.println("receiveAdd " + debugString(node) + " " + id + " " + db);
synchronized (syncMutex) {
for (Pair<E, String> n : added) {
if (n.first.equals(node))
@SuppressWarnings("unchecked")
private void receiveRemove(E node, String id, boolean db) {
- if (DEBUG) System.out.println("receiveRemove " + node + " " + id + " " + db);
+ if (DEBUG) System.out.println("receiveRemove " + debugString(node) + " " + id + " " + db);
synchronized (syncMutex) {
for (Pair<E, String> n : removed) {
if (n.first.equals(node))
removed.add(new Pair<E, String>(node, id));
rangeModified = true;
}
- view.refresh();
+ repaint();
}
@SuppressWarnings("unchecked")
private void receiveUpdate(E node, String id, boolean db) {
- if (DEBUG) System.out.println("receiveUpdate " + node + " " + id + " " + db);
+ if (DEBUG) System.out.println("receiveUpdate " + debugString(node) + " " + id + " " + db);
synchronized (syncMutex) {
-// for (Pair<E, String> n : updated) {
-// if (n.first.equals(node))
-// return;
-// }
+// for (Pair<E, String> n : updated) {
+// if (n.first.equals(node))
+// return;
+// }
if (changeTracking && !db)
mapping.rangeModified(node);
//updated.add(new Pair<E, String>(node, id));
updated.add(node, id);
rangeModified = true;
}
- view.refresh();
+ repaint();
}
private boolean graphUpdates = false;
@Override
public void perform(WriteGraph graph) throws DatabaseException {
- commit(graph);
+ if (DEBUG) System.out.println("Commit " + commitMessage);
if (commitMessage != null) {
- Layer0Utils.addCommentMetadata(graph, commitMessage);
- commitMessage = null;
+ Layer0Utils.addCommentMetadata(graph, commitMessage);
+ graph.markUndoPoint();
+ commitMessage = null;
}
- graph.markUndoPoint();
+ commit(graph);
}
}, new Callback<DatabaseException>() {
graphUpdates = true;
mapping.updateDomain(graph);
graphUpdates = false;
+ clearDeletes();
+ if (DEBUG) System.out.println("Commit done");
}
}
+
+
@Override
public void domainModified() {
if (graphUpdates)
}
- protected void update(ReadGraph graph) throws DatabaseException {
+ protected void reset(ReadGraph graph) throws MappingException {
+ if (DEBUG) System.out.println("Reset");
synchronized (syncMutex) {
graphUpdates = true;
- for (Object domainObject : mapping.getDomainModified()) {
- E rangeObject = mapping.get(domainObject);
- if (rangeObject != null)
- graphModified.add(rangeObject);
- }
+ mapping.getRangeModified().clear();
+ for (Object o : mapping.getDomain())
+ mapping.domainModified(o);
mapping.updateRange(graph);
graphModified.clear();
graphUpdates = false;
}
+ }
+
+ private boolean useFullSyncWithUndo = false;
+
+ protected void update(ReadGraph graph) throws DatabaseException {
+ if (DEBUG) System.out.println("Graph update start");
+ if (runUndo && useFullSyncWithUndo) {
+ reset(graph);
+ } else {
+ synchronized (syncMutex) {
+ graphUpdates = true;
+ for (Object domainObject : mapping.getDomainModified()) {
+ E rangeObject = mapping.get(domainObject);
+ if (rangeObject != null)
+ graphModified.add(rangeObject);
+ }
+ mapping.updateRange(graph);
+ graphModified.clear();
+ syncDeletes();
+ clearDeletes();
+ graphUpdates = false;
+ }
+ }
- if (mapping.isRangeModified())
- commit("Graph sync");
+ if (mapping.isRangeModified() && !runUndo && !runRedo)
+ commit((String)null);
+ if (DEBUG) System.out.println("Graph update done");
}
@Override
}
}
- List<Pair<E, String>> rem = new ArrayList<Pair<E,String>>();
- List<Pair<E, String>> add = new ArrayList<Pair<E,String>>();
- MapSet<E, String> mod = new MapSet.Hash<E, String>();
- Set<E> propagation = new HashSet<E>();
- Stack<E> stack = new Stack<E>();
-
+ // Reusable containers for data synchronisation
+ List<Pair<E, String>> rem = new ArrayList<Pair<E,String>>(); // Removed objects
+ List<Pair<E, String>> add = new ArrayList<Pair<E,String>>(); // Added objects
+ MapSet<E, String> mod = new MapSet.Hash<E, String>(); // Modified objects
+ Set<E> propagation = new HashSet<E>(); // Objects with propagated changes
+ Stack<E> stack = new Stack<E>(); // Stack for handling propagation
+ Set<E> delete = Collections.synchronizedSet(new HashSet<E>()); // Objects to be completely deleted
+ Set<E> deleteUC = new HashSet<E>();
@Override
public synchronized void preRender() {
updateCycle();
}
+
+ /**
+ * When objects are removed (either from Java or Graph), after remove processing the Java objects remain in mapping cache.
+ * This causes problems with Undo and Redo, whcih the end up re-using the removed objects from mapping cache.
+ *
+ * This code here synchronizes removed and added objects to collect deletable objects. (a deletable object is one which is removed but not added).
+ *
+ */
+ protected void syncDeletes() {
+ deleteUC.clear();
+ for (Pair<E, String> n : removed) {
+ deleteUC.add(n.first);
+ }
+ for (Pair<E, String> n : added) {
+ deleteUC.remove(n.first);
+ }
+ if (DEBUG && deleteUC.size() > 0) {
+ System.out.println("Delete sync");
+ for (E n : delete) {
+ System.out.println(debugString(n));
+ }
+ }
+ delete.addAll(deleteUC);
+ deleteUC.clear();
+ }
+
+ /**
+ * Clears deletable objects from mapping cache.
+ */
+ protected void clearDeletes() {
+ if (DEBUG && delete.size() > 0) System.out.println("Delete");
+ for (E n : delete) {
+ if (DEBUG) System.out.println(debugString(n));
+ mapping.getRange().remove(n);
+ }
+ delete.clear();
+ }
+
+ protected String debugString(E n) {
+ return n + "@" + Integer.toHexString(n.hashCode());
+ }
+
@SuppressWarnings("unchecked")
protected void updateCycle() {
rem.clear();
mod.clear();
propagation.clear();
+
synchronized (syncMutex) {
rem.addAll(removed);
add.addAll(added);
mod.add(e, s);
}
}
-
+ syncDeletes();
removed.clear();
added.clear();
updated.clear();
for (Pair<E, String> n : rem) {
stopListening(n.first);
removeActor(n.first);
-
}
for (Pair<E, String> n : add) {
}
}
-// synchronized (syncMutex) {
-// rem.addAll(removed);
-// add.addAll(added);
-// //mod.addAll(updated);
-// for (E e : updated.getKeys()) {
-// for (String s : updated.getValues(e))
-// mod.add(e, s);
-// }
-//
-// removed.clear();
-// added.clear();
-// updated.clear();
-// }
+// synchronized (syncMutex) {
+// rem.addAll(removed);
+// add.addAll(added);
+// //mod.addAll(updated);
+// for (E e : updated.getKeys()) {
+// for (String s : updated.getValues(e))
+// mod.add(e, s);
+// }
+//
+// removed.clear();
+// added.clear();
+// updated.clear();
+// }
for (E e : mod.getKeys()) {
Set<String> ids = mod.getValues(e);
for (NodeListener l : nodeListeners)
l.nodeAdded(n.first.getParent(), n.first, n.second);
}
-// for (Pair<E, String> n : mod) {
-// for (NodeListener l : nodeListeners)
-// l.propertyChanged(n.first, n.second);
-// }
+// for (Pair<E, String> n : mod) {
+// for (NodeListener l : nodeListeners)
+// l.propertyChanged(n.first, n.second);
+// }
for (E e : mod.getKeys()) {
for (NodeListener l : nodeListeners)
for (String s : mod.getValues(e))
l.propertyChanged(e, s);
}
+
synchronized (syncMutex) {
if (added.isEmpty() && removed.isEmpty() && updated.getKeys().size() == 0)
rangeModified = false;
@Override
public void delete() {
+ if (undoRedoSupport != null)
+ undoRedoSupport.cancel(this);
+
changeTracking = false;
view.removeListener(this);
mapping.removeMappingListener(this);
Code Review / simantics / 3d.git / blobdiff