Changeset 24919 in osm for applications/editors/josm

Timestamp:

2010-12-30T19:51:16+01:00 (14 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• images/CircleDayButton.png (added)
• images/beacon_black;red;black.png (modified) ( previous)
• images/beacon_black;yellow.png (modified) ( previous)
• images/beacon_black;yellow;black.png (modified) ( previous)
• images/beacon_yellow;black.png (modified) ( previous)
• images/beacon_yellow;black;yellow.png (modified) ( previous)
• images/day_vh_board.png (added)
• images/day_vh_circle.png (added)
• images/day_vh_diamond.png (added)
• images/day_vh_square.png (added)
• images/day_vh_triangle, point down.png (added)
• images/day_vh_triangle, point up.png (added)
• images/float_black;red;black.png (modified) ( previous)
• images/float_black;yellow.png (modified) ( previous)
• images/float_black;yellow;black.png (modified) ( previous)
• images/float_yellow;black.png (modified) ( previous)
• images/float_yellow;black;yellow.png (modified) ( previous)
• images/pillar_black;red;black.png (modified) ( previous)
• images/pillar_black;yellow.png (modified) ( previous)
• images/pillar_black;yellow;black.png (modified) ( previous)
• images/pillar_yellow;black.png (modified) ( previous)
• images/pillar_yellow;black;yellow.png (modified) ( previous)
• images/spar_black;red;black.png (modified) ( previous)
• images/spar_black;yellow.png (modified) ( previous)
• images/spar_black;yellow;black.png (modified) ( previous)
• images/spar_yellow;black.png (modified) ( previous)
• images/spar_yellow;black;yellow.png (modified) ( previous)
• images/tower_black;red;black.png (modified) ( previous)
• images/tower_black;yellow.png (modified) ( previous)
• images/tower_black;yellow;black.png (modified) ( previous)
• images/tower_yellow;black.png (modified) ( previous)
• images/tower_yellow;black;yellow.png (modified) ( previous)
• oseam/panels/PanelTop.java (modified) (2 diffs)
• oseam/seamarks/SeaMark.java (modified) (4 diffs)

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

@@ -40 +40 @@
         public JRadioButton triangleInvDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TriangleInvDayButton.png")));
         public JRadioButton squareDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SquareDayButton.png")));
+        public JRadioButton circleDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CircleDayButton.png")));
         public JRadioButton mooringTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/MooringTopButton.png")));
         private EnumMap<Top, JRadioButton> tops = new EnumMap<Top, JRadioButton>(Top.class);
@@ -92 +93 @@
                 this.add(getDayButton(triangleInvDayButton, 130, 65, 27, 27, "TriangleInvDayTip", Day.TRIANGLE_INV), null);
                 this.add(getDayButton(squareDayButton, 160, 65, 27, 27, "SquareDayTip", Day.SQUARE), null);
+                this.add(getDayButton(circleDayButton, 160, 95, 27, 27, "CircleDayTip", Day.CIRCLE), null);
                 this.add(getMoorButton(mooringTopButton, 40, 95, 27, 27, "MooringTopTip"), null);
         }

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

@@ -245 +245 @@
 
         public enum Day {
-                NONE, BOARD, DIAMOND, TRIANGLE, TRIANGLE_INV, SQUARE
+                NONE, BOARD, DIAMOND, CIRCLE, TRIANGLE, TRIANGLE_INV, SQUARE
         }
 
@@ -252 +252 @@
                 days.put(Day.BOARD, "board");
                 days.put(Day.DIAMOND, "diamond");
+                days.put(Day.CIRCLE, "circle");
                 days.put(Day.TRIANGLE, "triangle, point up");
                 days.put(Day.TRIANGLE_INV, "triangle, point down");
@@ -673 +674 @@
                 String shpStr = shapes.get(shape);
                 if (shpStr == null)
-                        dlg.panelMain.topIcon.setIcon(null);
+                        dlg.panelMain.shapeIcon.setIcon(null);
                 else {
                         imgStr += shpStr;
@@ -684 +685 @@
                         }
                         imgStr += ".png";
-                        dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(imgStr)));
+                        dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(imgStr)));
+                }
+
+                imgStr = "/images/top_";
+                shpStr = tops.get(topShape);
+                if (shpStr == null)
+                        dlg.panelMain.topIcon.setIcon(null);
+                else {
+                        switch (getShape()) {
+                        case CAN:
+                        case CONE:
+                        case SPHERE:
+                        case BARREL:
+                                imgStr += "il_";
+                                break;
+                        case PILLAR:
+                        case SPAR:
+                                imgStr += "ih_";
+                                break;
+                        case FLOAT:
+                        case SUPER:
+                                imgStr += "vl_";
+                                break;
+                        case BEACON:
+                        case TOWER:
+                                imgStr += "vh_";
+                                break;
+                        default:
+                                imgStr = null;
+                                dlg.panelMain.topIcon.setIcon(null);
+                                break;
+                        }
+                        if (imgStr != null) {
+                                imgStr += shpStr;
+                                String colStr = colours.get(topColour);
+                                if (colStr != null)
+                                        imgStr += ("_" + colStr);
+                                imgStr += ".png";
+System.out.println(imgStr);
+//                              dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(imgStr)));
+                        }
                 }