Changeset 29491 in osm for applications/editors/josm/plugins/smed/plugs

Timestamp:

2013-04-09T18:25:26+02:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src

Files:

• images/AISButton.png (added)
• images/AISButton.svg (added)
• oseam/panels/PanelRadar.java (modified) (5 diffs)
• oseam/seamarks/SeaMark.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java

@@ -15 +15 @@
 
         private OSeaMAction dlg;
+        private JToggleButton aisButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/AISButton.png")));
+        private ActionListener alAis = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        if (aisButton.isSelected()) {
+                                radioCatBox.setVisible(true);
+                                aisButton.setBorderPainted(true);
+                        } else {
+                                radioCatBox.setSelectedIndex(0);
+                                radioCatBox.setVisible(false);
+                                aisButton.setBorderPainted(false);
+                        }
+                }
+        };
+        private JComboBox radioCatBox;
+        private EnumMap<Cat, Integer> radioCats = new EnumMap<Cat, Integer>(Cat.class);
+        private ActionListener alRadioCatBox = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        for (Cat cat : radioCats.keySet()) {
+                                int idx = radioCats.get(cat);
+                                if (dlg.node != null && (idx == radioCatBox.getSelectedIndex())) {
+                                        dlg.panelMain.mark.setRadio(cat);
+                                }
+                        }
+                }
+        };
         private ButtonGroup radarButtons = new ButtonGroup();
         public JRadioButton noRadButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png")));
@@ -85 +110 @@
                 add(getRadButton(raconButton, 0, 93, 27, 27, "Racon", Rtb.RACON));
                 add(getRadButton(leadingButton, 0, 123, 27, 27, "LeadingRacon", Rtb.LEADING));
-
+                
                 groupLabel = new JLabel(Messages.getString("Group"), SwingConstants.CENTER);
                 groupLabel.setBounds(new Rectangle(30, 0, 100, 20));
@@ -143 +168 @@
                 add(sector2Box);
                 sector2Box.addFocusListener(flSector2);
+
+                aisButton.setBounds(new Rectangle(270, 3, 27, 27));
+                aisButton.setBorder(BorderFactory.createLoweredBevelBorder());
+                aisButton.setToolTipText("AIS");
+                aisButton.addActionListener(alAis);
+                add(aisButton);
+
+                radioCatBox = new JComboBox();
+                radioCatBox.setBounds(new Rectangle(210, 40, 150, 20));
+                add(radioCatBox);
+                radioCatBox.addActionListener(alRadioCatBox);
+                addROItem("", Cat.NOROS);
+                addROItem(Messages.getString("CircularBeacon"), Cat.ROS_OMNI);
+                addROItem(Messages.getString("DirectionalBeacon"), Cat.ROS_DIRL);
+                addROItem(Messages.getString("RotatingBeacon"), Cat.ROS_ROTP);
+                addROItem(Messages.getString("ConsolBeacon"), Cat.ROS_CNSL);
+                addROItem(Messages.getString("DirectionFinding"), Cat.ROS_RDF);
+                addROItem(Messages.getString("QTGService"), Cat.ROS_QTG);
+                addROItem(Messages.getString("AeronaticalBeacon"), Cat.ROS_AERO);
+                addROItem(Messages.getString("Decca"), Cat.ROS_DECA);
+                addROItem(Messages.getString("LoranC"), Cat.ROS_LORN);
+                addROItem(Messages.getString("DGPS"), Cat.ROS_DGPS);
+                addROItem(Messages.getString("Toran"), Cat.ROS_TORN);
+                addROItem(Messages.getString("Omega"), Cat.ROS_OMGA);
+                addROItem(Messages.getString("Syledis"), Cat.ROS_SYLD);
+                addROItem(Messages.getString("Chiaka"), Cat.ROS_CHKA);
+                addROItem(Messages.getString("PublicCommunication"), Cat.ROS_PCOM);
+                addROItem(Messages.getString("CommercialBroadcast"), Cat.ROS_COMB);
+                addROItem(Messages.getString("Facsimile"), Cat.ROS_FACS);
+                addROItem(Messages.getString("TimeSignal"), Cat.ROS_TIME);
+                addROItem(Messages.getString("AIS"), Cat.ROS_PAIS);
+                addROItem(Messages.getString("S-AIS"), Cat.ROS_SAIS);
+                radioCatBox.setVisible(false);
         }
 
@@ -169 +227 @@
                 sector1Box.setText(dlg.panelMain.mark.getRaconSector1());
                 sector2Box.setText(dlg.panelMain.mark.getRaconSector2());
+                aisButton.setSelected(dlg.panelMain.mark.getRadio() != Cat.NOROS);
+                aisButton.setBorderPainted(aisButton.isSelected());
+                radioCatBox.setVisible(dlg.panelMain.mark.getRadio() != Cat.NOROS);
         }
 
@@ -181 +242 @@
         }
 
+        private void addROItem(String str, Cat cat) {
+                radioCats.put(cat, radioCatBox.getItemCount());
+                radioCatBox.addItem(str);
+        }
 }

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -348 +348 @@
                 CatSTR.put(Cat.ROS_OMGA, "omega");
                 CatSTR.put(Cat.ROS_SYLD, "syledis");
-                CatSTR.put(Cat.ROS_CHKA, "chaika");
+                CatSTR.put(Cat.ROS_CHKA, "chiaka");
                 CatSTR.put(Cat.ROS_PCOM, "public_communication");
                 CatSTR.put(Cat.ROS_COMB, "commercial_broadcast");
@@ -2572 +2572 @@
                         }
                 }
+
+                if (RoType != Cat.NOROS) {
+                        g2.drawImage(new ImageIcon(getClass().getResource("/images/Radar_Station.png")).getImage(), 7, -15, null);
+                        g2.drawString("AIS", 0, 30);
+                }
         }