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 26571) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 26572) @@ -27,5 +27,5 @@ shp = dlg.mark.getShape(); if (portButton.isSelected()) { - dlg.mark.setCategory(Cat.LAT_PORT); + dlg.mark.setCategory(Cat.LAM_PORT); if (panelPort.shapes.containsKey(shp)) { panelPort.shapes.get(shp).doClick(); @@ -50,5 +50,5 @@ } if (prefPortButton.isSelected()) { - dlg.mark.setCategory(Cat.LAT_PREF_PORT); + dlg.mark.setCategory(Cat.LAM_PPORT); if (panelPort.shapes.containsKey(shp)) { panelPort.shapes.get(shp).doClick(); @@ -72,5 +72,5 @@ } if (stbdButton.isSelected()) { - dlg.mark.setCategory(Cat.LAT_STBD); + dlg.mark.setCategory(Cat.LAM_STBD); if (panelStbd.shapes.containsKey(shp)) { panelStbd.shapes.get(shp).doClick(); @@ -95,5 +95,5 @@ } if (prefStbdButton.isSelected()) { - dlg.mark.setCategory(Cat.LAT_PREF_STBD); + dlg.mark.setCategory(Cat.LAM_PSTBD); if (panelStbd.shapes.containsKey(shp)) { panelStbd.shapes.get(shp).doClick(); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26571) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26572) @@ -25,5 +25,5 @@ shp = dlg.mark.getShape(); if (northButton.isSelected()) { - dlg.mark.setCategory(Cat.CARD_NORTH); + dlg.mark.setCategory(Cat.CAM_NORTH); dlg.mark.setColour(Ent.BODY, Col.BLACK); dlg.mark.addColour(Ent.BODY, Col.YELLOW); @@ -36,5 +36,5 @@ } if (southButton.isSelected()) { - dlg.mark.setCategory(Cat.CARD_SOUTH); + dlg.mark.setCategory(Cat.CAM_SOUTH); dlg.mark.setColour(Ent.BODY, Col.YELLOW); dlg.mark.addColour(Ent.BODY, Col.BLACK); @@ -47,5 +47,5 @@ } if (eastButton.isSelected()) { - dlg.mark.setCategory(Cat.CARD_EAST); + dlg.mark.setCategory(Cat.CAM_EAST); dlg.mark.setColour(Ent.BODY, Col.BLACK); dlg.mark.addColour(Ent.BODY, Col.YELLOW); @@ -59,5 +59,5 @@ } if (westButton.isSelected()) { - dlg.mark.setCategory(Cat.CARD_WEST); + dlg.mark.setCategory(Cat.CAM_WEST); dlg.mark.setColour(Ent.BODY, Col.YELLOW); dlg.mark.addColour(Ent.BODY, Col.BLACK); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 26571) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 26572) @@ -38,5 +38,5 @@ public JRadioButton trafficButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TrafficButton.png"))); public JRadioButton warningButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WarningButton.png"))); - private EnumMap objects = new EnumMap(Obj.class); + public EnumMap objects = new EnumMap(Obj.class); private ActionListener alObj = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -49,4 +49,19 @@ button.setBorderPainted(false); } + if (trafficButton.isSelected()) { + categoryLabel.setVisible(true); + trafficCatBox.setVisible(true); + warningCatBox.setVisible(false); + } else if (warningButton.isSelected()) { + categoryLabel.setVisible(true); + warningCatBox.setVisible(true); + trafficCatBox.setVisible(false); + } else { + categoryLabel.setVisible(false); + trafficCatBox.setVisible(false); + warningCatBox.setVisible(false); + } + if (dlg.mark != null) + dlg.mark.paintSign(); } }; @@ -63,24 +78,30 @@ this.add(getObjButton(warningButton, 90, 35, 34, 32, "SSWarning", Obj.SISTAW), null); - categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER); + categoryLabel = new JLabel(Messages.getString("SSCategory"), SwingConstants.CENTER); categoryLabel.setBounds(new Rectangle(20, 80, 140, 20)); this.add(categoryLabel, null); + categoryLabel.setVisible(false); trafficCatBox = new JComboBox(); - trafficCatBox.setBounds(new Rectangle(20, 110, 140, 20)); + trafficCatBox.setBounds(new Rectangle(20, 100, 140, 20)); this.add(trafficCatBox, null); trafficCatBox.addActionListener(alTrafficCatBox); trafficCatBox.addItem(Messages.getString("NoneSpecified")); + trafficCatBox.addItem(Messages.getString("Lock")); + trafficCatBox.setVisible(false); warningCatBox = new JComboBox(); - warningCatBox.setBounds(new Rectangle(20, 110, 140, 20)); -// this.add(warningCatBox, null); + warningCatBox.setBounds(new Rectangle(20, 100, 140, 20)); + this.add(warningCatBox, null); warningCatBox.addActionListener(alWarningCatBox); warningCatBox.addItem(Messages.getString("NoneSpecified")); + warningCatBox.addItem(Messages.getString("Storm")); + warningCatBox.setVisible(false); } public void clearSelections() { - + objButtons.clearSelection(); + alObj.actionPerformed(null); } 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 26571) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 26572) @@ -156,6 +156,11 @@ } if (lightsButton.isSelected()) { - litButton.setEnabled(true); - litButton.doClick(); + if (dlg.mark != null) { + if (dlg.mark.getObject() == Obj.UNKNOWN) { + panelLights.clearSelections(); + } else { + panelLights.objects.get(dlg.mark.getObject()).doClick(); + } + } lightsButton.setBorderPainted(true); panelLights.setVisible(true); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 26571) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 26572) @@ -23,5 +23,5 @@ dlg.mark.setColour(Ent.BODY, Col.RED); dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAT_PREF_PORT) { + if (dlg.mark.getCategory() == Cat.LAM_PPORT) { dlg.mark.addColour(Ent.BODY, Col.GREEN); dlg.mark.addColour(Ent.BODY, Col.RED); @@ -36,5 +36,5 @@ dlg.mark.setColour(Ent.BODY, Col.GREEN); dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAT_PREF_PORT) { + if (dlg.mark.getCategory() == Cat.LAM_PPORT) { dlg.mark.addColour(Ent.BODY, Col.RED); dlg.mark.addColour(Ent.BODY, Col.GREEN); @@ -47,5 +47,5 @@ if (regionCButton.isSelected()) { dlg.mark.setRegion(Reg.C); - if (dlg.mark.getCategory() == Cat.LAT_PREF_PORT) { + if (dlg.mark.getCategory() == Cat.LAM_PPORT) { dlg.mark.setColour(Ent.BODY, Col.RED); dlg.mark.addColour(Ent.BODY, Col.GREEN); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 26571) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 26572) @@ -23,5 +23,5 @@ dlg.mark.setColour(Ent.BODY, Col.GREEN); dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAT_PREF_STBD) { + if (dlg.mark.getCategory() == Cat.LAM_PSTBD) { dlg.mark.addColour(Ent.BODY, Col.RED); dlg.mark.addColour(Ent.BODY, Col.GREEN); @@ -36,5 +36,5 @@ dlg.mark.setColour(Ent.BODY, Col.RED); dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAT_PREF_STBD) { + if (dlg.mark.getCategory() == Cat.LAM_PSTBD) { dlg.mark.addColour(Ent.BODY, Col.GREEN); dlg.mark.addColour(Ent.BODY, Col.RED); @@ -47,5 +47,5 @@ if (regionCButton.isSelected()) { dlg.mark.setRegion(Reg.C); - if (dlg.mark.getCategory() == Cat.LAT_PREF_STBD) { + if (dlg.mark.getCategory() == Cat.LAM_PSTBD) { dlg.mark.setColour(Ent.BODY, Col.RED); dlg.mark.addColour(Ent.BODY, Col.GREEN); 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 26571) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 26572) @@ -47,6 +47,5 @@ public enum Obj { - UNKNOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP, - LITMAJ, LITMIN, LITFLT, LITVES, LNDMRK, MORFAC, SISTAW, SISTAT + UNKNOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP, LITMAJ, LITMIN, LITFLT, LITVES, LNDMRK, MORFAC, SISTAW, SISTAT } @@ -141,18 +140,18 @@ public enum Cat { - UNKNOWN, LAT_PORT, LAT_STBD, LAT_PREF_PORT, LAT_PREF_STBD, CARD_NORTH, CARD_EAST, CARD_SOUTH, CARD_WEST, MOORING_BUOY + UNKNOWN, LAM_PORT, LAM_STBD, LAM_PPORT, LAM_PSTBD, CAM_NORTH, CAM_EAST, CAM_SOUTH, CAM_WEST, ACH_URST, ACH_DEEP, ACH_TANK, ACH_EXPL, ACH_QUAR, ACH_SPLN, ACH_SCAN, ACH_SCMO, ACH_T24H, ACH_TLIM, SPM_CHBF, SPM_YCHT, MOR_DLPN, MOR_DDPN, MOR_BLRD, MOR_WALL, MOR_POST, MOR_CHWR, MOR_BUOY, SIS_DOCK, SIS_LOCK, SIS_STRM, SIS_TIDE, LIT_DIRF, LIT_LEDG } public static final EnumMap CatSTR = new EnumMap(Cat.class); static { - CatSTR.put(Cat.LAT_PORT, "port"); - CatSTR.put(Cat.LAT_STBD, "starboard"); - CatSTR.put(Cat.LAT_PREF_PORT, "preferred_channel_port"); - CatSTR.put(Cat.LAT_PREF_STBD, "preferred_channel_starboard"); - CatSTR.put(Cat.CARD_NORTH, "north"); - CatSTR.put(Cat.CARD_EAST, "east"); - CatSTR.put(Cat.CARD_SOUTH, "south"); - CatSTR.put(Cat.CARD_WEST, "west"); - CatSTR.put(Cat.MOORING_BUOY, "mooring_buoy"); + CatSTR.put(Cat.LAM_PORT, "port"); + CatSTR.put(Cat.LAM_STBD, "starboard"); + CatSTR.put(Cat.LAM_PPORT, "preferred_channel_port"); + CatSTR.put(Cat.LAM_PSTBD, "preferred_channel_starboard"); + CatSTR.put(Cat.CAM_NORTH, "north"); + CatSTR.put(Cat.CAM_EAST, "east"); + CatSTR.put(Cat.CAM_SOUTH, "south"); + CatSTR.put(Cat.CAM_WEST, "west"); + CatSTR.put(Cat.MOR_BUOY, "buoy"); } @@ -201,5 +200,5 @@ public enum Col { - UNKNOWN, WHITE, RED, ORANGE, AMBER, YELLOW, GREEN, BLUE, VIOLET, BLACK, + UNKNOWN, WHITE, RED, ORANGE, AMBER, YELLOW, GREEN, BLUE, VIOLET, BLACK, GREY, BROWN, MAGENTA, PINK } @@ -215,4 +214,8 @@ ColSTR.put(Col.VIOLET, "violet"); ColSTR.put(Col.BLACK, "black"); + ColSTR.put(Col.GREY, "grey"); + ColSTR.put(Col.BROWN, "brown"); + ColSTR.put(Col.MAGENTA, "magenta"); + ColSTR.put(Col.PINK, "pink"); } @@ -643,5 +646,5 @@ } else if (GrpMAP.get(object) == Grp.LAT) { switch (getCategory()) { - case LAT_PORT: + case LAM_PORT: if (getColour(Ent.BODY, 0) == Col.RED) { if (getColour(Ent.BODY, 1) == Col.WHITE) @@ -653,5 +656,5 @@ setRegion(Reg.B); break; - case LAT_PREF_PORT: + case LAM_PPORT: if (getColour(Ent.BODY, 0) == Col.RED) { if (getColour(Ent.BODY, 3) == Col.GREEN) @@ -663,5 +666,5 @@ setRegion(Reg.B); break; - case LAT_STBD: + case LAM_STBD: if (getColour(Ent.BODY, 0) == Col.GREEN) { if (getColour(Ent.BODY, 1) == Col.WHITE) @@ -673,5 +676,5 @@ setRegion(Reg.B); break; - case LAT_PREF_STBD: + case LAM_PSTBD: if (getColour(Ent.BODY, 0) == Col.GREEN) setRegion(Reg.A); @@ -694,14 +697,14 @@ dlg.panelMain.chanButton.doClick(); switch (getCategory()) { - case LAT_PORT: + case LAM_PORT: dlg.panelMain.panelChan.portButton.doClick(); break; - case LAT_STBD: + case LAM_STBD: dlg.panelMain.panelChan.stbdButton.doClick(); break; - case LAT_PREF_PORT: + case LAM_PPORT: dlg.panelMain.panelChan.prefPortButton.doClick(); break; - case LAT_PREF_STBD: + case LAM_PSTBD: dlg.panelMain.panelChan.prefStbdButton.doClick(); break; @@ -715,14 +718,14 @@ dlg.panelMain.hazButton.doClick(); switch (getCategory()) { - case CARD_NORTH: + case CAM_NORTH: dlg.panelMain.panelHaz.northButton.doClick(); break; - case CARD_SOUTH: + case CAM_SOUTH: dlg.panelMain.panelHaz.southButton.doClick(); break; - case CARD_EAST: + case CAM_EAST: dlg.panelMain.panelHaz.eastButton.doClick(); break; - case CARD_WEST: + case CAM_WEST: dlg.panelMain.panelHaz.westButton.doClick(); break; @@ -737,4 +740,5 @@ break; case LIT: + case SIS: dlg.panelMain.lightsButton.doClick(); break; @@ -810,4 +814,6 @@ } break; + default: + dlg.panelMain.lightsButton.doClick(); } break; @@ -825,95 +831,133 @@ dlg.panelMain.topIcon.setIcon(null); dlg.panelMain.radarIcon.setIcon(null); -dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png"))); dlg.panelMain.fogIcon.setIcon(null); String imgStr = "/images/"; - switch (getShape()) { - case TOWER: - imgStr += "Tower"; - break; - case BUOY: - case PILLAR: - imgStr += "Pillar"; - break; - case SPAR: - imgStr += "Spar"; - break; - case CAN: - imgStr += "Can"; - break; - case CONE: - imgStr += "Cone"; - break; - case SPHERE: - imgStr += "Sphere"; - break; - case BARREL: - imgStr += "Barrel"; - break; - case CAIRN: - imgStr += "Cairn"; - break; - case FLOAT: - imgStr += "Float"; - break; - case BEACON: - case PILE: - case LATTICE: - case BUOYANT: - imgStr += "Beacon"; - break; - case SUPER: - imgStr += "Float_Major"; - break; - case STAKE: - case POLE: - case POST: - imgStr += "Stake"; - break; - } - String colStr = imgStr; - for (Col col : bodyColour) { - switch (col) { - case WHITE: - colStr += "_White"; - break; - case RED: - colStr += "_Red"; - break; - case ORANGE: - colStr += "_Orange"; - break; - case AMBER: - colStr += "_Amber"; - break; - case YELLOW: - colStr += "_Yellow"; - break; - case GREEN: - colStr += "_Green"; - break; - case BLUE: - colStr += "_Blue"; - break; - case VIOLET: - colStr += "_Violet"; - break; - case BLACK: - colStr += "_Black"; - break; - } - } - if (getShape() == Shp.PERCH) { - if (getCategory() == Cat.LAT_PORT) { - colStr = "/images/Perch_Port"; + if (getShape() != Shp.UNKNOWN) { + switch (getShape()) { + case TOWER: + imgStr += "Tower"; + break; + case BUOY: + case PILLAR: + imgStr += "Pillar"; + break; + case SPAR: + imgStr += "Spar"; + break; + case CAN: + imgStr += "Can"; + break; + case CONE: + imgStr += "Cone"; + break; + case SPHERE: + imgStr += "Sphere"; + break; + case BARREL: + imgStr += "Barrel"; + break; + case CAIRN: + imgStr += "Cairn"; + break; + case FLOAT: + imgStr += "Float"; + break; + case BEACON: + case PILE: + case LATTICE: + case BUOYANT: + imgStr += "Beacon"; + break; + case SUPER: + imgStr += "Super"; + break; + case STAKE: + case POLE: + case POST: + imgStr += "Stake"; + break; + } + String colStr = imgStr; + for (Col col : bodyColour) { + switch (col) { + case WHITE: + colStr += "_White"; + break; + case RED: + colStr += "_Red"; + break; + case ORANGE: + colStr += "_Orange"; + break; + case AMBER: + colStr += "_Amber"; + break; + case YELLOW: + colStr += "_Yellow"; + break; + case GREEN: + colStr += "_Green"; + break; + case BLUE: + colStr += "_Blue"; + break; + case VIOLET: + colStr += "_Violet"; + break; + case BLACK: + colStr += "_Black"; + break; + } + } + if (getShape() == Shp.PERCH) { + if (getCategory() == Cat.LAM_PORT) { + colStr = "/images/Perch_Port"; + } else { + colStr = "/images/Perch_Starboard"; + } + } + if (!imgStr.equals("/images/")) { + colStr += ".png"; + if (getClass().getResource(colStr) == null) { + System.out.println("Missing image: " + colStr); + imgStr += ".png"; + if (getClass().getResource(imgStr) == null) { + System.out.println("Missing image: " + imgStr); + return; + } else { + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(imgStr))); + } + } else { + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(colStr))); + } } else { - colStr = "/images/Perch_Starboard"; - } - } - if (!imgStr.equals("/images/")) { - colStr += ".png"; - if (getClass().getResource(colStr) == null) { - System.out.println("Missing image: " + colStr); + dlg.panelMain.shapeIcon.setIcon(null); + } + } else if (getObject() != Obj.UNKNOWN) { + switch (getObject()) { + case LNDMRK: + imgStr += "Light_House"; + break; + case LITMAJ: + imgStr += "Light_Major"; + break; + case LITMIN: + imgStr += "Light_Minor"; + break; + case LITFLT: + imgStr += "Float"; + break; + case LITVES: + imgStr += "Super"; + break; + case SISTAW: + imgStr += "Signal_Station"; + break; + case SISTAT: + imgStr += "Signal_Station"; + break; + } + if (!imgStr.equals("/images/")) { imgStr += ".png"; if (getClass().getResource(imgStr) == null) { @@ -924,8 +968,6 @@ } } else { - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(colStr))); - } - } else { - dlg.panelMain.shapeIcon.setIcon(null); + dlg.panelMain.shapeIcon.setIcon(null); + } } }