Changeset 31044 in osm for applications/editors/josm/plugins/seachart/src/symbols

Timestamp:

2015-03-03T17:08:26+01:00 (10 years ago)

Author:

malcolmh

Message:

[seachart]update & tidy directories

Location:

applications/editors/josm/plugins/seachart/src/symbols

Files:

• Areas.java (modified) (1 diff)
• Harbours.java (modified) (8 diffs)
• Symbols.java (modified) (1 diff)

applications/editors/josm/plugins/seachart/src/symbols/Areas.java

@@ -53 +53 @@
                 LaneArrow.add(new Instr(Form.BBOX, new Rectangle2D.Double(-20,-240,40,240)));
                 LaneArrow.add(new Instr(Form.STRK, new BasicStroke(10, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
-                LaneArrow.add(new Instr(Form.FILL, new Color(0x80c480ff, true)));
+                LaneArrow.add(new Instr(Form.FILL, Symbols.Mline));
                 Path2D.Double p = new Path2D.Double(); p.moveTo(15,0); p.lineTo(15,-195); p.lineTo(40,-195);
                 p.lineTo(0,-240); p.lineTo(-40,-195); p.lineTo(-15,-195); p.lineTo(-15,0); p.closePath();

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

@@ -14 +14 @@
 import java.awt.geom.*;
 
-import render.Rules;
 import symbols.Symbols.*;
 
@@ -39 +38 @@
         public static final Symbol Anchorage = new Symbol();
         static {
-                Anchorage.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Anchor, 1.0, 0, 0, new Scheme(Rules.Msymb), null)));
+                Anchorage.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Anchor, 1.0, 0, 0, new Scheme(Symbols.Msymb), null)));
         }
         public static final Symbol Bollard = new Symbol();
@@ -54 +53 @@
                 CallPoint1.add(new Instr(Form.BBOX, new Rectangle2D.Double(-50,-50,100,100)));
                 CallPoint1.add(new Instr(Form.STRK, new BasicStroke(5, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
-                CallPoint1.add(new Instr(Form.FILL, Rules.Msymb));
+                CallPoint1.add(new Instr(Form.FILL, Symbols.Msymb));
                 CallPoint1.add(new Instr(Form.ELPS, new Ellipse2D.Double(-25,-25,50,50)));
                 Path2D.Double p = new Path2D.Double(); p.moveTo(-16.0,-20.0); p.lineTo(0.0,-50.0); p.lineTo(16.0,-20.0);
@@ -95 +94 @@
         static {
                 DistanceU.add(new Instr(Form.STRK, new BasicStroke(3, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
-                DistanceU.add(new Instr(Form.FILL, Rules.Msymb));
+                DistanceU.add(new Instr(Form.FILL, Symbols.Msymb));
                 DistanceU.add(new Instr(Form.ELPS, new Ellipse2D.Double(-11,-11,22,22)));
         }
@@ -121 +120 @@
         static {
                 Fishing.add(new Instr(Form.STRK, new BasicStroke(10, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
-                Fishing.add(new Instr(Form.FILL, Rules.Msymb));
+                Fishing.add(new Instr(Form.FILL, Symbols.Msymb));
                 Fishing.add(new Instr(Form.EARC, new Arc2D.Double(-50,-50,100,100,15,140,Arc2D.OPEN)));
                 Fishing.add(new Instr(Form.EARC, new Arc2D.Double(-50,-50,100,100,-15,-140,Arc2D.OPEN)));
@@ -133 +132 @@
         static {
                 Harbour.add(new Instr(Form.STRK, new BasicStroke(10, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
-                Harbour.add(new Instr(Form.FILL, Rules.Msymb));
+                Harbour.add(new Instr(Form.FILL, Symbols.Msymb));
                 Harbour.add(new Instr(Form.ELPS, new Ellipse2D.Double(-50,-50,100,100)));
-                Harbour.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Anchor, 0.6, 0, 0, new Scheme(Rules.Msymb), null)));
+                Harbour.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Anchor, 0.6, 0, 0, new Scheme(Symbols.Msymb), null)));
         }
         public static final Symbol HarbourMaster = new Symbol();
@@ -155 +154 @@
         public static final Symbol LandingSteps = new Symbol();
         static {
-                LandingSteps.add(new Instr(Form.FILL, Rules.Msymb));
+                LandingSteps.add(new Instr(Form.FILL, Symbols.Msymb));
                 Path2D.Double p = new Path2D.Double(); p.moveTo(-20,-10); p.lineTo(10,20); p.lineTo(20,20); p.lineTo(20,10);
                 p.lineTo(10,10); p.lineTo(10,0); p.lineTo(0,0); p.lineTo(0,-10); p.lineTo(-10,-10); p.lineTo(-10,-20); p.lineTo(-20,-20); p.closePath();
@@ -165 +164 @@
         static {
                 Marina.add(new Instr(Form.STRK, new BasicStroke(10, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
-                Marina.add(new Instr(Form.FILL, Rules.Msymb));
+                Marina.add(new Instr(Form.FILL, Symbols.Msymb));
                 Marina.add(new Instr(Form.EARC, new Arc2D.Double(-50.0,-50.0,100.0,100.0,215.0,-250.0,Arc2D.OPEN)));
-                Marina.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Yacht, 0.6, 0, 0, new Scheme(Rules.Msymb), null)));
+                Marina.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Yacht, 0.6, 0, 0, new Scheme(Symbols.Msymb), null)));
         }
         public static final Symbol MarinaNF = new Symbol();
         static {
-                MarinaNF.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Yacht, 0.6, 0, 0, new Scheme(Rules.Msymb), null)));
+                MarinaNF.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Harbours.Yacht, 0.6, 0, 0, new Scheme(Symbols.Msymb), null)));
         }
         public static final Symbol Pilot = new Symbol();

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

@@ -20 +20 @@
 public class Symbols {
 
+        public static final Color Yland = new Color(0xf1c010);
+        public static final Color Bwater = new Color(0x78acd2);
+        public static final Color Gdries = new Color(0x689868);
+        public static final Color Mline = new Color(0x9a6078);
+        public static final Color Msymb = new Color(0xa30075);
+        
         public enum Form {
                 BBOX, STRK, COLR, FILL, LINE, RECT, RRCT, ELPS, EARC, PLIN, PGON, RSHP, TEXT, SYMB, P1, P2, H2, H3, H4, H5, V2, V3, D2, D3, D4, B1, S2, S3, S4, C2, X2