Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CairnButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CairnButton.svg (revision 26556) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CairnButton.svg (revision 26556) @@ -0,0 +1,4825 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + 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 26555) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26556) @@ -41,10 +41,6 @@ dlg.mark.addColour(Ent.BODY, Col.YELLOW); dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - if (shapes.containsKey(shp)) { + if (shapes.containsKey(shp)) shapes.get(shp).doClick(); - } else { - clearSelections(); - dlg.mark.setShape(Shp.UNKNOWN); - } northButton.setBorderPainted(true); } else { @@ -56,10 +52,6 @@ dlg.mark.addColour(Ent.BODY, Col.BLACK); dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - if (shapes.containsKey(shp)) { + if (shapes.containsKey(shp)) shapes.get(shp).doClick(); - } else { - clearSelections(); - dlg.mark.setShape(Shp.UNKNOWN); - } southButton.setBorderPainted(true); } else { @@ -72,10 +64,6 @@ dlg.mark.addColour(Ent.BODY, Col.BLACK); dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - if (shapes.containsKey(shp)) { + if (shapes.containsKey(shp)) shapes.get(shp).doClick(); - } else { - clearSelections(); - dlg.mark.setShape(Shp.UNKNOWN); - } eastButton.setBorderPainted(true); } else { @@ -88,10 +76,6 @@ dlg.mark.addColour(Ent.BODY, Col.YELLOW); dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - if (shapes.containsKey(shp)) { + if (shapes.containsKey(shp)) shapes.get(shp).doClick(); - } else { - clearSelections(); - dlg.mark.setShape(Shp.UNKNOWN); - } westButton.setBorderPainted(true); } else { @@ -99,14 +83,11 @@ } if (isolButton.isSelected()) { + dlg.mark.setCategory(Cat.UNKNOWN); dlg.mark.setColour(Ent.BODY, Col.BLACK); dlg.mark.addColour(Ent.BODY, Col.RED); dlg.mark.addColour(Ent.BODY, Col.BLACK); dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - if (shapes.containsKey(shp)) { + if (shapes.containsKey(shp)) shapes.get(shp).doClick(); - } else { - clearSelections(); - dlg.mark.setShape(Shp.UNKNOWN); - } isolButton.setBorderPainted(true); } else { 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 26555) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 26556) @@ -31,4 +31,6 @@ private JButton saveButton = null; private ActionListener alSave = null; + private JButton moreButton = null; + private ActionListener alMore = null; public ButtonGroup typeButtons = null; public JRadioButton chanButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ChanButton.png"))); @@ -57,14 +59,14 @@ dlg = dia; panelChan = new PanelChan(dlg); - panelChan.setBounds(new Rectangle(65, 0, 185, 160)); + panelChan.setBounds(new Rectangle(65, 0, 165, 160)); panelChan.setVisible(false); panelHaz = new PanelHaz(dlg); - panelHaz.setBounds(new Rectangle(65, 0, 185, 160)); + panelHaz.setBounds(new Rectangle(65, 0, 165, 160)); panelHaz.setVisible(false); panelSpec = new PanelSpec(dlg); - panelSpec.setBounds(new Rectangle(65, 0, 185, 160)); + panelSpec.setBounds(new Rectangle(65, 0, 165, 160)); panelSpec.setVisible(false); panelLights = new PanelLights(dlg); - panelLights.setBounds(new Rectangle(65, 0, 185, 160)); + panelLights.setBounds(new Rectangle(65, 0, 165, 160)); panelLights.setVisible(false); panelTop = new PanelTop(dlg); @@ -137,12 +139,10 @@ if (specButton.isSelected()) { dlg.panelMain.panelSpec.panelCol.yellowButton.doClick(); - dlg.panelMain.panelTop.enableAll(true); - dlg.panelMain.panelTop.noTopButton.doClick(); - dlg.panelMain.panelTop.panelCol.enableAll(true); - dlg.panelMain.panelTop.panelCol.yellowButton.doClick(); - topButton.setEnabled(true); - fogButton.setEnabled(true); - radButton.setEnabled(true); - litButton.setEnabled(true); + if ((dlg.mark != null) && (dlg.panelMain.panelSpec.shapes.containsKey(dlg.mark.getShape()))) { + dlg.panelMain.panelSpec.shapes.get(dlg.mark.getShape()).doClick(); + } else { + dlg.panelMain.panelSpec.shapeButtons.clearSelection(); + dlg.panelMain.panelSpec.alShape.actionPerformed(null); + } specButton.setBorderPainted(true); panelSpec.setVisible(true); @@ -153,6 +153,4 @@ } if (lightsButton.isSelected()) { - fogButton.setEnabled(true); - radButton.setEnabled(true); litButton.setEnabled(true); litButton.doClick(); @@ -249,5 +247,17 @@ }; saveButton.addActionListener(alSave); + + moreButton = new JButton(); + moreButton.setBounds(new Rectangle(230, 145, 50, 15)); + moreButton.setText("more..."); + this.add(moreButton, null); + alMore = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + } + }; + moreButton.addActionListener(alMore); + this.clearSelections(); + } 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 26555) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 26556) @@ -18,9 +18,10 @@ import oseam.seamarks.SeaMark.Obj; import oseam.seamarks.SeaMark.Ent; +import oseam.seamarks.SeaMark.Col; public class PanelSpec extends JPanel { private OSeaMAction dlg; - private ButtonGroup shapeButtons = new ButtonGroup(); + public ButtonGroup shapeButtons = new ButtonGroup(); public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); @@ -33,8 +34,10 @@ public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); + public JRadioButton stakeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StakeButton.png"))); + public JRadioButton cairnButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CairnButton.png"))); public EnumMap shapes = new EnumMap(Shp.class); public EnumMap objects = new EnumMap(Shp.class); public PanelCol panelCol = null; - private ActionListener alShape = new ActionListener() { + public ActionListener alShape = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { for (Shp shp : shapes.keySet()) { @@ -43,8 +46,12 @@ dlg.mark.setShape(shp); dlg.mark.setObject(objects.get(shp)); + if (button == cairnButton) + panelCol.offButton.doClick(); button.setBorderPainted(true); } else button.setBorderPainted(false); } + if (dlg.mark != null) + dlg.mark.paintSign(); } }; @@ -67,4 +74,6 @@ this.add(getShapeButton(beaconButton, 90, 96, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSPP), null); this.add(getShapeButton(towerButton, 90, 128, 34, 32, "Tower", Shp.TOWER, Obj.BCNSPP), null); + this.add(getShapeButton(stakeButton, 125, 0, 34, 32, "Stake", Shp.STAKE, Obj.BCNSPP), null); + this.add(getShapeButton(cairnButton, 125, 32, 34, 32, "Cairn", Shp.CAIRN, Obj.BCNSPP), null); } 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 26555) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 26556) @@ -845,9 +845,14 @@ imgStr += "Sphere"; break; + case BARREL: + imgStr += "Barrel"; + break; + case CAIRN: + imgStr += "Cairn"; + break; case FLOAT: imgStr += "Float"; break; case BEACON: - case CAIRN: case PILE: case LATTICE: