Changeset 26556 in osm for applications/editors/josm/plugins/smed

Timestamp:

2011-08-22T16:15:42+02:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• images/Cairn.png (added)
• images/CairnButton.png (added)
• images/CairnButton.svg (added)
• oseam/panels/PanelHaz.java (modified) (5 diffs)
• oseam/panels/PanelMain.java (modified) (5 diffs)
• oseam/panels/PanelSpec.java (modified) (4 diffs)
• oseam/seamarks/SeaMark.java (modified) (1 diff)

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

@@ -41 +41 @@
                                 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 +52 @@
                                 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 +64 @@
                                 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 +76 @@
                                 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 +83 @@
                         }
                         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 {

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

@@ -31 +31 @@
         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 +59 @@
                 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 +139 @@
                                 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 +153 @@
                                 }
                                 if (lightsButton.isSelected()) {
-                                        fogButton.setEnabled(true);
-                                        radButton.setEnabled(true);
                                         litButton.setEnabled(true);
                                         litButton.doClick();
@@ -249 +247 @@
                 };
                 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();
+                
         }
 

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

@@ -18 +18 @@
 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 +34 @@
         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<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
         public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(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 +46 @@
                                         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 +74 @@
                 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);
         }
 

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

@@ -845 +845 @@
                         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: