Changeset 29199 in osm for applications/editors/josm/plugins/smed2/src/symbols

Timestamp:

2013-01-15T15:08:25+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• Harbours.java (modified) (3 diffs)
• Symbols.java (modified) (1 diff)

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

@@ -71 +71 @@
                 ClearV.add(new Instr(Prim.LINE, new Line2D.Double(-10,25,10,25)));
                 ClearV.add(new Instr(Prim.LINE, new Line2D.Double(0,25,0,15)));
-        }
-        public static final Symbol CoastGStation = new Symbol();
-        static{
-                
         }
         public static final Symbol ContainerCrane = new Symbol();
@@ -149 +145 @@
                 MarinaNF.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Harbours.Yacht, 1.0, 0, 0, null, null)));
         }
+        public static final Symbol Pilot = new Symbol();
+        static{
+                Pilot.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
+                Pilot.add(new Instr(Prim.FILL, new Color(0xd400d4)));
+                Path2D.Double p = new Path2D.Double(); p.moveTo(-15,0); p.lineTo(0,-56); p.lineTo(15,0); p.lineTo(0,56); p.closePath();
+                Pilot.add(new Instr(Prim.PGON, p));
+                Pilot.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-58,-58,116,116)));
+        }
         public static final Symbol PortCrane = new Symbol();
         static {
@@ -161 +165 @@
                 Post.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-10,-10,20,20)));
         }
-        public static final Symbol RescueStation = new Symbol();
+        public static final Symbol Rescue = new Symbol();
         static{
-                
+                Rescue.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
+                Rescue.add(new Instr(Prim.FILL, Color.black));
+                Path2D.Double p = new Path2D.Double(); p.moveTo(-11,0); p.lineTo(0,-43); p.lineTo(11,0); p.lineTo(0,43); p.closePath();
+                Rescue.add(new Instr(Prim.PGON, p));
+                Rescue.add(new Instr(Prim.LINE, new Line2D.Double(-15,0,15,0)));
         }
         public static final Symbol SignalStation = new Symbol();

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

@@ -108 +108 @@
 
         public static class LineStyle {
-                BasicStroke stroke;
-                Color line;
-                Color fill;
-
-                public LineStyle(BasicStroke istroke, Color iline, Color ifill) {
-                        stroke = istroke;
+                public Color line;
+                public float width;
+                public float[] dash;
+                public Color fill;
+
+                public LineStyle(Color iline, float iwidth, float[] idash, Color ifill) {
                         line = iline;
+                        width = iwidth;
+                        dash = idash;
                         fill = ifill;
                 }