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

Timestamp:

2013-09-18T12:41:49+02:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• Notices.java (modified) (1 diff)
• Symbols.java (modified) (6 diffs)

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

@@ -972 +972 @@
 
         public static final Symbol NoticeBnank = new Symbol();
+        static {
+                NoticeBnank.add(new Instr(Prim.BBOX, new Rectangle(-30,-30,60,60)));
+                Symbol colours = new Symbol();
+                Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-80.0); p.lineTo(-15.0,-47.0); p.lineTo(15.0,-47.0); p.closePath();
+                colours.add(new Instr(Prim.P1, p));
+                p = new Path2D.Double(); p.moveTo(0.0,-10.0); p.lineTo(-15.0,-43.0); p.lineTo(15.0,-43.0); p.closePath();
+                colours.add(new Instr(Prim.P2, p));
+                NoticeBnank.add(new Instr(Prim.COLR, colours));
+        }
         public static final Symbol NoticeBlmhr = new Symbol();
         public static final Symbol NoticeBwral = new Symbol();

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

@@ -18 +18 @@
 import java.awt.geom.*;
 import java.util.ArrayList;
-import java.util.EnumMap;
-
-import s57.S57val.*;
 
 public class Symbols {
@@ -28 +25 @@
         }
 
+        public enum Patt {
+                Z, H, V, D, B, S, C, X
+        }
+
         public enum Handle {
                 CC, TL, TR, TC, LC, RC, BL, BR, BC
-        }
-
-        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[] = { 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 };
-
-        private static final EnumMap<ColCOL, Color> bodyColours = new EnumMap<ColCOL, Color>(ColCOL.class);
-        static {
-                bodyColours.put(ColCOL.COL_UNK, new Color(0, true));
-                bodyColours.put(ColCOL.COL_WHT, new Color(0xffffff));
-                bodyColours.put(ColCOL.COL_BLK, new Color(0x000000));
-                bodyColours.put(ColCOL.COL_RED, new Color(0xd40000));
-                bodyColours.put(ColCOL.COL_GRN, new Color(0x00d400));
-                bodyColours.put(ColCOL.COL_BLU, Color.blue);
-                bodyColours.put(ColCOL.COL_YEL, new Color(0xffd400));
-                bodyColours.put(ColCOL.COL_GRY, Color.gray);
-                bodyColours.put(ColCOL.COL_BRN, new Color(0x8b4513));
-                bodyColours.put(ColCOL.COL_AMB, new Color(0xfbf00f));
-                bodyColours.put(ColCOL.COL_VIO, new Color(0xee82ee));
-                bodyColours.put(ColCOL.COL_ORG, Color.orange);
-                bodyColours.put(ColCOL.COL_MAG, new Color(0xf000f0));
-                bodyColours.put(ColCOL.COL_PNK, Color.pink);
         }
 
@@ -77 +54 @@
 
         public static class Scheme {
-                public ArrayList<ColPAT> pat;
-                public ArrayList<ColCOL> col;
-
-                public Scheme(ArrayList<ColPAT> ipat, ArrayList<ColCOL> icol) {
+                public ArrayList<Patt> pat;
+                public ArrayList<Color> col;
+
+                public Scheme(ArrayList<Patt> ipat, ArrayList<Color> icol) {
                         pat = ipat;
                         col = icol;
@@ -205 +182 @@
                                                         case P1:
                                                                 if (cn > 0) {
-                                                                        g2.setPaint(bodyColours.get(cs.col.get(0)));
+                                                                        g2.setPaint(cs.col.get(0));
                                                                         g2.fill((Path2D.Double) patch.params);
                                                                 }
@@ -212 +189 @@
                                                                 if (cn > 0) {
                                                                         if (cn > 1) {
-                                                                                g2.setPaint(bodyColours.get(cs.col.get(1)));
+                                                                                g2.setPaint(cs.col.get(1));
                                                                         } else {
-                                                                                g2.setPaint(bodyColours.get(cs.col.get(0)));
+                                                                                g2.setPaint(cs.col.get(0));
                                                                         }
                                                                         g2.fill((Path2D.Double) patch.params);
@@ -220 +197 @@
                                                                 break;
                                                         case H2:
-                                                                if ((cn > 1) && (cs.pat.get(0) == ColPAT.PAT_HORI)) {
-                                                                        g2.setPaint(bodyColours.get(cs.col.get(cs.col.size() - pn)));
+                                                                if ((cn > 1) && (cs.pat.get(0) == Patt.H)) {
+                                                                        g2.setPaint(cs.col.get(cs.col.size() - pn));
                                                                         g2.fill((Path2D.Double) patch.params);
                                                                 }
                                                                 break;
                                                         case H3:
-                                                                if ((cn == 3) && (cs.pat.get(0) == ColPAT.PAT_HORI)) {
-                                                                        g2.setPaint(bodyColours.get(cs.col.get(1)));
+                                                                if ((cn == 3) && (cs.pat.get(0) == Patt.H)) {
+                                                                        g2.setPaint(cs.col.get(1));
                                                                         g2.fill((Path2D.Double) patch.params);
                                                                 }
                                                                 break;
                                                         case H4:
-                                                                if ((cn == 4) && (cs.pat.get(0) == ColPAT.PAT_HORI)) {
-                                                                        g2.setPaint(bodyColours.get(cs.col.get(1)));
+                                                                if ((cn == 4) && (cs.pat.get(0) == Patt.H)) {
+                                                                        g2.setPaint(cs.col.get(1));
                                                                         g2.fill((Path2D.Double) patch.params);
                                                                 }
                                                                 break;
                                                         case H5:
-                                                                if ((cn == 4) && (cs.pat.get(0) == ColPAT.PAT_HORI)) {
-                                                                        g2.setPaint(bodyColours.get(cs.col.get(2)));
+                                                                if ((cn == 4) && (cs.pat.get(0) == Patt.H)) {
+                                                                        g2.setPaint(cs.col.get(2));
                                                                         g2.fill((Path2D.Double) patch.params);
                                                                 }
                                                                 break;
                                                         case V2:
-                                                                if ((cn > 1) && (cs.pat.get(0) == ColPAT.PAT_VERT)) {
-                                                                        g2.setPaint(bodyColours.get(cs.col.get(cs.col.size() - pn)));
+                                                                if ((cn > 1) && (cs.pat.get(0) == Patt.V)) {
+                                                                        g2.setPaint(cs.col.get(cs.col.size() - pn));
                                                                         g2.fill((Path2D.Double) patch.params);
                                                                 }