Changeset 30029 in osm for applications/editors/josm
- Timestamp:
- 2013-10-26T13:45:17+02:00 (11 years ago)
- Location:
- applications/editors/josm/plugins/smed2/src
- Files:
-
- 7 edited
-
seamap/Renderer.java (modified) (1 diff)
-
seamap/Rules.java (modified) (1 diff)
-
symbols/Areas.java (modified) (7 diffs)
-
symbols/Harbours.java (modified) (5 diffs)
-
symbols/Notices.java (modified) (6 diffs)
-
symbols/Symbols.java (modified) (2 diffs)
-
symbols/Topmarks.java (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed2/src/seamap/Renderer.java
r30028 r30029 330 330 331 331 public static void labelText(Feature feature, String str, Font font, LabelStyle style, Color fg, Color bg, Delta delta) { 332 if (delta == null) delta = new Delta(Handle.CC, null);332 if (delta == null) delta = new Delta(Handle.CC, AffineTransform.getTranslateInstance(0, 0)); 333 333 if (bg == null) bg = new Color(0x00000000, true); 334 if (str == null) str = " "; 335 if (str.isEmpty()) str = " "; 334 if ((str == null) || (str.isEmpty())) str = " "; 336 335 FontRenderContext frc = g2.getFontRenderContext(); 337 GlyphVector gv = font.deriveFont((float)(font.getSize())).createGlyphVector(frc, str.equals(" ") ? " M" : str);336 GlyphVector gv = font.deriveFont((float)(font.getSize())).createGlyphVector(frc, str.equals(" ") ? "!" : str); 338 337 Rectangle2D bounds = gv.getVisualBounds(); 339 338 double width = bounds.getWidth(); 340 339 double height = bounds.getHeight(); 341 if (width < height) width = height;342 double dx = 0;343 double dy = 0;344 switch (delta.h) {345 case CC:346 dx += width / 2.0;347 dy += height / 2.0;348 break;349 case TR:350 dx += width;351 break;352 case TC:353 dx += width / 2.0;354 break;355 case LC:356 dy += height / 2.0;357 break;358 case RC:359 dx += width;360 dy += height / 2.0;361 break;362 case BL:363 dy += height;364 break;365 case BR:366 dx += width;367 dy += height;368 break;369 case BC:370 dx += width / 2.0;371 dy += height;372 break;373 }374 width += (height * 0.8);375 dx += (height * 0.4);376 height *= 1.5;377 dy += (height * 0.15);378 340 Symbol label = new Symbol(); 341 double lx = 0; 342 double ly = 0; 343 double tx = 0; 344 double ty = 0; 379 345 switch (style) { 380 346 case RRCT: 347 width += height * 1.0; 348 height *= 1.5; 349 if (width < height) width = height; 350 lx = -width / 2; 351 ly = -height / 2; 352 tx = lx + (height * 0.34); 353 ty = ly + (height * 0.17); 354 label.add(new Instr(Prim.BBOX, new Rectangle2D.Double(lx,ly,width,height))); 381 355 label.add(new Instr(Prim.FILL, bg)); 382 label.add(new Instr(Prim.RSHP, new RoundRectangle2D.Double( -dx,-dy,width,height,height,height)));356 label.add(new Instr(Prim.RSHP, new RoundRectangle2D.Double(lx,ly,width,height,height,height))); 383 357 label.add(new Instr(Prim.FILL, fg)); 384 358 label.add(new Instr(Prim.STRK, new BasicStroke(1 + (int)(height/10), BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); 385 label.add(new Instr(Prim.RRCT, new RoundRectangle2D.Double( -dx,-dy,width,height,height,height)));359 label.add(new Instr(Prim.RRCT, new RoundRectangle2D.Double(lx,ly,width,height,height,height))); 386 360 break; 387 361 case VCLR: 388 height += 20; 389 dy += 10; 362 width += height * 1.0; 363 height *= 2.0; 364 if (width < height) width = height; 365 lx = -width / 2; 366 ly = -height / 2; 367 tx = lx + (height * 0.27); 368 ty = ly + (height * 0.25); 369 label.add(new Instr(Prim.BBOX, new Rectangle2D.Double(lx,ly,width,height))); 390 370 label.add(new Instr(Prim.FILL, bg)); 391 label.add(new Instr(Prim.RSHP, new RoundRectangle2D.Double( -dx,-dy,width,height,height,height)));371 label.add(new Instr(Prim.RSHP, new RoundRectangle2D.Double(lx,ly,width,height,height,height))); 392 372 label.add(new Instr(Prim.FILL, fg)); 393 373 int sw = 1 + (int)(height/10); 394 double po = dy - (sw / 2);374 double po = sw / 2; 395 375 label.add(new Instr(Prim.STRK, new BasicStroke(sw, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); 396 Path2D.Double p = new Path2D.Double(); p.moveTo(- (height*0.2),po); p.lineTo((height*0.2),po); p.moveTo(0,po); p.lineTo(0,po-10);397 p.moveTo(- (height*0.2),-po); p.lineTo((height*0.2),-po); p.moveTo(0,-po); p.lineTo(0,-po+10);376 Path2D.Double p = new Path2D.Double(); p.moveTo(-height*0.2,-ly-po); p.lineTo(height*0.2,-ly-po); p.moveTo(0,-ly-po); p.lineTo(0,-ly-po-(height*0.15)); 377 p.moveTo(-height*0.2,ly+po); p.lineTo((height*0.2),ly+po); p.moveTo(0,ly+po); p.lineTo(0,ly+po+(height*0.15)); 398 378 label.add(new Instr(Prim.PLIN, p)); 399 379 break; 400 380 } 401 label.add(new Instr(Prim.TEXT, new Caption(str, font, fg, delta)));381 label.add(new Instr(Prim.TEXT, new Caption(str, font, fg, new Delta(Handle.TL, AffineTransform.getTranslateInstance(tx, ty))))); 402 382 Point2D point = context.getPoint(feature.centre); 403 Symbols.drawSymbol(g2, label, sScale, point.getX(), point.getY(), null, null);383 Symbols.drawSymbol(g2, label, sScale, point.getX(), point.getY(), delta, null); 404 384 } 405 385 -
applications/editors/josm/plugins/smed2/src/seamap/Rules.java
r30028 r30029 332 332 if (zoom >= 14) { 333 333 Renderer.symbol(feature, Harbours.Anchorage, null, null, new Scheme(Mline)); 334 Renderer.labelText(feature, name == null ? "" : (String) name.val, new Font("Arial", Font.PLAIN, 30), LabelStyle.RRCT, Mline, Color.white, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 0)));334 Renderer.labelText(feature, name == null ? "" : (String) name.val, new Font("Arial", Font.PLAIN, 30), LabelStyle.RRCT, Mline, Color.white, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 0))); 335 335 } 336 336 double radius = (Double)Renderer.getAttVal(feature, Obj.ACHBRT, 0, Att.RADIUS); -
applications/editors/josm/plugins/smed2/src/symbols/Areas.java
r30023 r30029 19 19 public static final Symbol Plane = new Symbol(); 20 20 static { 21 Plane.add(new Instr(Prim.BBOX, new Rectangle (-60,-60,120,120)));21 Plane.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-60,-60,120,120))); 22 22 Path2D.Double p = new Path2D.Double(); p.moveTo(40,20); p.lineTo(50,10); p.lineTo(27.0,13.3); p.lineTo(23.7,6.8); p.lineTo(40.0,5.0); p.curveTo(55,4,55,-9,40,-10); 23 23 p.quadTo(31,-11,30,-15); p.lineTo(-30,2); p.quadTo(-35,-12,-45,-15); p.quadTo(-56,-3,-50,15); p.lineTo(18.4,7.3); p.lineTo(21.7,14); p.lineTo(-20,20); p.closePath(); … … 26 26 public static final Symbol Cable = new Symbol(); 27 27 static { 28 Cable.add(new Instr(Prim.BBOX, new Rectangle (-30,-60,60,60)));28 Cable.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-60,60,60))); 29 29 Cable.add(new Instr(Prim.STRK, new BasicStroke(8, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND))); 30 30 Cable.add(new Instr(Prim.FILL, new Color(0xc480ff))); … … 34 34 public static final Symbol LaneArrow = new Symbol(); 35 35 static { 36 LaneArrow.add(new Instr(Prim.BBOX, new Rectangle (-20,-240,40,240)));36 LaneArrow.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-20,-240,40,240))); 37 37 LaneArrow.add(new Instr(Prim.STRK, new BasicStroke(10, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER))); 38 38 LaneArrow.add(new Instr(Prim.FILL, new Color(0x80c480ff, true))); … … 43 43 public static final Symbol LineAnchor = new Symbol(); 44 44 static { 45 LineAnchor.add(new Instr(Prim.BBOX, new Rectangle (-30,-60,60,90)));45 LineAnchor.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-60,60,90))); 46 46 LineAnchor.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Harbours.Anchor, 0.5, 0, 0, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(-90.0))), null))); 47 47 } … … 72 72 public static final Symbol Pipeline = new Symbol(); 73 73 static { 74 Pipeline.add(new Instr(Prim.BBOX, new Rectangle (-15,-60,30,60)));74 Pipeline.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-15,-60,30,60))); 75 75 Pipeline.add(new Instr(Prim.STRK, new BasicStroke(8, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND))); 76 76 Pipeline.add(new Instr(Prim.FILL, new Color(0xc480ff))); … … 80 80 public static final Symbol Restricted = new Symbol(); 81 81 static { 82 Restricted.add(new Instr(Prim.BBOX, new Rectangle (-15,-30,30,30)));82 Restricted.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-15,-30,30,30))); 83 83 Restricted.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND))); 84 84 Restricted.add(new Instr(Prim.LINE, new Line2D.Double(0,0,0,-30))); … … 125 125 public static final Symbol Seaplane = new Symbol(); 126 126 static { 127 Seaplane.add(new Instr(Prim.BBOX, new Rectangle (-60,-60,120,120)));127 Seaplane.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-60,-60,120,120))); 128 128 Seaplane.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); 129 129 Seaplane.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-58,-58,116,116))); -
applications/editors/josm/plugins/smed2/src/symbols/Harbours.java
r30024 r30029 12 12 import java.awt.BasicStroke; 13 13 import java.awt.Color; 14 import java.awt.Rectangle;15 14 import java.awt.geom.*; 16 15 … … 20 19 public static final Symbol Anchor = new Symbol(); 21 20 static { 22 Anchor.add(new Instr(Prim.BBOX, new Rectangle (-60,-60,120,120)));21 Anchor.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-60,-60,120,120))); 23 22 Anchor.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); 24 23 Anchor.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-10,-59,20,20))); … … 61 60 public static final Symbol Customs = new Symbol(); 62 61 static { 63 Customs.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));62 Customs.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 64 63 Customs.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER))); 65 64 Customs.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-28,-28,56,56))); … … 97 96 public static final Symbol Explosives = new Symbol(); 98 97 static { 99 Explosives.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));98 Explosives.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 100 99 Explosives.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-5,25,10,10))); 101 100 Explosives.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND))); … … 120 119 public static final Symbol Hospital = new Symbol(); 121 120 static { 122 Hospital.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));121 Hospital.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 123 122 Hospital.add(new Instr(Prim.STRK, new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER))); 124 123 Hospital.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-28,-28,56,56))); -
applications/editors/josm/plugins/smed2/src/symbols/Notices.java
r29992 r30029 13 13 import java.awt.Color; 14 14 import java.awt.Font; 15 import java.awt.Rectangle;16 15 import java.awt.geom.*; 17 16 import java.util.ArrayList; … … 264 263 public static final Symbol NoticeA10a = new Symbol(); 265 264 static { 266 NoticeA10a.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));265 NoticeA10a.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 267 266 NoticeA10a.add(new Instr(Prim.FILL, Color.white)); 268 267 Path2D.Double p = new Path2D.Double(); p.moveTo(0,-30); p.lineTo(30,0); p.lineTo(0,30); p.closePath(); … … 479 478 public static final Symbol NoticeD1a = new Symbol(); 480 479 static { 481 NoticeD1a.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));480 NoticeD1a.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 482 481 NoticeD1a.add(new Instr(Prim.FILL, Color.yellow)); 483 482 Path2D.Double p = new Path2D.Double(); p.moveTo(0,-30); p.lineTo(-30,0); p.lineTo(0,30); p.lineTo(30,0); p.closePath(); … … 489 488 public static final Symbol NoticeD1b = new Symbol(); 490 489 static { 491 NoticeD1b.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));490 NoticeD1b.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 492 491 NoticeD1b.add(new Instr(Prim.FILL, Color.yellow)); 493 492 Path2D.Double p = new Path2D.Double(); p.moveTo(-30,0); p.lineTo(-15,15); p.lineTo(15,-15); p.lineTo(30,0); p.lineTo(15,15); p.lineTo(-15,-15); p.closePath(); … … 499 498 public static final Symbol NoticeD2a = new Symbol(); 500 499 static { 501 NoticeD2a.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));500 NoticeD2a.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 502 501 NoticeD2a.add(new Instr(Prim.FILL, Color.white)); 503 502 Path2D.Double p = new Path2D.Double(); p.moveTo(0,-30); p.lineTo(30,0); p.lineTo(0,30); p.closePath(); … … 974 973 public static final Symbol NoticeBnank = new Symbol(); 975 974 static { 976 NoticeBnank.add(new Instr(Prim.BBOX, new Rectangle (-30,-30,60,60)));975 NoticeBnank.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-30,60,60))); 977 976 Symbol colours = new Symbol(); 978 977 Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-80.0); p.lineTo(-15.0,-47.0); p.lineTo(15.0,-47.0); p.closePath(); -
applications/editors/josm/plugins/smed2/src/symbols/Symbols.java
r30022 r30029 14 14 import java.awt.Font; 15 15 import java.awt.Graphics2D; 16 import java.awt.Rectangle;17 16 import java.awt.font.TextLayout; 18 17 import java.awt.geom.*; … … 139 138 switch (item.type) { 140 139 case BBOX: 141 Rectangle bbox = (Rectangle) item.params;140 Rectangle2D.Double bbox = (Rectangle2D.Double) item.params; 142 141 double dx = 0.0; 143 142 double dy = 0.0; -
applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java
r29198 r30029 12 12 import java.awt.BasicStroke; 13 13 import java.awt.Color; 14 import java.awt.Rectangle; 15 import java.awt.geom.AffineTransform; 16 import java.awt.geom.Ellipse2D; 17 import java.awt.geom.Line2D; 18 import java.awt.geom.Path2D; 14 import java.awt.geom.*; 19 15 import java.util.EnumMap; 20 16 … … 26 22 public static final Symbol TopBoard = new Symbol(); 27 23 static { 28 TopBoard.add(new Instr(Prim.BBOX, new Rectangle (-20,-80,40,80)));24 TopBoard.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-20,-80,40,80))); 29 25 Symbol colours = new Symbol(); 30 26 Path2D.Double p = new Path2D.Double(); p.moveTo(-19.0,-2.0); p.lineTo(-19.0,-39.0); p.lineTo(19.0,-39.0); p.lineTo(19.0,-2.0); p.closePath(); … … 38 34 public static final Symbol TopCan = new Symbol(); 39 35 static { 40 TopCan.add(new Instr(Prim.BBOX, new Rectangle (-20,-80,40,80)));36 TopCan.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-20,-80,40,80))); 41 37 Symbol colours = new Symbol(); 42 38 Path2D.Double p = new Path2D.Double(); p.moveTo(-12.0,-15.0); p.lineTo(-12.0,-48.0); p.lineTo(12.0,-48.0); p.lineTo(12.0,-15.0); p.closePath(); … … 51 47 public static final Symbol TopCone = new Symbol(); 52 48 static { 53 TopCone.add(new Instr(Prim.BBOX, new Rectangle (-20,-80,40,80)));49 TopCone.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-20,-80,40,80))); 54 50 Symbol colours = new Symbol(); 55 51 Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,-15.0); p.lineTo(0.0,-45.0); p.lineTo(15.0,-15.0); p.closePath(); … … 64 60 public static final Symbol TopCross = new Symbol(); 65 61 static { 66 TopCross.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));62 TopCross.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 67 63 Symbol colours = new Symbol(); 68 64 Path2D.Double p = new Path2D.Double(); p.moveTo(-5.0,-15.0); p.lineTo(-5.0,-32.5); p.lineTo(-22.5,-32.5); p.lineTo(-22.5,-42.5); p.lineTo(-5.0,-42.5); … … 80 76 public static final Symbol TopEast = new Symbol(); 81 77 static { 82 TopEast.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));78 TopEast.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 83 79 Symbol colours = new Symbol(); 84 80 Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-80.0); p.lineTo(-15.0,-47.0); p.lineTo(15.0,-47.0); p.closePath(); … … 98 94 public static final Symbol TopIsol = new Symbol(); 99 95 static { 100 TopIsol.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));96 TopIsol.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 101 97 Symbol colours = new Symbol(); 102 98 Path2D.Double p = new Path2D.Double(); p.moveTo(-13.0,-55.0); p.curveTo(-13.0, -72.3, 13.0, -72.3, 13.0,-55.0); p.curveTo(13.0, -37.7, -13.0, -37.7, -13.0,-55.0); p.closePath(); … … 114 110 public static final Symbol TopMooring = new Symbol(); 115 111 static { 116 TopMooring.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));112 TopMooring.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 117 113 TopMooring.add(new Instr(Prim.STRK, new BasicStroke(3, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER))); 118 114 TopMooring.add(new Instr(Prim.FILL, Color.black)); … … 122 118 public static final Symbol TopNorth = new Symbol(); 123 119 static { 124 TopNorth.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));120 TopNorth.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 125 121 Symbol colours = new Symbol(); 126 122 Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-78.0); p.lineTo(-15.0,-45.0); p.lineTo(15.0,-45.0); p.closePath(); … … 139 135 public static final Symbol TopSouth = new Symbol(); 140 136 static { 141 TopSouth.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));137 TopSouth.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 142 138 Symbol colours = new Symbol(); 143 139 Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,-78.0); p.lineTo(0.0,-45.0); p.lineTo(15.0,-78.0); p.closePath(); … … 156 152 public static final Symbol TopSphere = new Symbol(); 157 153 static { 158 TopSphere.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));154 TopSphere.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 159 155 Symbol colours = new Symbol(); 160 156 Path2D.Double p = new Path2D.Double(); p.moveTo(-14.0,-28.0); p.curveTo(-14.0,-46.7,14.0,-46.7,14.0,-28.0); p.curveTo(14.0,-9.3,-14.0,-9.3,-14.0,-28.0); p.closePath(); … … 169 165 public static final Symbol TopSquare = new Symbol(); 170 166 static { 171 TopSquare.add(new Instr(Prim.BBOX, new Rectangle (-20,-80,40,80)));167 TopSquare.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-20,-80,40,80))); 172 168 Symbol colours = new Symbol(); 173 169 Path2D.Double p = new Path2D.Double(); p.moveTo(-13.0,-1.0); p.lineTo(-13.0,-27.0); p.lineTo(13.0,-27.0); p.lineTo(13.0,-1.0); p.closePath(); … … 181 177 public static final Symbol TopTriangle = new Symbol(); 182 178 static { 183 TopTriangle.add(new Instr(Prim.BBOX, new Rectangle (-20,-80,40,80)));179 TopTriangle.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-20,-80,40,80))); 184 180 Symbol colours = new Symbol(); 185 181 Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,-1.0); p.lineTo(0.0,-29.0); p.lineTo(15.0,-1.0); p.closePath(); … … 193 189 public static final Symbol TopWest = new Symbol(); 194 190 static { 195 TopWest.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));191 TopWest.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 196 192 Symbol colours = new Symbol(); 197 193 Path2D.Double p = new Path2D.Double(); p.moveTo(-15.0,-78.0); p.lineTo(0.0,-45.0); p.lineTo(15.0,-78.0); p.closePath(); … … 210 206 public static final Symbol TopX = new Symbol(); 211 207 static { 212 TopX.add(new Instr(Prim.BBOX, new Rectangle (-30,-80,60,80)));208 TopX.add(new Instr(Prim.BBOX, new Rectangle2D.Double(-30,-80,60,80))); 213 209 Symbol colours = new Symbol(); 214 210 Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-27.7); p.lineTo(-12.4,-15.7); p.lineTo(-19.3,-22.6); p.lineTo(-7.3,-35.0); p.lineTo(-19.3,-47.3);
Note:
See TracChangeset
for help on using the changeset viewer.
