Ticket #9065: josm_patch_building_tools_autoselect_replace_v1.patch
File josm_patch_building_tools_autoselect_replace_v1.patch, 4.6 KB (added by , 2 years ago) |
---|
-
plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingSizeDialog.java
21 21 private final JFormattedTextField tlenstep = new JFormattedTextField(NumberFormat.getInstance()); 22 22 private final JCheckBox caddr = new JCheckBox(tr("Use Address dialog")); 23 23 private final JCheckBox cAutoSelect = new JCheckBox(tr("Auto-select building")); 24 private final JCheckBox cAutoSelectReplaceSelection = new JCheckBox(tr("Auto-select replaces existing selection")); 24 25 private final JCheckBox cAddrNode = new JCheckBox(tr("Use address nodes under buildings")); 25 26 private final JRadioButton circleRadio = new JRadioButton(tr("Circle")); 26 27 private final JRadioButton rectangleRadio = new JRadioButton(tr("Rectangle")); … … 41 42 addLabelled(tr("Length step:"), tlenstep); 42 43 panel.add(caddr, GBC.eol().fill(GBC.HORIZONTAL)); 43 44 panel.add(cAutoSelect, GBC.eol().fill(GBC.HORIZONTAL)); 45 panel.add(cAutoSelectReplaceSelection, GBC.eol().fill(GBC.HORIZONTAL)); 44 46 panel.add(cAddrNode, GBC.eol().fill(GBC.HORIZONTAL)); 45 47 46 48 twidth.setValue(ToolSettings.getWidth()); … … 47 49 tlenstep.setValue(ToolSettings.getLenStep()); 48 50 caddr.setSelected(ToolSettings.isUsingAddr()); 49 51 cAutoSelect.setSelected(ToolSettings.isAutoSelect()); 52 cAutoSelectReplaceSelection.setSelected(ToolSettings.isAutoSelectReplaceSelection()); 50 53 cAddrNode.setSelected(ToolSettings.PROP_USE_ADDR_NODE.get()); 51 54 52 55 JButton bAdv = new JButton(tr("Advanced...")); … … 94 97 ToolSettings.setSizes(width(), lenstep()); 95 98 ToolSettings.setAddrDialog(useAddr()); 96 99 ToolSettings.setAutoSelect(cAutoSelect.isSelected()); 100 ToolSettings.setAutoSelectReplaceSelection(cAutoSelectReplaceSelection.isSelected()); 97 101 ToolSettings.PROP_USE_ADDR_NODE.put(cAddrNode.isSelected()); 98 102 } 99 103 } -
plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java
350 350 if (ToolSettings.isUsingAddr()) 351 351 showAddrDialog(w); 352 352 if (ToolSettings.isAutoSelect() 353 && (getLayerManager().getEditDataSet().getSelected().isEmpty() || shift)) { 353 && (getLayerManager().getEditDataSet().getSelected().isEmpty() || shift || 354 ToolSettings.isAutoSelectReplaceSelection())) { 354 355 getLayerManager().getEditDataSet().setSelected(w); 355 356 } 356 357 } -
plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java
30 30 private static double lenstep; 31 31 private static boolean useAddr; 32 32 private static final Map<String, String> TAGS = new HashMap<>(); 33 private static boolean autoSelect;34 33 35 34 public static Shape getShape() { 36 35 loadShape(); … … 119 118 } 120 119 121 120 public static boolean isAutoSelect() { 122 return autoSelect;121 return Config.getPref().getBoolean("buildings_tools.autoselect", false); 123 122 } 124 123 125 124 public static void setAutoSelect(boolean autoSelect) { 126 ToolSettings.autoSelect = autoSelect;125 Config.getPref().putBoolean("buildings_tools.autoselect", autoSelect); 127 126 } 128 127 128 public static boolean isAutoSelectReplaceSelection() { 129 return Config.getPref().getBoolean("buildings_tools.autoselect_replace_selection", false); 130 } 131 132 public static void setAutoSelectReplaceSelection(boolean autoSelectReplace) { 133 Config.getPref().putBoolean("buildings_tools.autoselect_replace_selection", autoSelectReplace); 134 } 135 129 136 public static boolean isNoClickAndDrag() { 130 137 return Config.getPref().getBoolean("buildings_tools.noclickdrag", false); 131 138 }