Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LeadingRaconButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LeadingRaconButton.svg (revision 27031) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LeadingRaconButton.svg (revision 27031) @@ -0,0 +1,3539 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RaconButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RaconButton.svg (revision 27031) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RaconButton.svg (revision 27031) @@ -0,0 +1,3538 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RadarReflectorButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RadarReflectorButton.svg (revision 27031) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RadarReflectorButton.svg (revision 27031) @@ -0,0 +1,3020 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RamarkButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RamarkButton.svg (revision 27031) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RamarkButton.svg (revision 27031) @@ -0,0 +1,3562 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27031) @@ -210,2 +210,10 @@ Painted=Painted +NoRadar=No radar aids +RadarReflector=Radar Reflector +Ramark=Ramark +Racon=Racon +LeadingRacon=Leading Racon +VisibleSector=Visible sector +Start=Start +End=End 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 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27031) @@ -210,2 +210,11 @@ Painted=Painted +NoRadar=No radar aids +RadarReflector=Radar Reflector +Ramark=Ramark +Racon=Racon +LeadingRacon=Leading Racon +VisibleSector=Visible sector +Start=Start +End=End + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 27031) @@ -23,8 +23,8 @@ public JRadioButton whiteButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WhiteButton.png"))); public JRadioButton redButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RedButton.png"))); + public JRadioButton greenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/GreenButton.png"))); + public JRadioButton yellowButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/YellowButton.png"))); public JRadioButton orangeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OrangeButton.png"))); public JRadioButton amberButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/AmberButton.png"))); - public JRadioButton yellowButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/YellowButton.png"))); - public JRadioButton greenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/GreenButton.png"))); public JRadioButton blueButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlueButton.png"))); public JRadioButton violetButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/VioletButton.png"))); 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 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27031) @@ -110,5 +110,7 @@ } else { dlg.mark.setSectored(false); - panelSector.setVisible(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 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27031) @@ -27,5 +27,7 @@ public JLabel topIcon = null; public JLabel radarIcon = null; + public JLabel radarLabel = null; public JLabel fogIcon = null; + public JLabel fogLabel = null; public JLabel colLabel = null; public JLabel nameLabel = null; @@ -208,4 +210,10 @@ fogIcon.setBounds(new Rectangle(235, 0, 150, 185)); this.add(fogIcon, null); + radarLabel = new JLabel("", SwingConstants.RIGHT); + radarLabel.setBounds(new Rectangle(210, 35, 100, 20)); + this.add(radarLabel, null); + fogLabel = new JLabel("", SwingConstants.RIGHT); + fogLabel.setBounds(new Rectangle(210, 60, 100, 20)); + this.add(fogLabel, null); colLabel = new JLabel("", SwingConstants.CENTER); colLabel.setBounds(new Rectangle(235, 100, 150, 20)); @@ -284,4 +292,6 @@ panelLights.setVisible(false); panelMore.setVisible(false); + radarLabel.setText(""); + fogLabel.setText(""); colLabel.setText(""); shapeIcon.setIcon(null); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java (revision 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java (revision 27031) @@ -17,8 +17,8 @@ private ButtonGroup radarButtons = new ButtonGroup(); public JRadioButton noRadButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton reflButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton raconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton ramarkButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton leadingButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); + public JRadioButton reflButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RadarReflectorButton.png"))); + public JRadioButton ramarkButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RamarkButton.png"))); + public JRadioButton raconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RaconButton.png"))); + public JRadioButton leadingButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LeadingRaconButton.png"))); private EnumMap rads = new EnumMap(Rtb.class); private ActionListener alRad = new ActionListener() { @@ -27,9 +27,8 @@ JRadioButton button = rads.get(rtb); if (button.isSelected()) { - dlg.mark.setRaType(rtb); - button.setBorderPainted(true); - } else - button.setBorderPainted(false); + dlg.mark.setRadar(rtb); + } } + syncPanel(); dlg.mark.paintSign(); } @@ -40,4 +39,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { dlg.mark.setRaconGroup(groupBox.getText()); + dlg.mark.paintSign(); } }; @@ -47,4 +47,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { dlg.mark.setRaconPeriod(periodBox.getText()); + dlg.mark.paintSign(); } }; @@ -54,4 +55,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { dlg.mark.setRaconSequence(seqBox.getText()); + dlg.mark.paintSign(); } }; @@ -61,4 +63,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { dlg.mark.setRaconRange(rangeBox.getText()); + dlg.mark.paintSign(); } }; @@ -67,5 +70,5 @@ private ActionListener alSector1 = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - dlg.mark.setRaconSector1(rangeBox.getText()); + dlg.mark.setRaconSector1(sector1Box.getText()); } }; @@ -74,7 +77,8 @@ private ActionListener alSector2 = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - dlg.mark.setRaconSector2(rangeBox.getText()); + dlg.mark.setRaconSector2(sector2Box.getText()); } }; + public JLabel sectorsLabel; public PanelRadar(OSeaMAction dia) { @@ -83,64 +87,78 @@ this.add(getRadButton(noRadButton, 0, 3, 27, 27, "NoRadar", Rtb.NONE), null); this.add(getRadButton(reflButton, 0, 33, 27, 27, "RadarReflector", Rtb.REFLECTOR), null); - this.add(getRadButton(raconButton, 0, 63, 27, 27, "Racon", Rtb.RACON), null); - this.add(getRadButton(ramarkButton, 0, 93, 27, 27, "Ramark", Rtb.RAMARK), null); - this.add(getRadButton(leadingButton, 0, 123, 27, 27, "LeadingBeacon", Rtb.LEADING), null); + this.add(getRadButton(ramarkButton, 0, 63, 27, 27, "Ramark", Rtb.RAMARK), null); + this.add(getRadButton(raconButton, 0, 93, 27, 27, "Racon", Rtb.RACON), null); + this.add(getRadButton(leadingButton, 0, 123, 27, 27, "LeadingRacon", Rtb.LEADING), null); groupLabel = new JLabel(Messages.getString("Group"), SwingConstants.CENTER); - groupLabel.setBounds(new Rectangle(75, 0, 100, 20)); + groupLabel.setBounds(new Rectangle(30, 0, 100, 20)); this.add(groupLabel, null); groupBox = new JTextField(); - groupBox.setBounds(new Rectangle(100, 20, 50, 20)); + groupBox.setBounds(new Rectangle(55, 20, 50, 20)); this.add(groupBox, null); groupBox.addActionListener(alGroup); periodLabel = new JLabel(Messages.getString("Period"), SwingConstants.CENTER); - periodLabel.setBounds(new Rectangle(75, 40, 100, 20)); + periodLabel.setBounds(new Rectangle(130, 0, 100, 20)); this.add(periodLabel, null); periodBox = new JTextField(); - periodBox.setBounds(new Rectangle(100, 60, 50, 20)); + periodBox.setBounds(new Rectangle(155, 20, 50, 20)); this.add(periodBox, null); periodBox.addActionListener(alPeriod); seqLabel = new JLabel(Messages.getString("Sequence"), SwingConstants.CENTER); - seqLabel.setBounds(new Rectangle(75, 80, 100, 20)); + seqLabel.setBounds(new Rectangle(30, 40, 100, 20)); this.add(seqLabel, null); seqBox = new JTextField(); - seqBox.setBounds(new Rectangle(100, 100, 50, 20)); + seqBox.setBounds(new Rectangle(55, 60, 50, 20)); this.add(seqBox, null); seqBox.addActionListener(alSeq); rangeLabel = new JLabel(Messages.getString("Range"), SwingConstants.CENTER); - rangeLabel.setBounds(new Rectangle(75, 120, 100, 20)); + rangeLabel.setBounds(new Rectangle(130, 40, 100, 20)); this.add(rangeLabel, null); rangeBox = new JTextField(); - rangeBox.setBounds(new Rectangle(100, 140, 50, 20)); + rangeBox.setBounds(new Rectangle(155, 60, 50, 20)); this.add(rangeBox, null); rangeBox.addActionListener(alRange); + + sectorsLabel = new JLabel(Messages.getString("VisibleSector"), SwingConstants.CENTER); + sectorsLabel.setBounds(new Rectangle(75, 85, 100, 20)); + this.add(sectorsLabel, null); - sector1Label = new JLabel(Messages.getString("SectorStart"), SwingConstants.CENTER); - sector1Label.setBounds(new Rectangle(175, 40, 100, 20)); + sector1Label = new JLabel(Messages.getString("Start"), SwingConstants.CENTER); + sector1Label.setBounds(new Rectangle(30, 100, 100, 20)); this.add(sector1Label, null); sector1Box = new JTextField(); - sector1Box.setBounds(new Rectangle(200, 60, 50, 20)); + sector1Box.setBounds(new Rectangle(55, 120, 50, 20)); this.add(sector1Box, null); sector1Box.addActionListener(alSector1); - sector2Label = new JLabel(Messages.getString("SectorEnd"), SwingConstants.CENTER); - sector2Label.setBounds(new Rectangle(175, 80, 100, 20)); + sector2Label = new JLabel(Messages.getString("End"), SwingConstants.CENTER); + sector2Label.setBounds(new Rectangle(130, 100, 100, 20)); this.add(sector2Label, null); sector2Box = new JTextField(); - sector2Box.setBounds(new Rectangle(200, 100, 50, 20)); + sector2Box.setBounds(new Rectangle(155, 120, 50, 20)); this.add(sector2Box, null); - sector2Box.addActionListener(alSector1); + sector2Box.addActionListener(alSector2); } public void syncPanel() { + boolean rad = ((dlg.mark.getRadar() != Rtb.NONE) && (dlg.mark.getRadar() != Rtb.REFLECTOR)); + groupLabel.setVisible(rad); + groupBox.setVisible(rad); + periodLabel.setVisible(rad); + periodBox.setVisible(rad); + seqLabel.setVisible(rad); + seqBox.setVisible(rad); + rangeLabel.setVisible(rad); + rangeBox.setVisible(rad); + sector1Label.setVisible(rad); + sector1Box.setVisible(rad); + sector2Label.setVisible(rad); + sector2Box.setVisible(rad); + sectorsLabel.setVisible(rad); for (Rtb rtb : rads.keySet()) { - JRadioButton button = rads.get(rtb); - if (dlg.mark.getRaType() == rtb) { - button.setBorderPainted(true); - } else - button.setBorderPainted(false); + rads.get(rtb).setBorderPainted(dlg.mark.getRadar() == rtb); } groupBox.setText(dlg.mark.getRaconGroup()); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java (revision 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java (revision 27031) @@ -10,5 +10,4 @@ import oseam.Messages; import oseam.dialogs.OSeaMAction; -import oseam.seamarks.SeaMark; import oseam.seamarks.SeaMark.*; @@ -68,6 +67,6 @@ this.getContentPane().add(panel); - TableColumn col = table.getColumnModel().getColumn(1); - col.setCellRenderer(new ColourCellRenderer()); + table.setDefaultRenderer(String.class, new CentreRenderer()); + table.getColumnModel().getColumn(1).setCellRenderer(new ColourCellRenderer()); TableColumn colColumn = table.getColumnModel().getColumn(1); @@ -140,5 +139,8 @@ switch (col) { case 0: - return row; + if (row == 0) + return "Common"; + else + return row; case 1: return dlg.mark.getLightAtt(Att.COL, row); @@ -212,8 +214,18 @@ } + static class CentreRenderer extends DefaultTableCellRenderer { + public CentreRenderer() { + super(); + setHorizontalAlignment(SwingConstants.CENTER); + } + } + public class ColourCellRenderer extends JLabel implements TableCellRenderer { + public ColourCellRenderer() { + super(); + setHorizontalAlignment(SwingConstants.CENTER); + } public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int rowIndex, int vColIndex) { - setHorizontalAlignment(SwingConstants.CENTER); setIcon(colours.get(value)); return this; 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 27030) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27031) @@ -671,35 +671,30 @@ } - private boolean Radar = false; - - public boolean hasRadar() { - return Radar; - } - - public void setRadar(boolean radar) { - Radar = radar; - } - - private boolean Racon = false; - - public boolean hasRacon() { - return Racon; - } - - public void setRacon(boolean racon) { - Racon = racon; - } - public enum Rtb { NONE, REFLECTOR, RACON, RAMARK, LEADING } + public static final EnumMap RtbSTR = new EnumMap(Rtb.class); + static { + RtbSTR.put(Rtb.RACON, "racon"); + RtbSTR.put(Rtb.RAMARK, "ramark"); + RtbSTR.put(Rtb.LEADING, "leading"); + } + private Rtb RaType = Rtb.NONE; - public Rtb getRaType() { + public boolean hasRadar() { + return (RaType != Rtb.NONE); + } + + public boolean hasRacon() { + return (RaType == Rtb.RACON); + } + + public Rtb getRadar() { return RaType; } - public void setRaType(Rtb type) { + public void setRadar(Rtb type) { RaType = type; } @@ -1394,11 +1389,14 @@ if (paintlock) return; + paintlock = true; dlg.panelMain.shapeIcon.setIcon(null); + dlg.panelMain.colLabel.setText(""); + dlg.panelMain.radarLabel.setText(""); + dlg.panelMain.fogLabel.setText(""); + dlg.panelMain.topIcon.setIcon(null); + dlg.panelMain.fogIcon.setIcon(null); + dlg.panelMain.radarIcon.setIcon(null); dlg.panelMain.lightIcon.setIcon(null); - dlg.panelMain.topIcon.setIcon(null); - dlg.panelMain.radarIcon.setIcon(null); - dlg.panelMain.fogIcon.setIcon(null); - dlg.panelMain.colLabel.setText(""); String colStr; @@ -1682,4 +1680,30 @@ dlg.panelMain.fogIcon.setIcon(new ImageIcon(getClass().getResource("/images/Fog_Signal.png"))); } + + if (hasRadar()) { + if (getRadar() == Rtb.REFLECTOR) { + dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector_355.png"))); + } else { + dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png"))); + String str = ""; + if (getRadar() == Rtb.RAMARK) + str += "Ramark"; + else + str += "Racon"; + if (!getRaconGroup().isEmpty()) + str += ("(" + getRaconGroup() + ")"); + else + str += " "; + if (!getRaconPeriod().isEmpty()) + str += getRaconPeriod() + "s"; + dlg.panelMain.radarLabel.setText(str); + } + } + + if (isFired()) { + dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Magenta_120.png"))); + } + + paintlock = false; } @@ -1798,4 +1822,29 @@ } } + + if (hasRadar()) { + if (getRadar() == Rtb.REFLECTOR) { + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_reflector", "yes")); + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:category", RtbSTR.get(getRadar()))); + if (!getRaconGroup().isEmpty()) { + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:group", getRaconGroup())); + } + if (!getRaconPeriod().isEmpty()) { + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:period", getRaconPeriod())); + } + if (!getRaconSequence().isEmpty()) { + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:sequence", getRaconSequence())); + } + if (!getRaconRange().isEmpty()) { + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:range", getRaconRange())); + } + if ((!getRaconSector1().isEmpty()) && (!getRaconSector2().isEmpty())) { + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:sector_start", getRaconSector1())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:sector_end", getRaconSector2())); + } + } + } + if (!getInfo().isEmpty()) { Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:information", getInfo()));