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

Timestamp:

2013-01-19T15:50:02+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

@@ -57 +57 @@
 
         public static class Instr {
-                Prim type;
-                Object params;
+                public Prim type;
+                public Object params;
 
                 public Instr(Prim itype, Object iparams) {
@@ -67 +67 @@
 
         public static class Delta {
-                Handle h;
-                AffineTransform t;
+                public Handle h;
+                public AffineTransform t;
 
                 public Delta(Handle ih, AffineTransform it) {
@@ -77 +77 @@
 
         public static class Scheme {
-                ArrayList<ColPAT> pat;
-                ArrayList<ColCOL> col;
+                public ArrayList<ColPAT> pat;
+                public ArrayList<ColCOL> col;
 
                 public Scheme(ArrayList<ColPAT> ipat, ArrayList<ColCOL> icol) {
@@ -87 +87 @@
 
         public static class Caption {
-                String str;
-                Font font;
-                Delta dd;
-
-                public Caption(String istr, Font ifont, Delta idd) {
-                        str = istr;
+                public String string;
+                public Font font;
+                public Color colour;
+                public Delta dd;
+
+                public Caption(String istr, Font ifont, Color icolour, Delta idd) {
+                        string = istr;
                         font = ifont;
+                        colour = icolour;
                         dd = idd;
                 }
@@ -287 +289 @@
                                 case TEXT:
                                         Caption c = (Caption) item.params;
-                                        TextLayout layout = new TextLayout(c.str, c.font, g2.getFontRenderContext());
+                                        g2.setPaint(c.colour);
+                                        TextLayout layout = new TextLayout(c.string, c.font, g2.getFontRenderContext());
                                         Rectangle2D bb = layout.getBounds();
                                         dx = 0;