Changeset 27389 in osm

Timestamp:

2012-01-02T13:52:17+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• images/Dot.png (added)
• images/PlatformButton.png (added)
• images/PlatformButton.svg (added)
• images/Sphere_White_Yellow.png (added)
• images/Sphere_Yellow_Red.png (added)
• oseam/msg/messages.properties (modified) (1 diff)
• oseam/msg/messages_de.properties (modified) (1 diff)
• oseam/msg/messages_en.properties (modified) (1 diff)
• oseam/panels/PanelLights.java (modified) (13 diffs)
• oseam/panels/PanelMain.java (modified) (1 diff)
• oseam/seamarks/SeaMark.java (modified) (10 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties

@@ -278 +278 @@
 SpireMinaret=Spire/Minaret
 
+Oil=Oil
+Production=Production
+Observation=Observation
+ALP=ALP
+SALM=SALM
+MooringTower=Mooring Tower
+ArtificialIsland=Artificial Island
+FPSO=FPSO
+Accommodation=Accommodation
+NCCB=NCCB
+
 NotDecimal=Not a valid decimal string
 TooBig=Maximum value exceeded

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties

@@ -278 +278 @@
 SpireMinaret=Spitzer Turm/Minarett
 
+Oil=Oil
+Production=Production
+Observation=Observation
+ALP=ALP
+SALM=SALM
+MooringTower=Mooring Tower
+ArtificialIsland=Artificial Island
+FPSO=FPSO
+Accommodation=Accommodation
+NCCB=NCCB
+
 NotDecimal=Kein korrekter Dezimalwert
 TooBig=Maximaler Wert überschritten

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties

@@ -278 +278 @@
 SpireMinaret=Spire/Minaret
 
+Oil=Oil
+Production=Production
+Observation=Observation
+ALP=ALP
+SALM=SALM
+MooringTower=Mooring Tower
+ArtificialIsland=Artificial Island
+FPSO=FPSO
+Accommodation=Accommodation
+NCCB=NCCB
+
 NotDecimal=Not a valid decimal string
 TooBig=Maximum value exceeded

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

@@ -51 +51 @@
                                 int idx = warningCats.get(cat);
                                 if (dlg.node != null && (idx == warningCatBox.getSelectedIndex())) {
+                                        dlg.panelMain.mark.setCategory(cat);
+                                        dlg.panelMain.mark.testValid();
+                                }
+                        }
+                }
+        };
+        public JComboBox platformCatBox;
+        public EnumMap<Cat, Integer> platformCats = new EnumMap<Cat, Integer>(Cat.class);
+        private ActionListener alPlatformCatBox = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        for (Cat cat : platformCats.keySet()) {
+                                int idx = platformCats.get(cat);
+                                if (dlg.node != null && (idx == platformCatBox.getSelectedIndex())) {
                                         dlg.panelMain.mark.setCategory(cat);
                                         dlg.panelMain.mark.testValid();
@@ -66 +79 @@
         public JRadioButton trafficButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TrafficButton.png")));
         public JRadioButton warningButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WarningButton.png")));
+        public JRadioButton platformButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PlatformButton.png")));
         public EnumMap<Obj, JRadioButton> objects = new EnumMap<Obj, JRadioButton>(Obj.class);
         private ActionListener alObj = new ActionListener() {
@@ -87 +101 @@
                                 trafficCatBox.setVisible(false);
                                 warningCatBox.setVisible(false);
+                                platformCatBox.setVisible(false);
                                 alLandCatBox.actionPerformed(null);
                         } else if (trafficButton.isSelected()) {
@@ -93 +108 @@
                                 landCatBox.setVisible(false);
                                 warningCatBox.setVisible(false);
+                                platformCatBox.setVisible(false);
                                 alTrafficCatBox.actionPerformed(null);
                         } else if (warningButton.isSelected()) {
@@ -99 +115 @@
                                 landCatBox.setVisible(false);
                                 trafficCatBox.setVisible(false);
+                                platformCatBox.setVisible(false);
                                 alWarningCatBox.actionPerformed(null);
+                        } else if (platformButton.isSelected()) {
+                                categoryLabel.setVisible(true);
+                                platformCatBox.setVisible(true);
+                                warningCatBox.setVisible(false);
+                                landCatBox.setVisible(false);
+                                trafficCatBox.setVisible(false);
+                                alPlatformCatBox.actionPerformed(null);
                         } else {
                                 dlg.panelMain.mark.setCategory(Cat.NOCAT);
@@ -106 +130 @@
                                 trafficCatBox.setVisible(false);
                                 warningCatBox.setVisible(false);
+                                platformCatBox.setVisible(false);
                         }
                         dlg.panelMain.mark.testValid();
@@ -115 +140 @@
                 setLayout(null);
                 add(getObjButton(houseButton, 0, 0, 34, 32, "Lighthouse", Obj.LITHSE));
-                add(getObjButton(majorButton, 35, 0, 34, 32, "MajorLight", Obj.LITMAJ));
-                add(getObjButton(minorButton, 70, 0, 34, 32, "MinorLight", Obj.LITMIN));
-                add(getObjButton(landButton, 105, 0, 34, 32, "Landmark", Obj.LNDMRK));
+                add(getObjButton(majorButton, 34, 0, 34, 32, "MajorLight", Obj.LITMAJ));
+                add(getObjButton(minorButton, 68, 0, 34, 32, "MinorLight", Obj.LITMIN));
+                add(getObjButton(landButton, 102, 0, 34, 32, "Landmark", Obj.LNDMRK));
+                add(getObjButton(platformButton, 136, 0, 34, 32, "Platform", Obj.OFSPLF));
                 add(getObjButton(vesselButton, 0, 35, 34, 32, "LightVessel", Obj.LITVES));
-                add(getObjButton(floatButton, 35, 35, 34, 32, "LightFloat", Obj.LITFLT));
-                add(getObjButton(trafficButton, 70, 35, 34, 32, "SSTraffic", Obj.SISTAT));
-                add(getObjButton(warningButton, 105, 35, 34, 32, "SSWarning", Obj.SISTAW));
+                add(getObjButton(floatButton, 34, 35, 34, 32, "LightFloat", Obj.LITFLT));
+                add(getObjButton(trafficButton, 68, 35, 34, 32, "SSTraffic", Obj.SISTAT));
+                add(getObjButton(warningButton, 102, 35, 34, 32, "SSWarning", Obj.SISTAW));
 
                 categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER);
@@ -193 +219 @@
                 warningCatBox.setVisible(false);
 
+                platformCatBox = new JComboBox();
+                platformCatBox.setBounds(new Rectangle(10, 100, 160, 20));
+                add(platformCatBox);
+                platformCatBox.addActionListener(alPlatformCatBox);
+                addPLItem("", Cat.NOCAT);
+                addPLItem(Messages.getString("Oil"), Cat.OFP_OIL);
+                addPLItem(Messages.getString("Production"), Cat.OFP_PRD);
+                addPLItem(Messages.getString("Observation"), Cat.OFP_OBS);
+                addPLItem(Messages.getString("ALP"), Cat.OFP_ALP);
+                addPLItem(Messages.getString("SALM"), Cat.OFP_SALM);
+                addPLItem(Messages.getString("MooringTower"), Cat.OFP_MOR);
+                addPLItem(Messages.getString("ArtificialIsland"), Cat.OFP_ISL);
+                addPLItem(Messages.getString("FPSO"), Cat.OFP_FPSO);
+                addPLItem(Messages.getString("Accommodation"), Cat.OFP_ACC);
+                addPLItem(Messages.getString("NCCB"), Cat.OFP_NCCB);
+                platformCatBox.setVisible(false);
         }
 
@@ -201 +243 @@
                         trafficCatBox.setVisible(false);
                         warningCatBox.setVisible(false);
+                        platformCatBox.setVisible(false);
                         for (Cat cat : landCats.keySet()) {
                                 int item = landCats.get(cat);
@@ -211 +254 @@
                                 landCatBox.setVisible(false);
                                 warningCatBox.setVisible(false);
+                                platformCatBox.setVisible(false);
                                 for (Cat cat : trafficCats.keySet()) {
                                         int item = trafficCats.get(cat);
@@ -221 +265 @@
                         landCatBox.setVisible(false);
                         trafficCatBox.setVisible(false);
+                        platformCatBox.setVisible(false);
                         for (Cat cat : warningCats.keySet()) {
                                 int item = warningCats.get(cat);
                                 if (dlg.panelMain.mark.getCategory() == cat)
                                         warningCatBox.setSelectedIndex(item);
+                        }
+                } else if (dlg.panelMain.mark.getObject() == Obj.OFSPLF) {
+                        categoryLabel.setVisible(true);
+                        platformCatBox.setVisible(true);
+                        landCatBox.setVisible(false);
+                        warningCatBox.setVisible(false);
+                        trafficCatBox.setVisible(false);
+                        for (Cat cat : platformCats.keySet()) {
+                                int item = platformCats.get(cat);
+                                if (dlg.panelMain.mark.getCategory() == cat)
+                                        platformCatBox.setSelectedIndex(item);
                         }
                 } else {
@@ -231 +287 @@
                         trafficCatBox.setVisible(false);
                         warningCatBox.setVisible(false);
+                        platformCatBox.setVisible(false);
                 }
                 for (Obj obj : objects.keySet()) {
@@ -252 +309 @@
                 warningCats.put(cat, warningCatBox.getItemCount());
                 warningCatBox.addItem(str);
+        }
+
+        private void addPLItem(String str, Cat cat) {
+                platformCats.put(cat, platformCatBox.getItemCount());
+                platformCatBox.addItem(str);
         }
 

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

@@ -310 +310 @@
                         case LGT:
                         case SIS:
+                        case PLF:
                                 lightsButton.setBorderPainted(true);
                                 topButton.setEnabled(false);

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

@@ -65 +65 @@
                 FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP,
                 LITMAJ, LITMIN, LITFLT, LITVES, LITHSE, LNDMRK,
-                MORFAC, SISTAW, SISTAT
+                MORFAC, SISTAW, SISTAT, OFSPLF
         }
 
@@ -92 +92 @@
                 ObjSTR.put(Obj.LITHSE, "landmark");
                 ObjSTR.put(Obj.MORFAC, "mooring");
+                ObjSTR.put(Obj.OFSPLF, "platform");
                 ObjSTR.put(Obj.SISTAW, "signal_station_warning");
                 ObjSTR.put(Obj.SISTAT, "signal_station_traffic");
@@ -129 +130 @@
 
         public enum Ent {
-                BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION
+                BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION, PLATFORM
         }
 
@@ -156 +157 @@
                 EntMAP.put(Obj.LNDMRK, Ent.LIGHT);
                 EntMAP.put(Obj.MORFAC, Ent.MOORING);
+                EntMAP.put(Obj.OFSPLF, Ent.PLATFORM);
                 EntMAP.put(Obj.SISTAW, Ent.STATION);
                 EntMAP.put(Obj.SISTAT, Ent.STATION);
@@ -161 +163 @@
 
         public enum Grp {
-                NUL, LAT, CAR, SAW, ISD, SPP, LGT, SIS
+                NUL, LAT, CAR, SAW, ISD, SPP, LGT, SIS, PLF
         }
 
@@ -189 +191 @@
                 GrpMAP.put(Obj.LNDMRK, Grp.LGT);
                 GrpMAP.put(Obj.MORFAC, Grp.SPP);
+                GrpMAP.put(Obj.OFSPLF, Grp.PLF);
                 GrpMAP.put(Obj.SISTAW, Grp.SIS);
                 GrpMAP.put(Obj.SISTAT, Grp.SIS);
@@ -203 +206 @@
                 SIS_TSTM, SIS_TGAG, SIS_TSCL, SIS_DIVE, SIS_LGAG, LIT_DIRF, LIT_LEDG,
                 LMK_CHMY, LMK_CARN, LMK_DSHA, LMK_FLGS, LMK_FLRS, LMK_MNMT, LMK_TOWR, LMK_WNDM, LMK_WTRT,
-                LMK_MAST, LMK_WNDS, LMK_CLMN, LMK_OBLK, LMK_STAT, LMK_CROS, LMK_DOME, LMK_SCNR, LMK_WNDL, LMK_SPIR
+                LMK_MAST, LMK_WNDS, LMK_CLMN, LMK_OBLK, LMK_STAT, LMK_CROS, LMK_DOME, LMK_SCNR, LMK_WNDL, LMK_SPIR,
+                OFP_OIL, OFP_PRD, OFP_OBS, OFP_ALP, OFP_SALM, OFP_MOR, OFP_ISL, OFP_FPSO, OFP_ACC, OFP_NCCB
         }
 
@@ -284 +288 @@
                 CatSTR.put(Cat.LMK_WNDL, "windmill");
                 CatSTR.put(Cat.LMK_SPIR, "spire");
+                CatSTR.put(Cat.OFP_OIL, "oil");
+                CatSTR.put(Cat.OFP_PRD,  "production");
+                CatSTR.put(Cat.OFP_OBS, "observation"); 
+                CatSTR.put(Cat.OFP_ALP, "alp");
+                CatSTR.put(Cat.OFP_SALM, "salm");
+                CatSTR.put(Cat.OFP_MOR, "mooring");
+                CatSTR.put(Cat.OFP_ISL, "island");
+                CatSTR.put(Cat.OFP_FPSO, "fpso");
+                CatSTR.put(Cat.OFP_ACC, "accommodation");
+                CatSTR.put(Cat.OFP_NCCB, "nccb");
         }
 
@@ -1118 +1132 @@
                 case SISTAW:
                 case SISTAT:
+                case OFSPLF:
                         tmp = true;
                         break;
@@ -1875 +1890 @@
                         case SISTAT:
                                 imgStr += "Signal_Station";
+                                break;
+                        case OFSPLF:
+                                imgStr += "Platform";
                                 break;
                         }