Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.svg (revision 24962) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.svg (revision 24963) @@ -17,5 +17,5 @@ inkscape:version="0.47 r22583" sodipodi:docname="LighthouseButton.svg" - inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardWButton_de.png" + inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/StationButton.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -757,4 +757,543 @@ inkscape:vp_x="0 : 160 : 1" sodipodi:type="inkscape:persp3d" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -814,33 +1353,28 @@ ry="4.8846865" /> - - - - - - - + id="g3012" + inkscape:label="Signal Station" + style="stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + transform="matrix(0.2,0,0,0.2,-15.001079,996.3557)"> + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/StationButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/StationButton.svg (revision 24963) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/StationButton.svg (revision 24963) @@ -0,0 +1,6141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 24962) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 24963) @@ -33,8 +33,4 @@ public void actionPerformed(java.awt.event.ActionEvent e) { if (catButtons.getSelection() != null) { -// if (!(dlg.mark instanceof MarkCard) && !isolButton.isSelected()) { -// dlg.mark = new MarkCard(dlg); -// alShape.actionPerformed(null); -// } dlg.panelMain.topButton.setEnabled(true); dlg.panelMain.fogButton.setEnabled(true); @@ -83,8 +79,4 @@ } if (isolButton.isSelected()) { -// if (!(dlg.mark instanceof MarkIsol)) { -// dlg.mark = new MarkIsol(dlg); -// alShape.actionPerformed(null); -// } dlg.mark.setColour(Ent.BODY, Col.BLACK_RED_BLACK); dlg.panelMain.panelTop.spheres2TopButton.setEnabled(true); @@ -105,7 +97,7 @@ public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); - private EnumMap shapes = new EnumMap(Shp.class); - private EnumMap carObjects = new EnumMap(Shp.class); - private EnumMap isdObjects = new EnumMap(Shp.class); + public EnumMap shapes = new EnumMap(Shp.class); + public EnumMap carObjects = new EnumMap(Shp.class); + public EnumMap isdObjects = new EnumMap(Shp.class); private ActionListener alShape = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 24962) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 24963) @@ -26,5 +26,5 @@ public JRadioButton minorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightMinorButton.png"))); public JRadioButton vesselButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightVesselButton.png"))); - public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightFloatButton.png"))); + public JRadioButton stationButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StationButton.png"))); private EnumMap categories = new EnumMap(Cat.class); private EnumMap objects = new EnumMap(Cat.class); @@ -52,5 +52,5 @@ this.add(getCatButton(minorButton, 0, 64, 34, 32, "MinorLightTip", Cat.LIGHT_MINOR, Obj.LITMIN), null); this.add(getCatButton(vesselButton, 0, 96, 34, 32, "LightVesselTip", Cat.LIGHT_VESSEL, Obj.LITVES), null); - this.add(getCatButton(floatButton, 0, 128, 34, 32, "LightFloatTip", Cat.LIGHT_FLOAT, Obj.LITFLT), null); + this.add(getCatButton(stationButton, 0, 128, 34, 32, "SignalStationTip", Cat.SIGNAL_STATION, Obj.SIGSTA), null); } Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 24962) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 24963) @@ -18,14 +18,4 @@ public OSeaMAction dlg = null; - public OSeaMAction getDlg() { - return dlg; - } - - public SeaMark(OSeaMAction dia) { - dlg = dia; - region = Main.pref.get("tomsplugin.IALA").equals("A") ? Reg.A : Reg.B; - parseNode(); - } - public enum Reg { A, B @@ -53,9 +43,10 @@ public enum Obj { - UNKNOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, LITMAJ, LITMIN, LITFLT, LITVES, LNDMRK, MORFAC + UNKNOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, LITMAJ, LITMIN, LITFLT, LITVES, LNDMRK, MORFAC, SIGSTA } public static final EnumMap objects = new EnumMap(Obj.class); static { + objects.put(Obj.UNKNOWN, ""); objects.put(Obj.BCNCAR, "beacon_cardinal"); objects.put(Obj.BCNISD, "beacon_isolated_danger"); @@ -74,4 +65,6 @@ objects.put(Obj.LNDMRK, "landmark"); objects.put(Obj.MORFAC, "mooring"); + objects.put(Obj.SIGSTA, "signal_station_warning"); + objects.put(Obj.SIGSTA, "signal_station_traffic"); } @@ -87,9 +80,30 @@ public enum Ent { - BODY, BUOY, BEACON, FLOAT, TOPMARK, DAYMARK, LIGHT + BODY, BUOY, BEACON, FLOAT, TOPMARK, DAYMARK, LIGHT, MOORING, STATION + } + + public static final EnumMap entities = new EnumMap(Obj.class); + static { + entities.put(Obj.BCNCAR, Ent.BEACON); + entities.put(Obj.BCNISD, Ent.BEACON); + entities.put(Obj.BCNLAT, Ent.BEACON); + entities.put(Obj.BCNSAW, Ent.BEACON); + entities.put(Obj.BCNSPP, Ent.BEACON); + entities.put(Obj.BOYCAR, Ent.BUOY); + entities.put(Obj.BOYISD, Ent.BUOY); + entities.put(Obj.BOYLAT, Ent.BUOY); + entities.put(Obj.BOYSAW, Ent.BUOY); + entities.put(Obj.BOYSPP, Ent.BUOY); + entities.put(Obj.LITMAJ, Ent.LIGHT); + entities.put(Obj.LITMIN, Ent.LIGHT); + entities.put(Obj.LITFLT, Ent.FLOAT); + entities.put(Obj.LITVES, Ent.LIGHT); + entities.put(Obj.LNDMRK, Ent.LIGHT); + entities.put(Obj.MORFAC, Ent.MOORING); + entities.put(Obj.SIGSTA, Ent.STATION); } public enum Grp { - LAT, CAR, SAW, ISD, SPP, FLT, LIT + LAT, CAR, SAW, ISD, SPP, FLT, LIT, SIS } @@ -112,12 +126,14 @@ groups.put(Obj.LNDMRK, Grp.LIT); groups.put(Obj.MORFAC, Grp.SPP); + groups.put(Obj.SIGSTA, Grp.SIS); } public enum Cat { - UNKNOWN, LAT_PORT, LAT_STBD, LAT_PREF_PORT, LAT_PREF_STBD, CARD_NORTH, CARD_EAST, CARD_SOUTH, CARD_WEST, LIGHT_HOUSE, LIGHT_MAJOR, LIGHT_MINOR, LIGHT_VESSEL, LIGHT_FLOAT, MOORING_BUOY + UNKNOWN, LAT_PORT, LAT_STBD, LAT_PREF_PORT, LAT_PREF_STBD, CARD_NORTH, CARD_EAST, CARD_SOUTH, CARD_WEST, LIGHT_HOUSE, LIGHT_MAJOR, LIGHT_MINOR, LIGHT_VESSEL, LIGHT_FLOAT, MOORING_BUOY, SIGNAL_STATION } public static final EnumMap categories = new EnumMap(Cat.class); static { + categories.put(Cat.UNKNOWN, ""); categories.put(Cat.LAT_PORT, "port"); categories.put(Cat.LAT_STBD, "starboard"); @@ -147,4 +163,5 @@ public static final EnumMap shapes = new EnumMap(Shp.class); static { + shapes.put(Shp.UNKNOWN, ""); shapes.put(Shp.PILLAR, "pillar"); shapes.put(Shp.SPAR, "spar"); @@ -177,4 +194,5 @@ public static final EnumMap colours = new EnumMap(Col.class); static { + colours.put(Col.UNKNOWN, ""); colours.put(Col.WHITE, "white"); colours.put(Col.RED, "red"); @@ -241,4 +259,5 @@ public static final EnumMap tops = new EnumMap(Top.class); static { + tops.put(Top.NONE, ""); tops.put(Top.CAN, "cylinder"); tops.put(Top.CONE, "cylinder"); @@ -273,4 +292,5 @@ public static final EnumMap days = new EnumMap(Day.class); static { + days.put(Day.NONE, ""); days.put(Day.BOARD, "board"); days.put(Day.DIAMOND, "diamond"); @@ -576,76 +596,91 @@ } - public void parseNode() { - + private boolean paintlock = false; + + public SeaMark(OSeaMAction dia) { + dlg = dia; + region = Main.pref.get("tomsplugin.IALA").equals("A") ? Reg.A : Reg.B; + paintlock = true; dlg.panelMain.clearSelections(); dlg.manager.showVisualMessage(""); - String type = ""; + String typeStr = ""; + String colStr = ""; String str = ""; - String col = ""; Map keys = dlg.node.getKeys(); if (keys.containsKey("seamark:type")) - type = keys.get("seamark:type"); - - for (Obj obj : objects.keySet()) { - if (objects.get(obj).equals(type)) + typeStr = keys.get("seamark:type"); + + for (Obj obj : objects.keySet()) + if (objects.get(obj).equals(typeStr)) setObject(obj); - } - - if (type.equals("light_float") || type.equals("") || keys.containsKey("seamark:light_float:colour") - || keys.containsKey("seamark:light_float:colour_pattern")) { + + if (typeStr.equals("light_float") || typeStr.equals("") || keys.containsKey("seamark:light_float:colour") + || keys.containsKey("seamark:light_float:colour_pattern")) { if (keys.containsKey("seamark:light_float:colour_pattern")) { setObject(Obj.LITFLT); - type = "light_float"; + typeStr = "light_float"; } if (keys.containsKey("seamark:light_float:colour")) { - col = keys.get("seamark:light_float:colour"); - if (col.equals("red") || col.equals("green") || col.equals("red;green;red") || col.equals("green;red;green")) { + colStr = keys.get("seamark:light_float:colour"); + if (colStr.equals("red") || colStr.equals("green") || colStr.equals("red;green;red") || colStr.equals("green;red;green")) { setObject(Obj.BOYLAT); - } else if (col.equals("black;yellow") || col.equals("black;yellow;black") || col.equals("yellow;black") - || col.equals("yellow;black;yellow")) { + } else if (colStr.equals("black;yellow") || colStr.equals("black;yellow;black") || colStr.equals("yellow;black") + || colStr.equals("yellow;black;yellow")) { setObject(Obj.BOYCAR); - } else if (col.equals("black;red;black")) { + } else if (colStr.equals("black;red;black")) { setObject(Obj.BOYISD); - } else if (col.equals("red;white")) { + } else if (colStr.equals("red;white")) { setObject(Obj.BOYSAW); - } else if (col.equals("yellow")) { + } else if (colStr.equals("yellow")) { setObject(Obj.BOYSPP); } else setObject(Obj.LITFLT); - type = "light_float"; - } - if (type.equals("")) { + typeStr = "light_float"; + } + if (typeStr.equals("")) { if (keys.containsKey("seamark:buoy_lateral:category") || keys.containsKey("seamark:buoy_lateral:shape") - || keys.containsKey("seamark:buoy_lateral:colour")) { + || keys.containsKey("seamark:buoy_lateral:colour")) { setObject(Obj.BOYLAT); + typeStr = "buoy_lateral"; } else if (keys.containsKey("seamark:beacon_lateral:category") || keys.containsKey("seamark:beacon_lateral:shape") - || keys.containsKey("seamark:beacon_lateral:colour")) { + || keys.containsKey("seamark:beacon_lateral:colour")) { setObject(Obj.BCNLAT); + typeStr = "beacon_lateral"; } else if (keys.containsKey("seamark:buoy_cardinal:category") || keys.containsKey("seamark:buoy_cardinal:shape") - || keys.containsKey("seamark:buoy_cardinal:colour")) { + || keys.containsKey("seamark:buoy_cardinal:colour")) { setObject(Obj.BOYCAR); + typeStr = "buoy_cardinal"; } else if (keys.containsKey("seamark:beacon_cardinal:category") || keys.containsKey("seamark:beacon_cardinal:shape") - || keys.containsKey("seamark:beacon_cardinal:colour")) { + || keys.containsKey("seamark:beacon_cardinal:colour")) { setObject(Obj.BCNCAR); - } else if (keys.containsKey("seamark:buoy_isolated_danger:category") || keys.containsKey("seamark:buoy_isolated_danger:shape") - || keys.containsKey("seamark:buoy_isolated_danger:colour")) { + typeStr = "beacon_cardinal"; + } else if (keys.containsKey("seamark:buoy_isolated_danger:category") + || keys.containsKey("seamark:buoy_isolated_danger:shape") || keys.containsKey("seamark:buoy_isolated_danger:colour")) { setObject(Obj.BOYISD); - } else if (keys.containsKey("seamark:beacon_isolated_danger:category") || keys.containsKey("seamark:beacon_isolated_danger:shape") - || keys.containsKey("seamark:beacon_isolated_danger:colour")) { + typeStr = "buoy_isolated_danger"; + } else if (keys.containsKey("seamark:beacon_isolated_danger:category") + || keys.containsKey("seamark:beacon_isolated_danger:shape") + || keys.containsKey("seamark:beacon_isolated_danger:colour")) { setObject(Obj.BCNISD); + typeStr = "beacon_isolated_danger"; } else if (keys.containsKey("seamark:buoy_safe_water:category") || keys.containsKey("seamark:buoy_safe_water:shape") - || keys.containsKey("seamark:buoy_safe_water:colour")) { + || keys.containsKey("seamark:buoy_safe_water:colour")) { setObject(Obj.BOYSAW); + typeStr = "buoy_safe_water"; } else if (keys.containsKey("seamark:beacon_safe_water:category") || keys.containsKey("seamark:beacon_safe_water:shape") - || keys.containsKey("seamark:beacon_safe_water:colour")) { + || keys.containsKey("seamark:beacon_safe_water:colour")) { setObject(Obj.BCNSAW); - } else if (keys.containsKey("seamark:buoy_special_purpose:category") || keys.containsKey("seamark:buoy_special_purpose:shape") - || keys.containsKey("seamark:buoy_special_purpose:colour")) { + typeStr = "beacon_safe_water"; + } else if (keys.containsKey("seamark:buoy_special_purpose:category") + || keys.containsKey("seamark:buoy_special_purpose:shape") || keys.containsKey("seamark:buoy_special_purpose:colour")) { setObject(Obj.BOYSPP); - } else if (keys.containsKey("seamark:beacon_special_purpose:category") || keys.containsKey("seamark:beacon_special_purpose:shape") - || keys.containsKey("seamark:beacon_special_purpose:colour")) { + typeStr = "buoy_special_purpose"; + } else if (keys.containsKey("seamark:beacon_special_purpose:category") + || keys.containsKey("seamark:beacon_special_purpose:shape") + || keys.containsKey("seamark:beacon_special_purpose:colour")) { setObject(Obj.BCNSPP); + typeStr = "beacon_special_purpose"; } } @@ -657,6 +692,11 @@ } - if (keys.containsKey("seamark:" + type + ":name")) { - dlg.panelMain.nameBox.setText(keys.get("seamark:" + type + ":name")); + if (keys.containsKey("seamark:" + typeStr + ":colour")) + colStr = keys.get("seamark:" + typeStr + ":colour"); + for (Col col : colours.keySet()) + if (colours.get(col).equals(colStr)) setColour(Ent.BODY, col); + + if (keys.containsKey("seamark:" + typeStr + ":name")) { + dlg.panelMain.nameBox.setText(keys.get("seamark:" + typeStr + ":name")); dlg.panelMain.nameBox.postActionEvent(); } else if (keys.containsKey("seamark:name")) { @@ -680,35 +720,40 @@ if (keys.containsKey("seamark:buoy_lateral:category")) str = keys.get("seamark:buoy_lateral:category"); - else if (type.equals("light_float")) { + else if (typeStr.equals("light_float")) { if (region == Reg.A) { - if (col.equals("red")) - dlg.panelMain.panelChan.portButton.doClick(); - else if (col.equals("green")) - dlg.panelMain.panelChan.stbdButton.doClick(); - else if (col.equals("red;green;red")) - dlg.panelMain.panelChan.prefPortButton.doClick(); - else if (col.equals("green;red;green")) - dlg.panelMain.panelChan.prefStbdButton.doClick(); + if (colStr.equals("red")) + str = "port"; + else if (colStr.equals("green")) + str = "starboard"; + else if (colStr.equals("red;green;red")) + str = "preferred_channel_port"; + else if (colStr.equals("green;red;green")) + str = "preferred_channel_starboard"; } else { - if (col.equals("green")) - dlg.panelMain.panelChan.portButton.doClick(); - else if (col.equals("red")) - dlg.panelMain.panelChan.stbdButton.doClick(); - else if (col.equals("green;red;green")) - dlg.panelMain.panelChan.prefPortButton.doClick(); - else if (col.equals("red;green;red")) - dlg.panelMain.panelChan.prefStbdButton.doClick(); + if (colStr.equals("green")) + str = "port"; + else if (colStr.equals("red")) + str = "starboard"; + else if (colStr.equals("green;red;green")) + str = "preferred_channel_port"; + else if (colStr.equals("red;green;red")) + str = "preferred_channel_starboard"; } } break; } - if (str.equals("port")) + if (str.equals("port")) { + setCategory(Cat.LAT_PORT); dlg.panelMain.panelChan.portButton.doClick(); - else if (str.equals("starboard")) + } else if (str.equals("starboard")) { + setCategory(Cat.LAT_STBD); dlg.panelMain.panelChan.stbdButton.doClick(); - else if (str.equals("preferred_channel_port")) + } else if (str.equals("preferred_channel_port")) { + setCategory(Cat.LAT_PREF_PORT); dlg.panelMain.panelChan.prefPortButton.doClick(); - else if (str.equals("preferred_channel_starboard")) + } else if (str.equals("preferred_channel_starboard")) { + setCategory(Cat.LAT_PREF_STBD); dlg.panelMain.panelChan.prefStbdButton.doClick(); + } break; case CAR: @@ -722,24 +767,29 @@ if (keys.containsKey("seamark:buoy_cardinal:category")) str = keys.get("seamark:buoy_cardinal:category"); - else if (type.equals("light_float")) { - if (col.equals("black;yellow")) - dlg.panelMain.panelHaz.northButton.doClick(); - else if (col.equals("yellow;black")) - dlg.panelMain.panelHaz.southButton.doClick(); - else if (col.equals("black;yellow;black")) - dlg.panelMain.panelHaz.eastButton.doClick(); - else if (col.equals("yellow;black;yellow")) - dlg.panelMain.panelHaz.westButton.doClick(); + else if (typeStr.equals("light_float")) { + if (colStr.equals("black;yellow")) + str = "north"; + else if (colStr.equals("yellow;black")) + str = "south"; + else if (colStr.equals("black;yellow;black")) + str = "east"; + else if (colStr.equals("yellow;black;yellow")) + str = "west"; } break; } - if (str.equals("north")) + if (str.equals("north")) { + setCategory(Cat.CARD_NORTH); dlg.panelMain.panelHaz.northButton.doClick(); - else if (str.equals("south")) + } else if (str.equals("south")) { + setCategory(Cat.CARD_SOUTH); dlg.panelMain.panelHaz.southButton.doClick(); - else if (str.equals("east")) + } else if (str.equals("east")) { + setCategory(Cat.CARD_EAST); dlg.panelMain.panelHaz.eastButton.doClick(); - else if (str.equals("west")) + } else if (str.equals("west")) { + setCategory(Cat.CARD_WEST); dlg.panelMain.panelHaz.westButton.doClick(); + } break; case SAW: @@ -754,11 +804,55 @@ dlg.panelMain.specButton.doClick(); break; - case FLT: + case SIS: dlg.panelMain.lightsButton.doClick(); - dlg.panelMain.panelLights.floatButton.doClick(); + dlg.panelMain.panelLights.stationButton.doClick(); break; case LIT: dlg.panelMain.lightsButton.doClick(); break; + } + + if (keys.containsKey("seamark:" + typeStr + ":shape")) + str = keys.get("seamark:" + typeStr + ":shape"); + else if (typeStr.equals("light_float")) + str = "float"; + else str = ""; + if ((str.isEmpty() && (entities.get(getObject()) == Ent.BEACON)) || str.equals("stake")) + str = "beacon"; + if (!str.isEmpty()) { + for (Shp shp : shapes.keySet()) { + if (shapes.get(shp).equals(str)) { + switch (groups.get(getObject())) { + case LAT: + switch (getCategory()) { + case LAT_PORT: + case LAT_PREF_PORT: + if (dlg.panelMain.panelChan.panelPort.shapes.get(shp) != null) + dlg.panelMain.panelChan.panelPort.shapes.get(shp).doClick(); + break; + case LAT_STBD: + case LAT_PREF_STBD: + if (dlg.panelMain.panelChan.panelStbd.shapes.get(shp) != null) + dlg.panelMain.panelChan.panelStbd.shapes.get(shp).doClick(); + break; + } + break; + case SAW: + if (dlg.panelMain.panelChan.panelSaw.shapes.get(shp) != null) + dlg.panelMain.panelChan.panelSaw.shapes.get(shp).doClick(); + break; + case CAR: + case ISD: + if (dlg.panelMain.panelHaz.shapes.get(shp) != null) + dlg.panelMain.panelHaz.shapes.get(shp).doClick(); + break; + case SPP: + if (dlg.panelMain.panelSpec.shapes.get(shp) != null) + dlg.panelMain.panelSpec.shapes.get(shp).doClick(); + break; + } + break; + } + } } @@ -819,5 +913,5 @@ if (keys.containsKey("seamark:fog_signal") || keys.containsKey("seamark:fog_signal:category") - || keys.containsKey("seamark:fog_signal:group") || keys.containsKey("seamark:fog_signal:period")) { + || keys.containsKey("seamark:fog_signal:group") || keys.containsKey("seamark:fog_signal:period")) { setFog(true); if (keys.containsKey("seamark:fog_signal:category")) { @@ -847,5 +941,5 @@ if (keys.containsKey("seamark:radar_transponder") || keys.containsKey("seamark:radar_transponder:category") - || keys.containsKey("seamark:radar_transponder:group")) { + || keys.containsKey("seamark:radar_transponder:group")) { setRacon(true); if (keys.containsKey("seamark:radar_transponder:category")) { @@ -864,7 +958,12 @@ } else if (keys.containsKey("seamark:radar_reflector")) setRadar(true); + paintlock = false; + paintSign(); } public void paintSign() { + + if (paintlock) + return; String imgStr = "/images/"; @@ -883,5 +982,5 @@ imgStr += ".png"; if (getClass().getResource(imgStr) == null) - System.out.println(imgStr); + System.out.println("Body:" + imgStr); else dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(imgStr))); @@ -921,8 +1020,8 @@ String colStr = colours.get(topColour); if (colStr != null) - imgStr += ("_" + colStr); + imgStr += colStr; imgStr += ".png"; if (getClass().getResource(imgStr) == null) - System.out.println(imgStr); + System.out.println("Top:" + imgStr); else dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(imgStr))); @@ -1054,15 +1153,15 @@ if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null)) Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light:" + i, "red:" + Bearing1[i] + ":" - + Bearing2[i] + ":" + Radius[i])); + + Bearing2[i] + ":" + Radius[i])); } else if (colour.equals("G")) { Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light:" + i + ":colour", "green")); if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null)) Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light:" + i, "green:" + Bearing1[i] + ":" - + Bearing2[i] + ":" + Radius[i])); + + Bearing2[i] + ":" + Radius[i])); } else if (colour.equals("W")) { Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light:" + i + ":colour", "white")); if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null)) Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light:" + i, "white:" + Bearing1[i] + ":" - + Bearing2[i] + ":" + Radius[i])); + + Bearing2[i] + ":" + Radius[i])); } if (LightPeriod[i] != null)