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

Timestamp:

2013-01-17T12:08:28+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• Notices.java (modified) (2 diffs)
• Symbols.java (modified) (5 diffs)

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

@@ -51 +51 @@
         private static final Symbol Sport = new Symbol();
         static {
-                Sport.add(new Instr(Prim.TEXT, new Caption("SPORT", new TextStyle(new Font("Arial", Font.BOLD, 15)), (float)-25.0, (float)5.0)));
+                Sport.add(new Instr(Prim.TEXT, new Caption("SPORT", new Font("Arial", Font.BOLD, 15), new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 0)))));
         }
         private static final Symbol Turn = new Symbol();
@@ -65 +65 @@
         private static final Symbol VHF = new Symbol();
         static {
-                VHF.add(new Instr(Prim.TEXT, new Caption("VHF", new TextStyle(new Font("Arial", Font.BOLD, 20)), (float)-20.0, (float)-5.0)));
+                VHF.add(new Instr(Prim.TEXT, new Caption("VHF", new Font("Arial", Font.BOLD, 20), new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 0)))));
         }
         private static final Symbol Waterbike = new Symbol();

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

@@ -15 +15 @@
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.font.TextLayout;
 import java.awt.geom.*;
 import java.util.ArrayList;
@@ -59 +60 @@
                 Object params;
 
-                Instr(Prim itype, Object iparams) {
+                public Instr(Prim itype, Object iparams) {
                         type = itype;
                         params = iparams;
@@ -85 +86 @@
         }
 
-        public static class TextStyle {
-                Font font;
-
-                public TextStyle(Font ifont) {
-                        font = ifont;
-                }
-        }
-
         public static class Caption {
                 String str;
-                TextStyle style;
-                float x;
-                float y;
-
-                public Caption(String istr, TextStyle istyle, float ix, float iy) {
+                Font font;
+                Delta dd;
+
+                public Caption(String istr, Font ifont, Delta idd) {
                         str = istr;
-                        style = istyle;
-                        x = ix;
-                        y = iy;
+                        font = ifont;
+                        dd = idd;
                 }
         }
@@ -167 +158 @@
                                                 switch (dd.h) {
                                                 case CC:
-                                                        dx = bbox.x + (bbox.width / 2.0);
-                                                        dy = bbox.y + (bbox.height / 2.0);
+                                                        dx -= bbox.x + (bbox.width / 2.0);
+                                                        dy -= bbox.y + (bbox.height / 2.0);
                                                         break;
                                                 case TL:
-                                                        dx = bbox.x;
-                                                        dy = bbox.y;
+                                                        dx -= bbox.x;
+                                                        dy -= bbox.y;
                                                         break;
                                                 case TR:
-                                                        dx = bbox.x + bbox.width;
-                                                        dy = bbox.y;
+                                                        dx -= bbox.x + bbox.width;
+                                                        dy -= bbox.y;
                                                         break;
                                                 case TC:
-                                                        dx = bbox.x + (bbox.width / 2.0);
-                                                        dy = bbox.y;
+                                                        dx -= bbox.x + (bbox.width / 2.0);
+                                                        dy -= bbox.y;
                                                         break;
                                                 case LC:
-                                                        dx = bbox.x;
-                                                        dy = bbox.y + (bbox.height / 2.0);
+                                                        dx -= bbox.x;
+                                                        dy -= bbox.y + (bbox.height / 2.0);
                                                         break;
                                                 case RC:
-                                                        dx = bbox.x + bbox.width;
-                                                        dy = bbox.y + (bbox.height / 2.0);
+                                                        dx -= bbox.x + bbox.width;
+                                                        dy -= bbox.y + (bbox.height / 2.0);
                                                         break;
                                                 case BL:
-                                                        dx = bbox.x;
-                                                        dy = bbox.y + bbox.height;
+                                                        dx -= bbox.x;
+                                                        dy -= bbox.y + bbox.height;
                                                         break;
                                                 case BR:
-                                                        dx = bbox.x + bbox.width;
-                                                        dy = bbox.y + bbox.height;
+                                                        dx -= bbox.x + bbox.width;
+                                                        dy -= bbox.y + bbox.height;
                                                         break;
                                                 case BC:
-                                                        dx = bbox.x + (bbox.width / 2.0);
-                                                        dy = bbox.y + bbox.height;
+                                                        dx -= bbox.x + (bbox.width / 2.0);
+                                                        dy -= bbox.y + bbox.height;
                                                         break;
                                                 }
-                                                g2.translate(-dx, -dy);
+                                                g2.translate(dx, dy);
                                         }
                                         break;
@@ -296 +287 @@
                                 case TEXT:
                                         Caption c = (Caption) item.params;
-                                        g2.setFont(c.style.font);
-                                        g2.drawString(c.str, c.x, c.y);
+                                        TextLayout layout = new TextLayout(c.str, c.font, g2.getFontRenderContext());
+                                        Rectangle2D bb = layout.getBounds();
+                                        dx = 0;
+                                        dy = 0;
+                                        if (c.dd != null) {
+                                                g2.transform(c.dd.t);
+                                                switch (c.dd.h) {
+                                                case CC:
+                                                        dx -= bb.getX() + (bb.getWidth() / 2.0);
+                                                        dy -= bb.getY() + (bb.getHeight() / 2.0);
+                                                        break;
+                                                case TL:
+                                                        dx -= bb.getX();
+                                                        dy -= bb.getY();
+                                                        break;
+                                                case TR:
+                                                        dx -= bb.getX() + bb.getWidth();
+                                                        dy -= bb.getY();
+                                                        break;
+                                                case TC:
+                                                        dx -= bb.getX() + (bb.getWidth() / 2.0);
+                                                        dy -= bb.getY();
+                                                        break;
+                                                case LC:
+                                                        dx -= bb.getX();
+                                                        dy -= bb.getY() + (bb.getHeight() / 2.0);
+                                                        break;
+                                                case RC:
+                                                        dx -= bb.getX() + bb.getWidth();
+                                                        dy -= bb.getY() + (bb.getHeight() / 2.0);
+                                                        break;
+                                                case BL:
+                                                        dx -= bb.getX();
+                                                        dy -= bb.getY() + bb.getHeight();
+                                                        break;
+                                                case BR:
+                                                        dx -= bb.getX() + bb.getWidth();
+                                                        dy -= bb.getY() + bb.getHeight();
+                                                        break;
+                                                case BC:
+                                                        dx -= bb.getX() + (bb.getWidth() / 2.0);
+                                                        dy -= bb.getY() + bb.getHeight();
+                                                        break;
+                                                }
+                                        }
+                                        layout.draw(g2, (float)dx, (float)dy);
                                         break;
                                 }