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

Timestamp:

2012-12-26T14:12:40+01:00 (13 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

@@ -23 +23 @@
 
         public enum Prim {
-                BBOX, STRK, COLR, FILL, LINE, RECT, RRCT, ELPS, EARC, PLIN, PGON, 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
         }
 
@@ -30 +30 @@
         }
 
-        public static final double symbolScale[] = { 1.0, 128.0, 64.0, 32.0, 16.0, 8.0, 4.0, 2.0, 1.0, 0.61, 0.372, 0.227, 0.138,
+        public static final double symbolScale[] = { 256.0, 128.0, 64.0, 32.0, 16.0, 8.0, 4.0, 2.0, 1.0, 0.61, 0.372, 0.227, 0.138,
                         0.0843, 0.0514, 0.0313, 0.0191, 0.0117, 0.007, 0.138 };
 
-        public static final double textScale[] = { 1.0, 128.0, 64.0, 32.0, 16.0, 8.0, 4.0, 2.0, 1.0, 0.5556, 0.3086, 0.1714, 0.0953,
+        public static final double textScale[] = { 256.0, 128.0, 64.0, 32.0, 16.0, 8.0, 4.0, 2.0, 1.0, 0.5556, 0.3086, 0.1714, 0.0953,
                         0.0529, 0.0294, 0.0163, 0.0091, 0.0050, 0.0028, 0.0163 };
 
@@ -84 +84 @@
         }
 
-        public static void drawSymbol(Graphics2D g2, ArrayList<Instr> symbol, int zoom, double x, double y, Delta dd, Scheme cs) {
+        public static class Symbol {
+                ArrayList<Instr> instr;
+                double scale;
+                double x;
+                double y;
+                Delta delta;
+                Scheme scheme;
+
+                public Symbol(ArrayList<Instr> iinstr, double iscale, double ix, double iy, Delta idelta, Scheme ischeme) {
+                        instr = iinstr;
+                        scale = iscale;
+                        x = ix;
+                        y = iy;
+                        delta = idelta;
+                        scheme = ischeme;
+                }
+        }
+
+        public static void drawSymbol(Graphics2D g2, ArrayList<Instr> symbol, double scale, double x, double y, Delta dd, Scheme cs) {
                 int pn = 0;
                 int cn = 0;
@@ -93 +111 @@
                 AffineTransform savetr = g2.getTransform();
                 g2.translate(x, y);
-                g2.scale(symbolScale[zoom], symbolScale[zoom]);
+                g2.scale(scale, scale);
                 for (Instr item : symbol) {
                         switch (item.type) {
@@ -224 +242 @@
                                 g2.fill((Path2D.Double) item.params);
                                 break;
+                        case RSHP:
+                                g2.fill((RectangularShape) item.params);
+                                break;
                         case SYMB:
-                                drawSymbol(g2, (ArrayList<Instr>) item.params, 0, 0.0, 0.0, null, null);
+                                Symbol s = (Symbol) item.params;
+                                drawSymbol(g2, s.instr, s.scale, s.x, s.y, s.delta, s.scheme);
+                                break;
+                        case TEXT:
                                 break;
                         }