Ignore:
Timestamp:
2013-01-10T00:56:38+01:00 (14 years ago)
Author:
malcolmh
Message:

save

Location:
applications/editors/josm/plugins/smed2/src/symbols
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/smed2/src/symbols/Beacons.java

    r29176 r29185  
    1212import java.awt.BasicStroke;
    1313import java.awt.Color;
     14import java.awt.geom.Arc2D;
    1415import java.awt.geom.Ellipse2D;
    1516import java.awt.geom.GeneralPath;
    … …  
    6162                Cairn.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-18,-70,36,36)));
    6263        }
     64        public static final ArrayList<Instr> FogSignal = new ArrayList<Instr>();
     65        static {
     66                FogSignal.add(new Instr(Prim.STRK, new BasicStroke(3.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
     67                FogSignal.add(new Instr(Prim.FILL, Color.black));
     68                FogSignal.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-10,-10,20,20)));
     69                FogSignal.add(new Instr(Prim.STRK, new BasicStroke(10.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
     70                FogSignal.add(new Instr(Prim.FILL, new Color(0xd400d4)));
     71                FogSignal.add(new Instr(Prim.EARC, new Arc2D.Double(-120.0,-120.0,240.0,240.0,190.0,50.0,Arc2D.OPEN)));
     72                FogSignal.add(new Instr(Prim.EARC, new Arc2D.Double(-92.5,-92.5,185.0,185.0,190.0,50.0,Arc2D.OPEN)));
     73                FogSignal.add(new Instr(Prim.EARC, new Arc2D.Double(-65.0,-65.0,130.0,130.0,190.0,50.0,Arc2D.OPEN)));
     74        }
     75        public static final ArrayList<Instr> LightFlare = new ArrayList<Instr>();
     76        static {
     77                LightFlare.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-3,-3,6,6)));
     78                Path2D.Double p = new Path2D.Double();
     79                p.moveTo(0.0,-25.0); p.lineTo(15.0,-95.0); p.curveTo(20.0,-123.0,-20.0,-123.0,-15.0,-95.0);
     80                p.closePath();
     81                LightFlare.add(new Instr(Prim.PGON, p));
     82        }
    6383        public static final ArrayList<Instr> LightMajor = new ArrayList<Instr>();
    6484        static {
    … …  
    95115                PerchStarboard.add(new Instr(Prim.LINE, new Line2D.Double(-25,-40,0,-68.7)));
    96116        }
     117        public static final ArrayList<Instr> RadarStation = new ArrayList<Instr>();
     118        static {
     119                RadarStation.add(new Instr(Prim.STRK, new BasicStroke(2.5f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
     120                RadarStation.add(new Instr(Prim.FILL, new Color(0xd400d4)));
     121                RadarStation.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-125,-125,250,250)));
     122        }
    97123        public static final ArrayList<Instr> Stake = new ArrayList<Instr>();
    98124        static {
    … …  
    111137                p = new Path2D.Double(); p.moveTo(-2.0,-17.5); p.lineTo(-2.0,-35.0); p.lineTo(2.0,-35.0); p.lineTo(2.0,-17.5); p.closePath();
    112138                colours.add(new Instr(Prim.H5, p));
    113     Stake.add(new Instr(Prim.COLR, colours));
     139                Stake.add(new Instr(Prim.COLR, colours));
    114140                Stake.add(new Instr(Prim.FILL, Color.black));
    115141                Stake.add(new Instr(Prim.LINE, new Line2D.Double(-10,0,10,0)));

  • applications/editors/josm/plugins/smed2/src/symbols/Landmarks.java

    r29176 r29185  
    122122                Mast.add(new Instr(Prim.PLIN, p));
    123123        }
    124         public static final ArrayList<Instr> RadioMast = new ArrayList<Instr>();
    125         static {
    126                 RadioMast.add(new Instr(Prim.SYMB, new Symbols.Symbol(Landmarks.Mast, 1.0, 0, 0, null, null)));
    127                 RadioMast.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL)));
    128                 RadioMast.add(new Instr(Prim.FILL, Color.black));
    129                 RadioMast.add(new Instr(Prim.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,45.0,-90.0,Arc2D.OPEN)));
    130                 RadioMast.add(new Instr(Prim.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,45.0,-90.0,Arc2D.OPEN)));
    131                 RadioMast.add(new Instr(Prim.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,225.0,-90.0,Arc2D.OPEN)));
    132                 RadioMast.add(new Instr(Prim.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,225.0,-90.0,Arc2D.OPEN)));
    133         }
    134124        public static final ArrayList<Instr> Monument = new ArrayList<Instr>();
    135125        static {
    … …  
    147137                Platform.add(new Instr(Prim.RECT, new Rectangle2D.Double(-48,-48,96,96)));
    148138                Platform.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-4,-4,8,8)));
     139        }
     140        public static final ArrayList<Instr> RadioTV = new ArrayList<Instr>();
     141        static {
     142                RadioTV.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL)));
     143                RadioTV.add(new Instr(Prim.FILL, Color.black));
     144                RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,45.0,-90.0,Arc2D.OPEN)));
     145                RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,45.0,-90.0,Arc2D.OPEN)));
     146                RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,225.0,-90.0,Arc2D.OPEN)));
     147                RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,225.0,-90.0,Arc2D.OPEN)));
    149148        }
    150149        public static final ArrayList<Instr> Spire = new ArrayList<Instr>();
    … …  
    220219                Shapes.put(CatLMK.LMK_CLMN, Landmarks.Monument); Shapes.put(CatLMK.LMK_MEML, Landmarks.Monument); Shapes.put(CatLMK.LMK_OBLK, Landmarks.Monument);
    221220                Shapes.put(CatLMK.LMK_STAT, Landmarks.Monument); Shapes.put(CatLMK.LMK_CROS, Landmarks.Cross); Shapes.put(CatLMK.LMK_DOME, Landmarks.Dome);
    222                 Shapes.put(CatLMK.LMK_RADR, Landmarks.RadioMast); Shapes.put(CatLMK.LMK_TOWR, Landmarks.LandTower); Shapes.put(CatLMK.LMK_WNDM, Landmarks.Windmill);
     221                Shapes.put(CatLMK.LMK_RADR, Landmarks.Mast); Shapes.put(CatLMK.LMK_TOWR, Landmarks.LandTower); Shapes.put(CatLMK.LMK_WNDM, Landmarks.Windmill);
    223222                Shapes.put(CatLMK.LMK_WNDG, Landmarks.WindMotor); Shapes.put(CatLMK.LMK_SPIR, Landmarks.Spire); Shapes.put(CatLMK.LMK_BLDR, Beacons.Cairn);
    224223                Shapes.put(CatLMK.LMK_MNRT, Landmarks.Minaret); Shapes.put(CatLMK.LMK_WTRT, Landmarks.WaterTower);
    … …  
    229228                Funcs.put(FncFNC.FNC_CHCH, Landmarks.Church); Funcs.put(FncFNC.FNC_CHPL, Landmarks.Church); Funcs.put(FncFNC.FNC_TMPL, Landmarks.Temple);
    230229                Funcs.put(FncFNC.FNC_PGDA, Landmarks.Temple); Funcs.put(FncFNC.FNC_SHSH, Landmarks.Temple); Funcs.put(FncFNC.FNC_BTMP, Landmarks.Temple);
    231                 Funcs.put(FncFNC.FNC_MOSQ, Landmarks.Minaret); Funcs.put(FncFNC.FNC_MRBT, Landmarks.Spire); Funcs.put(FncFNC.FNC_COMM, Landmarks.RadioMast);
    232                 Funcs.put(FncFNC.FNC_TV, Landmarks.RadioMast); Funcs.put(FncFNC.FNC_RADO, Landmarks.RadioMast); Funcs.put(FncFNC.FNC_RADR, Landmarks.RadioMast);
    233                 Funcs.put(FncFNC.FNC_LGHT, Beacons.LightMajor); Funcs.put(FncFNC.FNC_MCWV, Landmarks.RadioMast);
     230                Funcs.put(FncFNC.FNC_MOSQ, Landmarks.Minaret); Funcs.put(FncFNC.FNC_MRBT, Landmarks.Spire); Funcs.put(FncFNC.FNC_COMM, Landmarks.RadioTV);
     231                Funcs.put(FncFNC.FNC_TV, Landmarks.RadioTV); Funcs.put(FncFNC.FNC_RADO, Landmarks.RadioTV); Funcs.put(FncFNC.FNC_RADR, Landmarks.RadioTV);
     232                Funcs.put(FncFNC.FNC_LGHT, Beacons.LightMajor); Funcs.put(FncFNC.FNC_MCWV, Landmarks.RadioTV);
    234233        }
    235234}

  • applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java

    r29126 r29185  
    1313import java.awt.Color;
    1414import java.awt.Rectangle;
     15import java.awt.geom.AffineTransform;
    1516import java.awt.geom.Ellipse2D;
    1617import java.awt.geom.Line2D;
    1718import java.awt.geom.Path2D;
    1819import java.util.ArrayList;
    19 
    20 import symbols.Symbols.Instr;
    21 import symbols.Symbols.Prim;
     20import java.util.EnumMap;
     21
     22import s57.S57val.*;
     23import symbols.Symbols.*;
    2224
    2325public class Topmarks {
    … …  
    226228                TopX.add(new Instr(Prim.PLIN, p));
    227229        }
     230       
     231        public static final EnumMap<BoySHP, Delta> Buoys = new EnumMap<BoySHP, Delta>(BoySHP.class);
     232        static {
     233                Buoys.put(BoySHP.BOY_PILR, new Delta(Handle.BC, new AffineTransform(0.948324, 0.317305, -0.3173047, 0.948324, 31.5, -95.0)));
     234                Buoys.put(BoySHP.BOY_SPAR, new Delta(Handle.BC, new AffineTransform(0.948324, 0.317305, -0.3173047, 0.948324, 31.5, -95.0)));
     235                Buoys.put(BoySHP.BOY_CAN, new Delta(Handle.BC, new AffineTransform(0.948324, 0.317305, -0.3173047, 0.948324, 12.7, -37.9)));
     236                Buoys.put(BoySHP.BOY_CONE, new Delta(Handle.BC, new AffineTransform(0.948324, 0.317305, -0.3173047, 0.948324, 12.7, -37.9)));
     237                Buoys.put(BoySHP.BOY_SPHR, new Delta(Handle.BC, new AffineTransform(0.948324, 0.317305, -0.3173047, 0.948324, 12.7, -37.9)));
     238                Buoys.put(BoySHP.BOY_BARL, new Delta(Handle.BC, new AffineTransform(0.948324, 0.317305, -0.3173047, 0.948324, 12.7, -37.9)));
     239                Buoys.put(BoySHP.BOY_SUPR, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0.0, -42.0)));
     240                Buoys.put(BoySHP.BOY_ICE, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0.0, -25.0)));
     241        }
     242        public static final Delta Floats = new Delta(Handle.BC, AffineTransform.getTranslateInstance(0.0, -70.0));
     243
    228244}
Note: See TracChangeset for help on using the changeset viewer.