Changeset 29134 in osm for applications/editors

Timestamp:

2012-12-28T01:28:06+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/symbols

Files:

• Facilities.java (modified) (1 diff)
• Notices.java (modified) (5 diffs)
• Symbols.java (modified) (4 diffs)

applications/editors/josm/plugins/smed2/src/symbols/Facilities.java

@@ -12 +12 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
+import java.awt.geom.*;
 import java.util.ArrayList;
 

applications/editors/josm/plugins/smed2/src/symbols/Notices.java

@@ -12 +12 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Font;
 import java.awt.Rectangle;
 import java.awt.geom.*;
 import java.util.ArrayList;
 
+import symbols.Symbols.Caption;
 import symbols.Symbols.Delta;
 import symbols.Symbols.Handle;
@@ -53 +55 @@
         private static final ArrayList<Instr> Speedboat = new ArrayList<Instr>();
         private static final ArrayList<Instr> Sport = new ArrayList<Instr>();
+        static {
+                Sport.add(new Instr(Prim.FONT, new Font("Arial", Font.BOLD, 15)));
+                Sport.add(new Instr(Prim.TEXT, new Caption("SPORT", (float)-25.0, (float)5.0)));
+        }
         private static final ArrayList<Instr> Turn = new ArrayList<Instr>();
         static {
@@ -64 +70 @@
         }
         private static final ArrayList<Instr> VHF = new ArrayList<Instr>();
+        static {
+                VHF.add(new Instr(Prim.FONT, new Font("Arial", Font.BOLD, 20)));
+                VHF.add(new Instr(Prim.TEXT, new Caption("VHF", (float)-20.0, (float)-5.0)));
+        }
         private static final ArrayList<Instr> Waterbike = new ArrayList<Instr>();
         private static final ArrayList<Instr> Waterski = new ArrayList<Instr>();
@@ -204 +214 @@
                 NoticeA10b.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA10a, 1.0, 0, 0, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(180.0))), null)));
         }
-        public static final ArrayList<Instr> NoticeA11= new ArrayList<Instr>();
-        static {
-                NoticeA11.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
-                NoticeA11.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Motor, 1.0, 0, 0, null, null)));
+        public static final ArrayList<Instr> NoticeA12= new ArrayList<Instr>();
+        static {
+                NoticeA12.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA12.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Motor, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA13= new ArrayList<Instr>();
+        static {
+                NoticeA13.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA13.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Sport, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA14= new ArrayList<Instr>();
+        static {
+                NoticeA14.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA14.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Waterski, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA15= new ArrayList<Instr>();
+        static {
+                NoticeA15.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA15.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Sailboat, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA16= new ArrayList<Instr>();
+        static {
+                NoticeA16.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA16.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Rowboat, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA17= new ArrayList<Instr>();
+        static {
+                NoticeA17.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA17.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Sailboard, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA18= new ArrayList<Instr>();
+        static {
+                NoticeA18.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA18.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Speedboat, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA19= new ArrayList<Instr>();
+        static {
+                NoticeA19.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA19.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Slipway, 1.0, 0, 0, null, null)));
+        }
+        public static final ArrayList<Instr> NoticeA20= new ArrayList<Instr>();
+        static {
+                NoticeA20.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeA, 1.0, 0, 0, null, null)));
+                NoticeA20.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.Waterbike, 1.0, 0, 0, null, null)));
         }
         public static final ArrayList<Instr> NoticeB2a = new ArrayList<Instr>();
@@ -218 +268 @@
         public static final ArrayList<Instr> NoticeB7 = new ArrayList<Instr>();
         public static final ArrayList<Instr> NoticeB8 = new ArrayList<Instr>();
+        public static final ArrayList<Instr> NoticeB11a = new ArrayList<Instr>();
+        static {
+                NoticeB11a.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.NoticeB, 1.0, 0, 0, null, null)));
+                NoticeB11a.add(new Instr(Prim.SYMB, new Symbols.Symbol(Notices.VHF, 1.0, 0, 0, null, null)));
+        }
         public static final ArrayList<Instr> NoticeC1 = new ArrayList<Instr>();
         public static final ArrayList<Instr> NoticeC2 = new ArrayList<Instr>();

applications/editors/josm/plugins/smed2/src/symbols/Symbols.java

@@ -12 +12 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -23 +24 @@
 
         public enum Prim {
-                BBOX, STRK, COLR, FILL, LINE, RECT, RRCT, ELPS, EARC, PLIN, PGON, RSHP, SYMB, P1, P2, H2, H3, H4, H5, V2, D2, D3, D4, B2, S2, S3, S4, C2, X2
+                BBOX, STRK, COLR, FILL, LINE, RECT, RRCT, ELPS, EARC, PLIN, PGON, RSHP, FONT, TEXT, SYMB, P1, P2, H2, H3, H4, H5, V2, D2, D3, D4, B2, S2, S3, S4, C2, X2
         }
 
@@ -84 +85 @@
         }
 
+        public static class Caption {
+                String str;;
+                float x;
+                float y;
+
+                public Caption(String istr, float ix, float iy) {
+                        str = istr;
+                        x = ix;
+                        y = iy;
+                }
+        }
+
         public static class Symbol {
                 ArrayList<Instr> instr;
@@ -249 +262 @@
                                 drawSymbol(g2, s.instr, s.scale, s.x, s.y, s.delta, s.scheme);
                                 break;
+                        case FONT:
+                                g2.setFont((Font)item.params);
+                                break;
+                        case TEXT:
+                                Caption c = (Caption)item.params;
+                                g2.drawString(c.str, c.x, c.y);
+                                break;
                         }
                 }