Ignore:
Timestamp:
2014-01-19T14:52:39+01:00 (11 years ago)
Author:
malcolmh
Message:

new model structure

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r30033 r30215  
    2121        private static final Symbol Base = new Symbol();
    2222        static {
    23                 Base.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    24                 Base.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-10,-10,20,20)));
    25                 Base.add(new Instr(Prim.LINE, new Line2D.Double(-35,0,-10,0)));
    26                 Base.add(new Instr(Prim.LINE, new Line2D.Double(10,0,35,0)));
     23                Base.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     24                Base.add(new Instr(Form.ELPS, new Ellipse2D.Double(-10,-10,20,20)));
     25                Base.add(new Instr(Form.LINE, new Line2D.Double(-35,0,-10,0)));
     26                Base.add(new Instr(Form.LINE, new Line2D.Double(10,0,35,0)));
    2727        }
    2828       
    2929        public static final Symbol Chimney = new Symbol();
    3030        static {
    31                 Chimney.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    32                 Chimney.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     31                Chimney.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     32                Chimney.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    3333                Path2D.Double p = new Path2D.Double(); p.moveTo(-25.0,0.0); p.lineTo(-10.0,-120.0); p.lineTo(10.0,-120.0); p.lineTo(25.0,0.0);
    3434                p.moveTo(-10.0,-128.0); p.curveTo(-13.0,-147.0,15.0,-159.0,20.0,-148.0);
    3535                p.moveTo(16.0,-152.3); p.curveTo(58.0,-194.0,98.0,-87.0,16.0,-132.0);
    3636                p.moveTo(11.0,-128.0); p.curveTo(13.4,-132.0,20.0,-132.0,20.0,-136.0);
    37                 Chimney.add(new Instr(Prim.PLIN, p));
     37                Chimney.add(new Instr(Form.PLIN, p));
    3838        }
    3939        public static final Symbol Church = new Symbol();
    … …  
    4444                p.lineTo(-50.0,21.0); p.lineTo(-50.0,-21.0); p.lineTo(-48.0,-21.0); p.quadTo(-48.0,-10.0,-37.0,-10.0); p.lineTo(-10.0,-10.0); p.lineTo(-10.0,-37.0);
    4545                p.quadTo(-10.0,-48.0,-21.0,-48.0); p.lineTo(-21.0,-50.0); p.lineTo(21.0,-50.0); p.lineTo(21.0,-48.0); p.quadTo(10.0,-48.0,10.0,-37.0); p.closePath();
    46                 Church.add(new Instr(Prim.PGON, p));
     46                Church.add(new Instr(Form.PGON, p));
    4747        }
    4848        public static final Symbol ChurchTower = new Symbol();
    4949        static {
    50                 ChurchTower.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    51                 ChurchTower.add(new Instr(Prim.RECT, new Rectangle2D.Double(-36,-36,72,72)));
    52                 ChurchTower.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-2,-2,4,4)));
     50                ChurchTower.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     51                ChurchTower.add(new Instr(Form.RECT, new Rectangle2D.Double(-36,-36,72,72)));
     52                ChurchTower.add(new Instr(Form.ELPS, new Ellipse2D.Double(-2,-2,4,4)));
    5353        }
    5454        public static final Symbol Cross = new Symbol();
    5555        static {
    56                 Cross.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    57                 Cross.add(new Instr(Prim.STRK, new BasicStroke(6, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    58                 Cross.add(new Instr(Prim.LINE, new Line2D.Double(0,-10,0,-150)));
    59                 Cross.add(new Instr(Prim.LINE, new Line2D.Double(-30,-115,30,-115)));
     56                Cross.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     57                Cross.add(new Instr(Form.STRK, new BasicStroke(6, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     58                Cross.add(new Instr(Form.LINE, new Line2D.Double(0,-10,0,-150)));
     59                Cross.add(new Instr(Form.LINE, new Line2D.Double(-30,-115,30,-115)));
    6060        }
    6161        public static final Symbol DishAerial = new Symbol();
    6262        static {
    63                 DishAerial.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    64                 DishAerial.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)));
     63                DishAerial.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     64                DishAerial.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)));
    6565                Path2D.Double p = new Path2D.Double(); p.moveTo(-7.8,-6.0); p.lineTo(0.0,-62.0); p.lineTo(7.8,-6.0); p.moveTo(18.0,-109.0); p.lineTo(25.0,-113.0);
    6666                p.moveTo(-9.5,-157.0); p.curveTo(-60.7,-125.5,-16.5,-33.9,44.9,-61.7); p.closePath();
    67                 DishAerial.add(new Instr(Prim.PLIN, p));
     67                DishAerial.add(new Instr(Form.PLIN, p));
    6868        }
    6969        public static final Symbol Dome = new Symbol();
    7070        static {
    71                 Dome.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    72                 Dome.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-36,-36,72,72)));
    73                 Dome.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-4,-4,8,8)));
     71                Dome.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     72                Dome.add(new Instr(Form.ELPS, new Ellipse2D.Double(-36,-36,72,72)));
     73                Dome.add(new Instr(Form.RSHP, new Ellipse2D.Double(-4,-4,8,8)));
    7474        }
    7575        public static final Symbol Flagstaff = new Symbol();
    7676        static {
    77                 Flagstaff.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    78                 Flagstaff.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     77                Flagstaff.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     78                Flagstaff.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    7979                Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-10.0); p.lineTo(0.0,-150.0); p.moveTo(0.0,-140.0); p.lineTo(40.0,-140.0); p.lineTo(40.0,-100.0); p.lineTo(0.0,-100.0);
    80                 Flagstaff.add(new Instr(Prim.PLIN, p));
     80                Flagstaff.add(new Instr(Form.PLIN, p));
    8181        }
    8282        public static final Symbol FlareStack = new Symbol();
    8383        static {
    84                 FlareStack.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    85                 FlareStack.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     84                FlareStack.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     85                FlareStack.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    8686                Path2D.Double p = new Path2D.Double(); p.moveTo(-7.8,-6.0); p.lineTo(-7.8,-100.0); p.lineTo(7.8,-100.0); p.lineTo(7.8,-6.0);
    87                 FlareStack.add(new Instr(Prim.PLIN, p));
    88                 FlareStack.add(new Instr(Prim.STRK, new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
     87                FlareStack.add(new Instr(Form.PLIN, p));
     88                FlareStack.add(new Instr(Form.STRK, new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    8989                p = new Path2D.Double(); p.moveTo(21.6,-169.6); p.curveTo(-22.0,-132.4,-27.4,-103.5,3.0,-100.0); p.curveTo(39.0,-118.0,-4.0,-141.0,21.6,-169.6);
    90                 FlareStack.add(new Instr(Prim.PLIN, p));
     90                FlareStack.add(new Instr(Form.PLIN, p));
    9191        }
    9292        public static final Symbol LandTower = new Symbol();
    9393        static {
    94                 LandTower.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    95                 LandTower.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    96                 LandTower.add(new Instr(Prim.LINE, new Line2D.Double(-25,0,-15,-120)));
    97                 LandTower.add(new Instr(Prim.LINE, new Line2D.Double(25,0,15,-120)));
    98                 LandTower.add(new Instr(Prim.RECT, new Rectangle2D.Double(-15,-150,30,30)));
     94                LandTower.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     95                LandTower.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     96                LandTower.add(new Instr(Form.LINE, new Line2D.Double(-25,0,-15,-120)));
     97                LandTower.add(new Instr(Form.LINE, new Line2D.Double(25,0,15,-120)));
     98                LandTower.add(new Instr(Form.RECT, new Rectangle2D.Double(-15,-150,30,30)));
    9999        }
    100100        public static final Symbol Mast = new Symbol();
    101101        static {
    102                 Mast.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    103                 Mast.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)));
     102                Mast.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     103                Mast.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)));
    104104                Path2D.Double p = new Path2D.Double(); p.moveTo(-25.0,0.0); p.lineTo(0.0,-150.0); p.lineTo(25.0,0.0);
    105                 Mast.add(new Instr(Prim.PLIN, p));
     105                Mast.add(new Instr(Form.PLIN, p));
    106106        }
    107107        public static final Symbol Monument = new Symbol();
    108108        static {
    109                 Monument.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    110                 Monument.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
    111                 Monument.add(new Instr(Prim.LINE, new Line2D.Double(-25,0,-15,-105)));
    112                 Monument.add(new Instr(Prim.LINE, new Line2D.Double(25,0,15,-105)));
    113                 Monument.add(new Instr(Prim.EARC, new Arc2D.Double(-25.0,-150.0,50.0,50.0,233.0,-285.0,Arc2D.OPEN)));
     109                Monument.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     110                Monument.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
     111                Monument.add(new Instr(Form.LINE, new Line2D.Double(-25,0,-15,-105)));
     112                Monument.add(new Instr(Form.LINE, new Line2D.Double(25,0,15,-105)));
     113                Monument.add(new Instr(Form.EARC, new Arc2D.Double(-25.0,-150.0,50.0,50.0,233.0,-285.0,Arc2D.OPEN)));
    114114        }
    115115        public static final Symbol Platform = new Symbol();
    116116        static {
    117                 Platform.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    118                 Platform.add(new Instr(Prim.RECT, new Rectangle2D.Double(-48,-48,96,96)));
    119                 Platform.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-4,-4,8,8)));
     117                Platform.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     118                Platform.add(new Instr(Form.RECT, new Rectangle2D.Double(-48,-48,96,96)));
     119                Platform.add(new Instr(Form.RSHP, new Ellipse2D.Double(-4,-4,8,8)));
    120120        }
    121121        public static final Symbol RadioTV = new Symbol();
    122122        static {
    123                 RadioTV.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL)));
    124                 RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,45.0,-90.0,Arc2D.OPEN)));
    125                 RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,45.0,-90.0,Arc2D.OPEN)));
    126                 RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,225.0,-90.0,Arc2D.OPEN)));
    127                 RadioTV.add(new Instr(Prim.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,225.0,-90.0,Arc2D.OPEN)));
     123                RadioTV.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL)));
     124                RadioTV.add(new Instr(Form.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,45.0,-90.0,Arc2D.OPEN)));
     125                RadioTV.add(new Instr(Form.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,45.0,-90.0,Arc2D.OPEN)));
     126                RadioTV.add(new Instr(Form.EARC, new Arc2D.Double(-30.0,-180.0,60.0,60.0,225.0,-90.0,Arc2D.OPEN)));
     127                RadioTV.add(new Instr(Form.EARC, new Arc2D.Double(-45.0,-195.0,90.0,90.0,225.0,-90.0,Arc2D.OPEN)));
    128128        }
    129129        public static final Symbol Spire = new Symbol();
    130130        static {
    131                 Spire.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    132                 Spire.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-25,-25,50,50)));
    133                 Spire.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-4,-4,8,8)));
     131                Spire.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     132                Spire.add(new Instr(Form.ELPS, new Ellipse2D.Double(-25,-25,50,50)));
     133                Spire.add(new Instr(Form.RSHP, new Ellipse2D.Double(-4,-4,8,8)));
    134134        }
    135135        public static final Symbol Minaret = new Symbol();
    136136        static {
    137                 Minaret.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Spire, 1.0, 0, 0, null, null)));
    138                 Minaret.add(new Instr(Prim.STRK, new BasicStroke(6, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    139                 Minaret.add(new Instr(Prim.LINE, new Line2D.Double(0,-25,0,-50)));
    140                 Minaret.add(new Instr(Prim.STRK, new BasicStroke(6, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
    141                 Minaret.add(new Instr(Prim.EARC, new Arc2D.Double(-40.0,-110.0,80.0,60.0,180.0,180.0,Arc2D.OPEN)));
     137                Minaret.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Spire, 1.0, 0, 0, null, null)));
     138                Minaret.add(new Instr(Form.STRK, new BasicStroke(6, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     139                Minaret.add(new Instr(Form.LINE, new Line2D.Double(0,-25,0,-50)));
     140                Minaret.add(new Instr(Form.STRK, new BasicStroke(6, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
     141                Minaret.add(new Instr(Form.EARC, new Arc2D.Double(-40.0,-110.0,80.0,60.0,180.0,180.0,Arc2D.OPEN)));
    142142        }
    143143        public static final Symbol Temple = new Symbol();
    144144        static {
    145                 Temple.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    146                 Temple.add(new Instr(Prim.RECT, new Rectangle2D.Double(-25,-15,50,30)));
    147                 Temple.add(new Instr(Prim.STRK, new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    148                 Temple.add(new Instr(Prim.LINE, new Line2D.Double(-35,-21,35,21)));
    149                 Temple.add(new Instr(Prim.LINE, new Line2D.Double(-35,21,35,-21)));
     145                Temple.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     146                Temple.add(new Instr(Form.RECT, new Rectangle2D.Double(-25,-15,50,30)));
     147                Temple.add(new Instr(Form.STRK, new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     148                Temple.add(new Instr(Form.LINE, new Line2D.Double(-35,-21,35,21)));
     149                Temple.add(new Instr(Form.LINE, new Line2D.Double(-35,21,35,-21)));
    150150        }
    151151        public static final Symbol WaterTower = new Symbol();
    152152        static {
    153                 WaterTower.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    154                 WaterTower.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    155                 WaterTower.add(new Instr(Prim.LINE, new Line2D.Double(-25,0,-15,-120)));
    156                 WaterTower.add(new Instr(Prim.LINE, new Line2D.Double(25,0,15,-120)));
    157                 WaterTower.add(new Instr(Prim.RECT, new Rectangle2D.Double(-25,-150,50,30)));
     153                WaterTower.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     154                WaterTower.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     155                WaterTower.add(new Instr(Form.LINE, new Line2D.Double(-25,0,-15,-120)));
     156                WaterTower.add(new Instr(Form.LINE, new Line2D.Double(25,0,15,-120)));
     157                WaterTower.add(new Instr(Form.RECT, new Rectangle2D.Double(-25,-150,50,30)));
    158158        }
    159159        public static final Symbol WindMotor = new Symbol();
    160160        static {
    161                 WindMotor.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    162                 WindMotor.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
    163                 WindMotor.add(new Instr(Prim.LINE, new Line2D.Double(0,-10,0,-90)));
    164                 WindMotor.add(new Instr(Prim.LINE, new Line2D.Double(0,-90,30,-90)));
    165                 WindMotor.add(new Instr(Prim.LINE, new Line2D.Double(0,-90,-14,-116.6)));
    166                 WindMotor.add(new Instr(Prim.LINE, new Line2D.Double(0,-90,-14.3,-66.7)));
     161                WindMotor.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     162                WindMotor.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
     163                WindMotor.add(new Instr(Form.LINE, new Line2D.Double(0,-10,0,-90)));
     164                WindMotor.add(new Instr(Form.LINE, new Line2D.Double(0,-90,30,-90)));
     165                WindMotor.add(new Instr(Form.LINE, new Line2D.Double(0,-90,-14,-116.6)));
     166                WindMotor.add(new Instr(Form.LINE, new Line2D.Double(0,-90,-14.3,-66.7)));
    167167        }
    168168        public static final Symbol Windmill = new Symbol();
    169169        static {
    170                 Windmill.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    171                 Windmill.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-12,-12,24,24)));
    172                 Windmill.add(new Instr(Prim.LINE, new Line2D.Double(-30,-42,30,10)));
    173                 Windmill.add(new Instr(Prim.LINE, new Line2D.Double(-30,10,30,-42)));
     170                Windmill.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
     171                Windmill.add(new Instr(Form.ELPS, new Ellipse2D.Double(-12,-12,24,24)));
     172                Windmill.add(new Instr(Form.LINE, new Line2D.Double(-30,-42,30,10)));
     173                Windmill.add(new Instr(Form.LINE, new Line2D.Double(-30,10,30,-42)));
    174174        }
    175175        public static final Symbol Windsock = new Symbol();
    176176        static {
    177                 Windsock.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
    178                 Windsock.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
    179                 Windsock.add(new Instr(Prim.LINE, new Line2D.Double(0,-10,0,-100)));
    180                 Windsock.add(new Instr(Prim.STRK, new BasicStroke(8, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
    181                 Windsock.add(new Instr(Prim.LINE, new Line2D.Double(0,-100,0,-150)));
    182                 Windsock.add(new Instr(Prim.STRK, new BasicStroke(2, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)));
     177                Windsock.add(new Instr(Form.SYMB, new Symbols.SubSymbol(Landmarks.Base, 1.0, 0, 0, null, null)));
     178                Windsock.add(new Instr(Form.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
     179                Windsock.add(new Instr(Form.LINE, new Line2D.Double(0,-10,0,-100)));
     180                Windsock.add(new Instr(Form.STRK, new BasicStroke(8, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
     181                Windsock.add(new Instr(Form.LINE, new Line2D.Double(0,-100,0,-150)));
     182                Windsock.add(new Instr(Form.STRK, new BasicStroke(2, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)));
    183183                Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-100.0); p.lineTo(10.0,-100.0); p.lineTo(10.0,-150.0); p.lineTo(0.0,-150.0);
    184184                p.moveTo(10.0,-150.0); p.lineTo(50.0,-145.0); p.lineTo(120.0,-70.0); p.quadTo(120.0,-55.0,105.0,-55.0);
    185185                p.lineTo(55,-95); p.lineTo(40,-102); p.lineTo(10,-100); p.moveTo(40,-102); p.lineTo(50,-120); p.moveTo(55,-95); p.lineTo(75,-97);
    186                 Windsock.add(new Instr(Prim.PLIN, p));
     186                Windsock.add(new Instr(Form.PLIN, p));
    187187        }
    188188       
Note: See TracChangeset for help on using the changeset viewer.