diff java/src/uk/ac/qmul/eecs/ccmi/gui/HapticTrigger.java @ 3:9e67171477bc

PHANTOM Omni Heptic device release
author Fiore Martin <fiore@eecs.qmul.ac.uk>
date Wed, 25 Apr 2012 17:09:09 +0100
parents 9418ab7b7f3f
children 2c67ac862920
line wrap: on
line diff
--- a/java/src/uk/ac/qmul/eecs/ccmi/gui/HapticTrigger.java	Mon Feb 06 12:54:06 2012 +0000
+++ b/java/src/uk/ac/qmul/eecs/ccmi/gui/HapticTrigger.java	Wed Apr 25 17:09:09 2012 +0100
@@ -33,40 +33,51 @@
 
 	@Override
 	public void elementInserted(CollectionEvent evt) {
+		DiagramEventSource source = (DiagramEventSource)evt.getSource(); 
 		if(evt.getDiagramElement() instanceof Node){
 			Node n = (Node)evt.getDiagramElement();
-			HapticsFactory.getInstance().addNode(n.getBounds().getCenterX(), n.getBounds().getCenterY(), System.identityHashCode(n));
+			HapticsFactory.getInstance().addNode(n.getBounds().getCenterX(), n.getBounds().getCenterY(), System.identityHashCode(n),source.getDiagramName());
 		}else{//edge
 			Edge e = (Edge)evt.getDiagramElement();
 			Edge.PointRepresentation pr = e.getPointRepresentation();
-			HapticsFactory.getInstance().addEdge(System.identityHashCode(e),pr.xs,pr.ys,pr.adjMatrix,pr.nodeStart,e.getStipplePattern(),e.getNameLine());
+			HapticsFactory.getInstance().addEdge(System.identityHashCode(e),pr.xs,pr.ys,pr.adjMatrix,pr.nodeStart,e.getStipplePattern(),e.getNameLine(),source.getDiagramName());
 		}
 	}
 
 	@Override
 	public void elementTakenOut(CollectionEvent evt) {
+		DiagramEventSource source = (DiagramEventSource)evt.getSource(); 
 		if(evt.getDiagramElement() instanceof Node){
 			Node n = (Node)evt.getDiagramElement();
-			HapticsFactory.getInstance().removeNode(System.identityHashCode(n));
+			HapticsFactory.getInstance().removeNode(System.identityHashCode(n),source.getDiagramName());
 		}else{//edge
 			Edge e = (Edge)evt.getDiagramElement();
-			HapticsFactory.getInstance().removeEdge(System.identityHashCode(e));
+			HapticsFactory.getInstance().removeEdge(System.identityHashCode(e),source.getDiagramName());
 		}
 	}
 
 	@Override
 	public void elementChanged(ElementChangedEvent evt) {
+		DiagramEventSource source = (DiagramEventSource)evt.getSource(); 
 		if("stop_move".equals(evt.getChangeType())){
 			if(evt.getDiagramElement() instanceof Edge){
 				Edge e = (Edge)evt.getDiagramElement();
 				Edge.PointRepresentation pr = e.getPointRepresentation();
-				HapticsFactory.getInstance().updateEdge(System.identityHashCode(e), pr.xs, pr.ys,pr.adjMatrix,pr.nodeStart, e.getNameLine());
+				HapticsFactory.getInstance().updateEdge(
+						System.identityHashCode(e), 
+						pr.xs, 
+						pr.ys,
+						pr.adjMatrix,
+						pr.nodeStart, 
+						e.getNameLine(),
+						source.getDiagramName());
 			}else{
 				Node n = (Node)evt.getDiagramElement();		
 				HapticsFactory.getInstance().moveNode(
 						n.getBounds().getCenterX(),
 						n.getBounds().getCenterY(),
-						System.identityHashCode(n)
+						System.identityHashCode(n),
+						source.getDiagramName()
 				);
 			}
 		}