Changeset 92

Timestamp:

03/08/05 17:42:08 (3 years ago)

Author:

tfelker2

Message:

implemented chain addition mode

Files:

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

trunk/Graph.java

@@ -357 +357 @@
-        }
-
+
-        public void addBackgroundMap(BackgroundMap m) { backgroundMaps.add(m); }
-        public void setBackgroundMaps(Vector v) { backgroundMaps = v; }

trunk/MapEditor.java

@@ -13 +13 @@
-        JMenu fileMenu, modeMenu, miscMenu;
-        JMenuItem openMenuItem, saveAsMenuItem, makeMapsMenuItem, switchMapMenuItem;
-
+, chainMode
-        ButtonGroup modeGroup;
-        JFileChooser fileChooser;
@@ -69 +69 @@
-                modeGroup.add(deleteMode);
-                modeMenu.add(deleteMode);
+
+                chainMode = new JRadioButtonMenuItem("Chain", false);
+                modeGroup.add(chainMode);
+                modeMenu.add(chainMode);
-
-                makeMapsMenuItem = new JMenuItem("Make maps");
@@ -177 +181 @@
-
-
+        private PhysicalNode lastSource;
-        public void pointReceived(MouseEvent event, Point2D.Double point) {
-                if(event.getID() == MouseEvent.MOUSE_PRESSED) {
-                        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();
@@ -188 +192 @@
-                                Object source = graphViewer.getSelectedObject();
-                                Object destination = graphViewer.closestMatch(point, 0);
+                                if(event.isShiftDown() && source == null) source = lastSource;
-                                if(source instanceof PhysicalNode && destination instanceof PhysicalNode) {
-                                        graph.addEdge(new PhysicalEdge(((PhysicalNode)source).id, ((PhysicalNode)destination).id));
-                                        graphViewer.graphChanged();
-if(!event.isShiftDown())
-       
+lastSource = (PhysicalNode)source;
+
-                                } else
-                                if(destination instanceof PhysicalNode) {
@@ -212 +217 @@
-                                        graphViewer.graphChanged();
-                                }
+                        } else
+
+                        if(chainMode.isSelected()) {
+
+                                Object clickedObject = graphViewer.closestMatch(point, 0);
+                                Object selectedObject = graphViewer.getSelectedObject();
+
+                                if(clickedObject instanceof PhysicalNode && selectedObject instanceof PhysicalNode) {
+                                        if(clickedObject == selectedObject) {
+                                                graphViewer.setSelectedObject(null);
+                                        } else {
+                                                graph.addEdge(
+                                                        new PhysicalEdge(
+                                                                ((PhysicalNode)selectedObject).id,
+                                                                ((PhysicalNode)clickedObject).id
+                                                        )
+                                                );
+                                                graphViewer.graphChanged();
+                                                if(!event.isShiftDown())
+                                                        graphViewer.setSelectedObject(clickedObject);
+                                        }
+                                } else
+                                if(selectedObject instanceof PhysicalNode && clickedObject == null) {
+                                        PhysicalNode newNode = new PhysicalNode(graph.getUnusedNodeID(), point.getX(), point.getY());
+                                        graph.addNode(newNode);
+                                        graph.addEdge(new PhysicalEdge(((PhysicalNode)selectedObject).id, newNode.id));
+                                        graphViewer.graphChanged();
+                                        if(!event.isShiftDown())
+                                                graphViewer.setSelectedObject(newNode);
+                                } else
+                                if(clickedObject != null) {
+                                        graphViewer.setSelectedObject(clickedObject);
+                                } else
+                                if(clickedObject == null && selectedObject == null) {
+                                        PhysicalNode newNode = new PhysicalNode(graph.getUnusedNodeID(), point.getX(), point.getY());
+                                        graph.addNode(newNode);
+                                        graphViewer.graphChanged();
+                                        graphViewer.setSelectedObject(newNode);
+                                }
-                        }
-                }