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

Timestamp:

2013-10-13T19:17:33+02:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -61 +61 @@
                         col = icol;
                 }
+                public Scheme(Color icol) {
+                        pat = new ArrayList<Patt>();
+                        col = new ArrayList<Color>();
+                        col.add(icol);
+                }
         }
 
@@ -119 +124 @@
                 int pn = 0;
                 int cn = 0;
+                g2.setPaint(Color.black);
                 if (cs != null) {
                         pn = cs.pat.size();
                         cn = cs.col.size() - ((pn != 0) ? pn - 1 : 0);
+                        if ((pn == 0) && (cs.col.size() == 1)) {
+                                g2.setPaint(cs.col.get(0));
+                        }
                 }
                 AffineTransform savetr = g2.getTransform();
@@ -262 +271 @@
                                 case SYMB:
                                         SubSymbol s = (SubSymbol) item.params;
-                                        drawSymbol(g2, s.instr, s.scale, s.x, s.y, s.delta, s.scheme);
+                                        drawSymbol(g2, s.instr, s.scale, s.x, s.y, s.delta, (s.scheme != null ? s.scheme : cs));
                                         break;
                                 case TEXT: