Changeset 21875 in osm

Timestamp:

2010-06-21T21:58:58+02:00 (14 years ago)

Author:

upliner

Message:

add auto-selection of buildings

Location:

applications/editors/josm/plugins/buildings_tools/src/buildings_tools

Files:

• Building.java (modified) (1 diff)
• BuildingSizeDialog.java (modified) (3 diffs)
• BuildingsToolsPlugin.java (modified) (1 diff)
• DrawBuildingAction.java (modified) (3 diffs)
• ToolSettings.java (modified) (2 diffs)

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java

@@ -122 +122 @@
                                 p1.north() + Math.cos(heading) * len * meter - Math.sin(heading) * width * meter);
                 en[3] = new EastNorth(p1.east() + Math.cos(heading) * width * meter,
-                                p1.north() - Math.sin(heading) * width  * meter);
+                                p1.north() - Math.sin(heading) * width * meter);
         }
 

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java

@@ -25 +25 @@
         private JFormattedTextField tlenstep = new JFormattedTextField(NumberFormat.getInstance());
         private JCheckBox caddr = new JCheckBox(tr("Use Address dialog"));
+        private JCheckBox cAutoSelect = new JCheckBox(tr("Auto-select building"));
 
         static void addLabelled(JPanel panel, String str, Component c) {
@@ -44 +45 @@
                 addLabelled(panel, tr("Length step:"), tlenstep);
                 panel.add(caddr, GBC.eol().fill(GBC.HORIZONTAL));
+                panel.add(cAutoSelect, GBC.eol().fill(GBC.HORIZONTAL));
 
                 twidth.setValue(ToolSettings.getWidth());
                 tlenstep.setValue(ToolSettings.getLenStep());
                 caddr.setSelected(ToolSettings.isUsingAddr());
+                cAutoSelect.setSelected(ToolSettings.isAutoSelect());
 
                 JButton bAdv = new JButton(tr("Advanced..."));
@@ -89 +92 @@
                 ToolSettings.setSizes(width(), lenstep());
                 ToolSettings.setAddrDialog(useAddr());
+                ToolSettings.setAutoSelect(cAutoSelect.isSelected());
         }
 }

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java

@@ -24 +24 @@
                 super(info);
                 Main.main.menu.editMenu.addSeparator();
-                MainMenu.add(Main.main.menu.editMenu, new BuildingSizeAction());   
+                MainMenu.add(Main.main.menu.editMenu, new BuildingSizeAction());
         }
         @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java

@@ -179 +179 @@
                         this.isCtrlDown = isCtrlDown;
                         this.isShiftDown = isShiftDown;
+                        processMouseEvent(null);
                         updCursor();
-                }
-                ev.getID();
+                        if (mode != Mode.None)
+                                Main.map.mapView.repaint();
+                }
 
                 if (ev.getKeyCode() == KeyEvent.VK_ESCAPE && ev.getID() == KeyEvent.KEY_PRESSED) {
@@ -233 +235 @@
 
         private void processMouseEvent(MouseEvent e) {
-                mousePos = e.getPoint();
-                isCtrlDown = e.isControlDown();
-                isShiftDown = e.isShiftDown();
+                if (e != null) {
+                        mousePos = e.getPoint();
+                        isCtrlDown = e.isControlDown();
+                        isShiftDown = e.isShiftDown();
+                }
                 if (mode == Mode.None) {
                         nextMode = Mode.None;
@@ -295 +299 @@
                         if (w != null && ToolSettings.isUsingAddr())
                                 showAddrDialog(w);
+                        if (ToolSettings.isAutoSelect() &&
+                                        (Main.main.getCurrentDataSet().getSelected().isEmpty() || isShiftDown)) {
+                                Main.main.getCurrentDataSet().setSelected(w);
+                        }
                 }
                 cancelDrawing();

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/ToolSettings.java

@@ -8 +8 @@
         private static boolean useAddr;
         private static String tag = "yes";
+        private static boolean autoSelect;
 
         public static void setAddrDialog(boolean _useAddr) {
@@ -53 +54 @@
                 return Main.pref.getBoolean("buildings_tools.softcursor", false);
         }
+
+        public static boolean isAutoSelect() {
+                return autoSelect;
+        }
+
+        public static void setAutoSelect(boolean _autoSelect) {
+                autoSelect = _autoSelect;
+        }
 }