Changeset 29198 in osm for applications/editors/josm/plugins/smed2/src/symbols/Symbols.java

Timestamp:

2013-01-14T19:11:27+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/symbols/Symbols.java (modified) (5 diffs)

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

@@ -24 +24 @@
 
         public enum Prim {
-                BBOX, STRK, COLR, FILL, LINE, RECT, RRCT, ELPS, EARC, PLIN, PGON, RSHP, FONT, TEXT, SYMB, P1, P2, H2, H3, H4, H5, V2, D2, D3, D4, B2, S2, S3, S4, C2, X2
+                BBOX, STRK, COLR, FILL, LINE, RECT, RRCT, ELPS, EARC, PLIN, PGON, RSHP, TEXT, SYMB, P1, P2, H2, H3, H4, H5, V2, D2, D3, D4, B2, S2, S3, S4, C2, X2
         }
 
@@ -85 +85 @@
         }
 
+        public static class TextStyle {
+                Font font;
+
+                public TextStyle(Font ifont) {
+                        font = ifont;
+                }
+        }
+
         public static class Caption {
-                String str;;
+                String str;
+                TextStyle style;
                 float x;
                 float y;
 
-                public Caption(String istr, float ix, float iy) {
+                public Caption(String istr, TextStyle istyle, float ix, float iy) {
                         str = istr;
+                        style = istyle;
                         x = ix;
                         y = iy;
@@ -97 +107 @@
         }
 
+        public static class LineStyle {
+                BasicStroke stroke;
+                Color line;
+                Color fill;
+
+                public LineStyle(BasicStroke istroke, Color iline, Color ifill) {
+                        stroke = istroke;
+                        line = iline;
+                        fill = ifill;
+                }
+        }
+
         public static class Symbol extends ArrayList<Instr> {
-                private static final long serialVersionUID = 1L;
 
                 public Symbol() {
@@ -185 +206 @@
                                 case COLR:
                                         if ((cs != null) && (cs.col != null)) {
-                                                for (Instr patch : (ArrayList<Instr>) item.params) {
+                                                for (Instr patch : (Symbol) item.params) {
                                                         switch (patch.type) {
                                                         case P1:
@@ -271 +292 @@
                                         drawSymbol(g2, s.instr, s.scale, s.x, s.y, s.delta, s.scheme);
                                         break;
-                                case FONT:
-                                        g2.setFont((Font) item.params);
-                                        break;
                                 case TEXT:
                                         Caption c = (Caption) item.params;
+                                        g2.setFont(c.style.font);
                                         g2.drawString(c.str, c.x, c.y);
                                         break;