Changeset 90

Timestamp:

03/08/05 03:14:26 (3 years ago)

Author:

tfelker2

Message:

now you can add edges and remove stuff

Files:

• trunk/Graph.java (modified) (2 diffs)
• trunk/JGraphViewer.java (modified) (1 diff)
• trunk/MapEditor.java (modified) (1 diff)

trunk/Graph.java

@@ -11 +11 @@
-
-public class Graph implements Serializable {
+        static final long serialVersionUID = -4885663328284713368L;
+
-        public Graph() {
-                nodes = new Vector();
@@ -337 +339 @@
-        }
-
+        public void removeEdge(Edge e) {
+                edges.remove(e);
+                Iterator i = idsToListsOfEdges.values().iterator();
+                while(i.hasNext()) {
+                        Collection edgeList = (Collection)i.next();
+                        if(edgeList != null) edgeList.remove(e);
+                }
+        }
+
+        public void removeNode(Node n) {
+                nodes.remove(n);
+                idsToNodes.remove(n.id);
+                idsToListsOfEdges.remove(n.id);
+        }
+
-        public void addBackgroundMap(BackgroundMap m) { backgroundMaps.add(m); }
-        public void setBackgroundMaps(Vector v) { backgroundMaps = v; }

trunk/JGraphViewer.java

@@ -229 +229 @@
-        }
-
-
+
+
+
+
-                updateRealToScreen();
-                updateObjectsToPainters();

trunk/MapEditor.java

@@ -178 +178 @@
-
-        public void pointReceived(MouseEvent event, Point2D.Double point) {
- || event.getID() == MouseEvent.MOUSE_DRAGGED
+
-                        if(addNodesMode.isSelected()) {
+                                graphViewer.setSelectedObject(null);
-                                System.out.println("adding node " + graph.getUnusedNodeID());
-                                graph.addNode(new PhysicalNode(graph.getUnusedNodeID(), point.getX(), point.getY()));
-                                graphViewer.graphChanged();
+                        } else
+                        if(addEdgesMode.isSelected()) {
+                                Object source = graphViewer.getSelectedObject();
+                                Object destination = graphViewer.closestMatch(point, 0);
+                                if(source instanceof PhysicalNode && destination instanceof PhysicalNode) {
+                                        graph.addEdge(new PhysicalEdge(((PhysicalNode)source).id, ((PhysicalNode)destination).id));
+                                        graphViewer.graphChanged();
+                                        if(!event.isShiftDown())
+                                                graphViewer.setSelectedObject(null);
+                                } else
+                                if(destination instanceof PhysicalNode) {
+                                        graphViewer.setSelectedObject(destination);
+                                }
+                        } else
+                        if(deleteMode.isSelected()) {
+                                graphViewer.setSelectedObject(null);
+                                Object toBeDeleted = graphViewer.closestMatch(point, 0);
+                                if(toBeDeleted instanceof PhysicalNode) {
+                                        Iterator i = ((PhysicalNode)toBeDeleted).edges.iterator();
+                                        while(i.hasNext())
+                                                graph.removeEdge((PhysicalEdge)i.next());
+                                        graph.removeNode((PhysicalNode)toBeDeleted);
+                                        graphViewer.graphChanged();
+                                } else
+                                if(toBeDeleted instanceof PhysicalEdge) {
+                                        graph.removeEdge((PhysicalEdge)toBeDeleted);
+                                        graphViewer.graphChanged();
+                                }
-                        }
-                }