Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogHornButton.svg =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogHornButton.svg (revision 27032) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogHornButton.svg (revision 27032) @@ -0,0 +1,4812 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogYesButton.svg =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogYesButton.svg (revision 27032) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogYesButton.svg (revision 27032) @@ -0,0 +1,4838 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27031) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27032) @@ -176,8 +176,10 @@ Elevation=Elevation Visibility=Visibility +Conspicuity=Conspicuity Reflectivity=Reflectivity Construction=Construction - -NotSet=Not set +Conspicuous=Conspicuous +NotConspicuous=Not conspicuous +Reflector=Reflector Permanent=Permanent @@ -218,2 +220,11 @@ Start=Start End=End + +NoFog=No fog signal +FogSignal=Fog Signal +Horn=Horn +Siren=Siren +Diaphone=Diaphone +Bell=Bell +Whistle=Whistle +Explosion=Explosion Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27031) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27032) @@ -176,8 +176,10 @@ Elevation=Elevation Visibility=Visibility +Conspicuity=Conspicuity Reflectivity=Reflectivity Construction=Construction - -NotSet=Not set +Conspicuous=Conspicuous +NotConspicuous=Not conspicuous +Reflector=Reflector Permanent=Permanent @@ -219,2 +221,11 @@ End=End +NoFog=No fog signal +FogSignal=Fog Signal +Horn=Horn +Siren=Siren +Diaphone=Diaphone +Bell=Bell +Whistle=Whistle +Explosion=Explosion + 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 27031) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 27032) @@ -16,6 +16,6 @@ private ButtonGroup fogButtons = new ButtonGroup(); public JRadioButton noFogButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton yesFogButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton hornButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); + 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"))); @@ -44,4 +44,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { dlg.mark.setFogGroup(groupBox.getText()); + dlg.mark.paintSign(); } }; @@ -51,4 +52,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { dlg.mark.setFogPeriod(periodBox.getText()); + dlg.mark.paintSign(); } }; @@ -117,8 +119,5 @@ for (Fog fog : fogs.keySet()) { JRadioButton button = fogs.get(fog); - if (dlg.mark.getFogSound() == fog) { - button.setBorderPainted(true); - } else - button.setBorderPainted(false); + button.setBorderPainted(dlg.mark.getFogSound() == fog); } groupBox.setText(dlg.mark.getFogGroup()); 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 27031) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27032) @@ -184,21 +184,21 @@ categoryBox.setBounds(new Rectangle(185, 20, 165, 20)); this.add(categoryBox, null); - addCatItem(Messages.getString("NoneSpecified"), Lit.UNKNOWN); - addCatItem(Messages.getString("NoneSpecified"), Lit.VERT); - addCatItem(Messages.getString("NoneSpecified"), Lit.HORIZ); - addCatItem(Messages.getString("NoneSpecified"), Lit.UPPER); - addCatItem(Messages.getString("NoneSpecified"), Lit.LOWER); - addCatItem(Messages.getString("NoneSpecified"), Lit.REAR); - addCatItem(Messages.getString("NoneSpecified"), Lit.FRONT); - addCatItem(Messages.getString("NoneSpecified"), Lit.AERO); - addCatItem(Messages.getString("NoneSpecified"), Lit.AIROBS); - addCatItem(Messages.getString("NoneSpecified"), Lit.FOGDET); - addCatItem(Messages.getString("NoneSpecified"), Lit.FLOOD); - addCatItem(Messages.getString("NoneSpecified"), Lit.STRIP); - addCatItem(Messages.getString("NoneSpecified"), Lit.SUBS); - addCatItem(Messages.getString("NoneSpecified"), Lit.SPOT); - addCatItem(Messages.getString("NoneSpecified"), Lit.MOIRE); - addCatItem(Messages.getString("NoneSpecified"), Lit.EMERG); - addCatItem(Messages.getString("NoneSpecified"), Lit.BEAR); + addCatItem("", Lit.UNKNOWN); + addCatItem(Messages.getString("VerticallyDisposedLights"), Lit.VERT); + addCatItem(Messages.getString("HorizontallyDisposedLights"), Lit.HORIZ); + addCatItem(Messages.getString("Upper"), Lit.UPPER); + addCatItem(Messages.getString("Lower"), Lit.LOWER); + addCatItem(Messages.getString("Rear"), Lit.REAR); + addCatItem(Messages.getString("Front"), Lit.FRONT); + addCatItem(Messages.getString("AeroLight"), Lit.AERO); + addCatItem(Messages.getString("AirObstructionLight"), Lit.AIROBS); + addCatItem(Messages.getString("FogDetectorLight"), Lit.FOGDET); + addCatItem(Messages.getString("Floodlight"), Lit.FLOOD); + addCatItem(Messages.getString("Striplight"), Lit.STRIP); + addCatItem(Messages.getString("SubsidiaryLight"), Lit.SUBS); + addCatItem(Messages.getString("Spotlight"), Lit.SPOT); + addCatItem(Messages.getString("MoireEffectLight"), Lit.MOIRE); + addCatItem(Messages.getString("EmergencyLight"), Lit.EMERG); + addCatItem(Messages.getString("BearingLight"), Lit.BEAR); categoryBox.addActionListener(alCategory); @@ -209,5 +209,5 @@ visibilityBox.setBounds(new Rectangle(185, 60, 165, 20)); this.add(visibilityBox, null); - addVisibItem(Messages.getString("NoneSpecified"), Vis.UNKNOWN); + addVisibItem("", Vis.UNKNOWN); addVisibItem(Messages.getString("Intensified"), Vis.INTEN); addVisibItem(Messages.getString("Unintensified"), Vis.UNINTEN); @@ -221,5 +221,5 @@ exhibitionBox.setBounds(new Rectangle(280, 100, 70, 20)); this.add(exhibitionBox, null); - addExhibItem(Messages.getString("NotSet"), Exh.UNKNOWN); + addExhibItem("", Exh.UNKNOWN); addExhibItem(Messages.getString("24h"), Exh.H24); addExhibItem(Messages.getString("Day"), Exh.DAY); Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java (revision 27031) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java (revision 27032) @@ -232,5 +232,5 @@ statusBox = new JComboBox(); statusBox.setBounds(new Rectangle(250, 20, 100, 20)); - addStsItem(Messages.getString("NotSet"), Sts.UNKNOWN); + addStsItem("", Sts.UNKNOWN); addStsItem(Messages.getString("Permanent"), Sts.PERM); addStsItem(Messages.getString("Occasional"), Sts.OCC); @@ -259,5 +259,5 @@ constrBox = new JComboBox(); constrBox.setBounds(new Rectangle(250, 60, 100, 20)); - addCnsItem(Messages.getString("NotSet"), Cns.UNKNOWN); + addCnsItem("", Cns.UNKNOWN); addCnsItem(Messages.getString("Masonry"), Cns.BRICK); addCnsItem(Messages.getString("Concreted"), Cns.CONC); @@ -272,10 +272,10 @@ constrBox.addActionListener(alConstr); - conLabel = new JLabel(Messages.getString("Visibility"), SwingConstants.CENTER); + conLabel = new JLabel(Messages.getString("Conspicuity"), SwingConstants.CENTER); conLabel.setBounds(new Rectangle(250, 80, 100, 20)); this.add(conLabel, null); conBox = new JComboBox(); conBox.setBounds(new Rectangle(250, 100, 100, 20)); - addConItem(Messages.getString("NotSet"), Con.UNKNOWN); + addConItem("", Con.UNKNOWN); addConItem(Messages.getString("Conspicuous"), Con.CONSP); addConItem(Messages.getString("NotConspicuous"), Con.NCONS); @@ -288,5 +288,5 @@ reflBox = new JComboBox(); reflBox.setBounds(new Rectangle(250, 140, 100, 20)); - addReflItem(Messages.getString("NotSet"), Con.UNKNOWN); + addReflItem("", Con.UNKNOWN); addReflItem(Messages.getString("Conspicuous"), Con.CONSP); addReflItem(Messages.getString("NotConspicuous"), Con.NCONS); Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 27031) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 27032) @@ -91,5 +91,5 @@ this.add(categoryBox, null); categoryBox.addActionListener(alCategoryBox); - addCatItem(Messages.getString("NotSet"), Cat.NONE); + addCatItem("", Cat.NONE); addCatItem(Messages.getString("UKPurpose"), Cat.SPM_UNKN); addCatItem(Messages.getString("Warning"), Cat.SPM_WARN); 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 27031) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27032) @@ -1679,4 +1679,36 @@ if (hasFog()) { dlg.panelMain.fogIcon.setIcon(new ImageIcon(getClass().getResource("/images/Fog_Signal.png"))); + String str = ""; + if (getFogSound() != Fog.UNKNOWN) + switch (getFogSound()) { + case HORN: + str = "Horn"; + break; + case SIREN: + str = "Siren"; + break; + case DIA: + str = "Dia"; + break; + case BELL: + str = "Bell"; + break; + case WHIS: + str = "Whis"; + break; + case GONG: + str = "Gong"; + break; + case EXPLOS: + str = "Explos"; + break; + } + if (!getFogGroup().isEmpty()) + str += ("(" + getFogGroup() + ")"); + else + str += " "; + if (!getFogPeriod().isEmpty()) + str += getFogPeriod() + "s"; + dlg.panelMain.fogLabel.setText(str); } @@ -1808,5 +1840,8 @@ if (hasFog()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal", FogSTR.get(getFogSound()))); + if (getFogSound() == Fog.UNKNOWN) + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal", "yes")); + else + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal:category", FogSTR.get(getFogSound()))); if (!getFogGroup().isEmpty()) { Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal:group", getFogGroup()));