Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogDiaButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogDiaButton.svg (revision 27041) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogDiaButton.svg (revision 27041) @@ -0,0 +1,4777 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogSirenButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogSirenButton.svg (revision 27041) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogSirenButton.svg (revision 27041) @@ -0,0 +1,4846 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27040) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27041) @@ -236,5 +236,6 @@ safeWaterButton.setBorderPainted(false); } - topmarkButton.setBorderPainted(dlg.mark.hasTopmark()); + topmarkButton.setBorderPainted(dlg.mark.getTopmark() != Top.NONE); + topmarkButton.setSelected(dlg.mark.getTopmark() != Top.NONE); if (dlg.mark.isValid()) { topmarkButton.setVisible(true); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 27040) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 27041) @@ -18,6 +18,6 @@ public JRadioButton yesFogButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogYesButton.png"))); public JRadioButton hornButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogHornButton.png"))); - public JRadioButton sirenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton diaButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); + public JRadioButton sirenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogSirenButton.png"))); + public JRadioButton diaButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogDiaButton.png"))); public JRadioButton bellButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogBellButton.png"))); public JRadioButton whisButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogWhisButton.png"))); @@ -35,5 +35,4 @@ button.setBorderPainted(false); } - dlg.mark.setFog(!noFogButton.isSelected()); dlg.mark.paintSign(); } Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27040) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27041) @@ -75,5 +75,5 @@ private ActionListener alMultiple = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - dlg.mark.setLightMultiple(multipleBox.getText()); + dlg.mark.setLightAtt(Att.MLT, 0, multipleBox.getText()); } }; @@ -129,8 +129,6 @@ panelSector = new PanelSectors(dlg); } - dlg.mark.setSectored(true); panelSector.setVisible(true); } else { - dlg.mark.setSectored(false); if (panelSector != null) { panelSector.setVisible(false); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27040) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27041) @@ -210,8 +210,8 @@ fogIcon.setBounds(new Rectangle(235, 0, 150, 185)); this.add(fogIcon, null); - radarLabel = new JLabel("", SwingConstants.RIGHT); + radarLabel = new JLabel("", SwingConstants.CENTER); radarLabel.setBounds(new Rectangle(210, 35, 100, 20)); this.add(radarLabel, null); - fogLabel = new JLabel("", SwingConstants.RIGHT); + fogLabel = new JLabel("", SwingConstants.CENTER); fogLabel.setBounds(new Rectangle(210, 60, 100, 20)); this.add(fogLabel, null); @@ -291,4 +291,5 @@ lightsButton.setBorderPainted(false); lightsButton.setEnabled(false); + miscButtons.clearSelection(); topButton.setEnabled(false); fogButton.setEnabled(false); @@ -297,4 +298,5 @@ saveButton.setEnabled(false); moreButton.setVisible(false); + moreButton.setSelected(false); panelChan.setVisible(false); panelHaz.setVisible(false); 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 27040) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27041) @@ -517,7 +517,7 @@ } - public enum Att { COL, CHR, GRP, SEQ, PER, LIT, BEG, END, RAD, HGT, RNG, VIS, EXH, ORT } + public enum Att { COL, CHR, GRP, SEQ, PER, LIT, BEG, END, RAD, HGT, RNG, VIS, EXH, ORT, MLT } - public Object[] sector = {Col.UNKNOWN, "", "", "", "", Lit.UNKNOWN, "", "", "", "", "", Vis.UNKNOWN, Exh.UNKNOWN, "" }; + public Object[] sector = {Col.UNKNOWN, "", "", "", "", Lit.UNKNOWN, "", "", "", "", "", Vis.UNKNOWN, Exh.UNKNOWN, "", "" }; private ArrayList sectors = new ArrayList(); @@ -542,4 +542,6 @@ public void setLightAtt(int att, int i, Object obj) { + if (sectors.size() == i) + addLight(i); if (sectors.size() > i) sectors.get(i)[att] = obj; @@ -565,34 +567,4 @@ if (sectors.size() > i) sectors.remove(i); - } - - private boolean Fired = false; - - public boolean isFired() { - return Fired; - } - - public void setFired(boolean fired) { - Fired = fired; - } - - private boolean Sectored = false; - - public boolean isSectored() { - return Sectored; - } - - public void setSectored(boolean sectored) { - Sectored = sectored; - } - - private String lightMultiple = ""; - - public String getLightMiltiple() { - return lightMultiple; - } - - public void setLightMultiple(String str) { - lightMultiple = str; } @@ -669,8 +641,4 @@ private Top topShape = Top.NONE; - public boolean hasTopmark() { - return (topShape != Top.NONE); - } - public Top getTopmark() { return topShape; @@ -694,12 +662,4 @@ private Rtb RaType = Rtb.NONE; - public boolean hasRadar() { - return (RaType != Rtb.NONE); - } - - public boolean hasRacon() { - return (RaType == Rtb.RACON); - } - public Rtb getRadar() { return RaType; @@ -768,14 +728,4 @@ public void setRaconSector2(String sec) { raconSector2 = validDecimal(sec); - } - - private boolean fogSignal = false; - - public boolean hasFog() { - return fogSignal; - } - - public void setFog(boolean fog) { - fogSignal = fog; } @@ -1304,17 +1254,54 @@ sectors.clear(); sectors.add(sector.clone()); - boolean found; for (int i = 0; i < 30; i++) { - found = false; - addLight(); String secStr = (i == 0) ? "" : (":" + Integer.toString(i)); if (keys.containsKey("seamark:light" + secStr + ":colour")) { - setLightAtt(Att.COL, i, keys.get("seamark:light" + secStr + ":colour")); - found = true; - } - if (!found) { - delLight(i); - break; - } + str = keys.get("seamark:light" + secStr + ":colour"); + for (Col col : ColSTR.keySet()) + if (ColSTR.get(col).equals(str)) + setLightAtt(Att.COL, i, col); + } + if (keys.containsKey("seamark:light" + secStr + ":character")) + setLightAtt(Att.CHR, i, keys.get("seamark:light" + secStr + ":character")); + if (keys.containsKey("seamark:light" + secStr + ":group")) + setLightAtt(Att.GRP, i, keys.get("seamark:light" + secStr + ":group")); + if (keys.containsKey("seamark:light" + secStr + ":sequence")) + setLightAtt(Att.SEQ, i, keys.get("seamark:light" + secStr + ":sequence")); + if (keys.containsKey("seamark:light" + secStr + ":period")) + setLightAtt(Att.PER, i, keys.get("seamark:light" + secStr + ":period")); + if (keys.containsKey("seamark:light" + secStr + ":category")) { + str = keys.get("seamark:light" + secStr + ":category"); + for (Lit lit : LitSTR.keySet()) + if (LitSTR.get(lit).equals(str)) + setLightAtt(Att.LIT, i, lit); + } + if (keys.containsKey("seamark:light" + secStr + ":sector_start")) + setLightAtt(Att.BEG, i, keys.get("seamark:light" + secStr + ":sector_start")); + if (keys.containsKey("seamark:light" + secStr + ":sector_end")) + setLightAtt(Att.END, i, keys.get("seamark:light" + secStr + ":sector_end")); + if (keys.containsKey("seamark:light" + secStr + ":radius")) + setLightAtt(Att.RAD, i, keys.get("seamark:light" + secStr + ":radius")); + if (keys.containsKey("seamark:light" + secStr + ":height")) + setLightAtt(Att.HGT, i, keys.get("seamark:light" + secStr + ":height")); + if (keys.containsKey("seamark:light" + secStr + ":range")) + setLightAtt(Att.RNG, i, keys.get("seamark:light" + secStr + ":range")); + if (keys.containsKey("seamark:light" + secStr + ":visibility")) { + str = keys.get("seamark:light" + secStr + ":visibility"); + for (Vis vis : VisSTR.keySet()) + if (VisSTR.get(vis).equals(str)) + setLightAtt(Att.VIS, i, vis); + } + if (keys.containsKey("seamark:light" + secStr + ":exhibition")) { + str = keys.get("seamark:light" + secStr + ":exhibition"); + for (Exh exh : ExhSTR.keySet()) + if (ExhSTR.get(exh).equals(str)) + setLightAtt(Att.EXH, i, exh); + } + if (keys.containsKey("seamark:light" + secStr + ":orientation")) + setLightAtt(Att.ORT, i, keys.get("seamark:light" + secStr + ":orientation")); + if (keys.containsKey("seamark:light" + secStr + ":multiple")) + setLightAtt(Att.HGT, i, keys.get("seamark:light" + secStr + ":multiple")); + if (sectors.size() == i) + break; } @@ -1339,4 +1326,35 @@ if (keys.containsKey("seamark:fog_signal:range")) { setFogRange(keys.get("seamark:fog_signal:range")); + } + + if (keys.containsKey("seamark:radar_reflector")) { + setRadar(Rtb.REFLECTOR); + } + if (keys.containsKey("seamark:radar_transponder:category")) { + str = keys.get("seamark:radar_transponder:category"); + setRadar(Rtb.NONE); + for (Rtb rtb : RtbSTR.keySet()) { + if (RtbSTR.get(rtb).equals(str)) { + setRadar(rtb); + } + } + } + if (keys.containsKey("seamark:radar_transponder:group")) { + setRaconGroup(keys.get("seamark:radar_transponder:group")); + } + if (keys.containsKey("seamark:radar_transponder:period")) { + setRaconPeriod(keys.get("seamark:radar_transponder:period")); + } + if (keys.containsKey("seamark:radar_transponder:sequence")) { + setRaconSequence(keys.get("seamark:radar_transponder:sequence")); + } + if (keys.containsKey("seamark:radar_transponder:range")) { + setRaconRange(keys.get("seamark:radar_transponder:range")); + } + if (keys.containsKey("seamark:radar_transponder:sector_start")) { + setRaconSector1(keys.get("seamark:radar_transponder:sector_start")); + } + if (keys.containsKey("seamark:radar_transponder:sector_end")) { + setRaconSector2(keys.get("seamark:radar_transponder:sector_end")); } @@ -1687,5 +1705,5 @@ } - if (hasFog()) { + if (getFogSound() != Fog.NONE) { dlg.panelMain.fogIcon.setIcon(new ImageIcon(getClass().getResource("/images/Fog_Signal.png"))); String str = ""; @@ -1723,5 +1741,5 @@ } - if (hasRadar()) { + if (RaType != Rtb.NONE) { if (getRadar() == Rtb.REFLECTOR) { dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector_355.png"))); @@ -1743,5 +1761,5 @@ } - if (isFired()) { + if ((getLightAtt(Att.COL, 0) != Col.UNKNOWN) && (sectors.size() == 1)) { dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Magenta_120.png"))); } @@ -1803,5 +1821,5 @@ } } - if (hasTopmark()) { + if (getTopmark() != Top.NONE) { Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:shape", TopSTR.get(getTopmark()))); if (getTopPattern() != Pat.NONE) @@ -1847,7 +1865,9 @@ if (!((String)sectors.get(i)[13]).isEmpty()) Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":orientation", (String)sectors.get(i)[13])); + if (!((String)sectors.get(i)[14]).isEmpty()) + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":multiple", (String)sectors.get(i)[14])); } - if (hasFog()) { + if (getFogSound() != Fog.NONE) { if (getFogSound() == Fog.UNKNOWN) Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal", "yes")); @@ -1868,5 +1888,5 @@ } - if (hasRadar()) { + if (RaType != Rtb.NONE) { if (getRadar() == Rtb.REFLECTOR) { Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_reflector", "yes"));