Index: /applications/editors/josm/plugins/smed2/src/s57/S57val.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/s57/S57val.java (revision 29928) +++ /applications/editors/josm/plugins/smed2/src/s57/S57val.java (revision 29929) @@ -295,10 +295,11 @@ Catpip.put(CatPIP.PIP_BBLR, new S57enum(5, "bubbler")); Catpip.put(CatPIP.PIP_SPPL, new S57enum(6, "supply")); } - public enum CatPRA { PRA_UNKN, PRA_QRRY, PRA_MINE, PRA_STPL, PRA_PSTN, PRA_RFNY, PRA_TYRD, PRA_FACT, PRA_TFRM, PRA_WFRM, PRA_SLAG } + public enum CatPRA { PRA_UNKN, PRA_QRRY, PRA_MINE, PRA_STPL, PRA_PSTN, PRA_RFNY, PRA_TYRD, PRA_FACT, PRA_TFRM, PRA_WFRM, PRA_SLAG, PRA_CURF, PRA_OILF, PRA_GASF, PRA_WAVE } private static final EnumMap Catpra = new EnumMap(CatPRA.class); static { Catpra.put(CatPRA.PRA_UNKN, new S57enum(0, "")); Catpra.put(CatPRA.PRA_QRRY, new S57enum(1, "quarry")); Catpra.put(CatPRA.PRA_MINE, new S57enum(2, "mine")); Catpra.put(CatPRA.PRA_STPL, new S57enum(3, "stockpile")); Catpra.put(CatPRA.PRA_PSTN, new S57enum(4, "power_station")); Catpra.put(CatPRA.PRA_RFNY, new S57enum(5, "refinery")); Catpra.put(CatPRA.PRA_TYRD, new S57enum(6, "timber_yard")); Catpra.put(CatPRA.PRA_FACT, new S57enum(7, "factory")); Catpra.put(CatPRA.PRA_TFRM, new S57enum(8, "tank_farm")); Catpra.put(CatPRA.PRA_WFRM, new S57enum(9, "wind_farm")); - Catpra.put(CatPRA.PRA_SLAG, new S57enum(10, "slag")); + Catpra.put(CatPRA.PRA_SLAG, new S57enum(10, "slag_heap")); Catpra.put(CatPRA.PRA_CURF, new S57enum(11, "current_farm")); Catpra.put(CatPRA.PRA_OILF, new S57enum(12, "oil")); + Catpra.put(CatPRA.PRA_GASF, new S57enum(13, "gas")); Catpra.put(CatPRA.PRA_WAVE, new S57enum(14, "wave_energy")); } public enum CatPYL { PYL_UNKN, PYL_POWR, PYL_TELE, PYL_AERL, PYL_BRDG, PYL_PIER } @@ -335,9 +336,10 @@ Cattrk.put(CatTRK.TRK_FIXM, new S57enum(1, "fixed_marks")); Cattrk.put(CatTRK.TRK_NFXM, new S57enum(2, "no_fixed_marks")); } - public enum CatRSC { RSC_UNKN, RSC_LIFB, RSC_ROKT, RSC_LBRK, RSC_RFSW, RSC_RFIT, RSC_LBOM, RSC_RDIO, RSC_FSTA } + public enum CatRSC { RSC_UNKN, RSC_LIFB, RSC_ROKT, RSC_LBRK, RSC_RFSW, RSC_RFIT, RSC_LBOM, RSC_RDIO, RSC_FSTA, RSC_SPLN, RSC_ACFT, RSC_STUG } private static final EnumMap Catrsc = new EnumMap(CatRSC.class); static { Catrsc.put(CatRSC.RSC_UNKN, new S57enum(0, "")); Catrsc.put(CatRSC.RSC_LIFB, new S57enum(1, "lifeboat")); Catrsc.put(CatRSC.RSC_ROKT, new S57enum(2, "rocket")); Catrsc.put(CatRSC.RSC_LBRK, new S57enum(3, "lifeboat_rocket")); Catrsc.put(CatRSC.RSC_RFSW, new S57enum(4, "refuge_shipwrecked")); Catrsc.put(CatRSC.RSC_RFIT, new S57enum(5, "refuge_intertidal")); Catrsc.put(CatRSC.RSC_LBOM, new S57enum(6, "lifeboat_on_mooring")); - Catrsc.put(CatRSC.RSC_RDIO, new S57enum(7, "radio")); Catrsc.put(CatRSC.RSC_FSTA, new S57enum(8, "first_aid")); + Catrsc.put(CatRSC.RSC_RDIO, new S57enum(7, "radio")); Catrsc.put(CatRSC.RSC_FSTA, new S57enum(8, "first_aid")); Catrsc.put(CatRSC.RSC_SPLN, new S57enum(9, "seaplane")); + Catrsc.put(CatRSC.RSC_ACFT, new S57enum(10, "aircraft")); Catrsc.put(CatRSC.RSC_STUG, new S57enum(12, "tug")); } public enum CatREA { REA_UNKN, REA_SFTY, REA_NANC, REA_NFSH, REA_NATR, REA_BRDS, REA_GRSV, REA_SEAL, REA_DEGR, REA_MILY, REA_HIST, REA_INST, @@ -372,5 +374,5 @@ Catsea.put(CatSEA.SEA_GENL, new S57enum(1, "general")); Catsea.put(CatSEA.SEA_GAT, new S57enum(2, "gat")); Catsea.put(CatSEA.SEA_BANK, new S57enum(3, "bank")); Catsea.put(CatSEA.SEA_DEEP, new S57enum(4, "deep")); Catsea.put(CatSEA.SEA_BAY, new S57enum(5, "bay")); Catsea.put(CatSEA.SEA_TRCH, new S57enum(6, "trench")); - Catsea.put(CatSEA.SEA_BASN, new S57enum(7, "basin")); Catsea.put(CatSEA.SEA_MDFT, new S57enum(8, "mud_flats")); Catsea.put(CatSEA.SEA_REEF, new S57enum(9, "reef")); + Catsea.put(CatSEA.SEA_BASN, new S57enum(7, "basin")); Catsea.put(CatSEA.SEA_MDFT, new S57enum(8, "flat")); Catsea.put(CatSEA.SEA_REEF, new S57enum(9, "reef")); Catsea.put(CatSEA.SEA_LEDG, new S57enum(10, "ledge")); Catsea.put(CatSEA.SEA_CNYN, new S57enum(11, "canyon")); Catsea.put(CatSEA.SEA_NRRW, new S57enum(12, "narrows")); Catsea.put(CatSEA.SEA_SHOL, new S57enum(13, "shoal")); Catsea.put(CatSEA.SEA_KNOL, new S57enum(14, "knoll")); Catsea.put(CatSEA.SEA_RIDG, new S57enum(15, "ridge")); @@ -382,7 +384,7 @@ Catsea.put(CatSEA.SEA_FAN, new S57enum(31, "fan")); Catsea.put(CatSEA.SEA_FZON, new S57enum(32, "fracture_zone")); Catsea.put(CatSEA.SEA_GAP, new S57enum(33, "gap")); Catsea.put(CatSEA.SEA_GUYT, new S57enum(34, "guyot")); Catsea.put(CatSEA.SEA_HILL, new S57enum(35, "hill")); Catsea.put(CatSEA.SEA_HOLE, new S57enum(36, "hole")); - Catsea.put(CatSEA.SEA_LEVE, new S57enum(37, "levee")); Catsea.put(CatSEA.SEA_MVLY, new S57enum(38, "median valley")); Catsea.put(CatSEA.SEA_MOAT, new S57enum(39, "moat")); + Catsea.put(CatSEA.SEA_LEVE, new S57enum(37, "levee")); Catsea.put(CatSEA.SEA_MVLY, new S57enum(38, "median_valley")); Catsea.put(CatSEA.SEA_MOAT, new S57enum(39, "moat")); Catsea.put(CatSEA.SEA_MTNS, new S57enum(40, "mountains")); Catsea.put(CatSEA.SEA_PEAK, new S57enum(41, "peak")); Catsea.put(CatSEA.SEA_PVNC, new S57enum(42, "province")); - Catsea.put(CatSEA.SEA_RISE, new S57enum(43, "rise")); Catsea.put(CatSEA.SEA_SCNL, new S57enum(44, "sea channel")); Catsea.put(CatSEA.SEA_SCHN, new S57enum(45, "seamount_chain")); + Catsea.put(CatSEA.SEA_RISE, new S57enum(43, "rise")); Catsea.put(CatSEA.SEA_SCNL, new S57enum(44, "sea_channel")); Catsea.put(CatSEA.SEA_SCHN, new S57enum(45, "seamount_chain")); Catsea.put(CatSEA.SEA_SEDG, new S57enum(46, "shelf-edge")); Catsea.put(CatSEA.SEA_SILL, new S57enum(47, "sill")); Catsea.put(CatSEA.SEA_SLOP, new S57enum(48, "slope")); Catsea.put(CatSEA.SEA_TRRC, new S57enum(49, "terrace")); Catsea.put(CatSEA.SEA_VLLY, new S57enum(50, "valley")); Catsea.put(CatSEA.SEA_CANL, new S57enum(51, "canal")); @@ -390,5 +392,5 @@ } public enum CatSLC { SLC_UNKN, SLC_BWTR, SLC_GRYN, SLC_MOLE, SLC_PIER, SLC_PPER, SLC_WHRF, SLC_TWAL, SLC_RPRP, SLC_RVMT, SLC_SWAL, SLC_LSTP, - SLC_RAMP, SLC_SWAY, SLC_FNDR, SLC_SFWF, SLC_OFWF, SLC_LRMP, SLC_LWAL } + SLC_RAMP, SLC_SWAY, SLC_FNDR, SLC_SFWF, SLC_OFWF, SLC_LRMP, SLC_LWAL, SLC_ICEB } private static final EnumMap Catslc = new EnumMap(CatSLC.class); static { Catslc.put(CatSLC.SLC_UNKN, new S57enum(0, "")); Catslc.put(CatSLC.SLC_BWTR, new S57enum(1, "breakwater")); Catslc.put(CatSLC.SLC_GRYN, new S57enum(2, "groyne")); Catslc.put(CatSLC.SLC_MOLE, new S57enum(3, "mole")); @@ -398,14 +400,16 @@ Catslc.put(CatSLC.SLC_SWAY, new S57enum(13, "slipway")); Catslc.put(CatSLC.SLC_FNDR, new S57enum(14, "fender")); Catslc.put(CatSLC.SLC_SFWF, new S57enum(15, "solid_face_wharf")); Catslc.put(CatSLC.SLC_OFWF, new S57enum(16, "open_face_wharf")); Catslc.put(CatSLC.SLC_LRMP, new S57enum(17, "log_ramp")); Catslc.put(CatSLC.SLC_LWAL, new S57enum(18, "lock_wall")); - } - public enum CatSIT { SIT_UNKN, SIT_PRTC, SIT_PRTE, SIT_IPT, SIT_BRTH, SIT_DOCK, SIT_LOCK, SIT_FLDB, SIT_BRDG, SIT_DRDG, SIT_TCLT } + Catslc.put(CatSLC.SLC_ICEB, new S57enum(18, "ice_breaker")); + } + public enum CatSIT { SIT_UNKN, SIT_PRTC, SIT_PRTE, SIT_IPT, SIT_BRTH, SIT_DOCK, SIT_LOCK, SIT_FLDB, SIT_BRDG, SIT_DRDG, SIT_TCLT, SIT_SPCL, SIT_PLTG, SIT_ONCT } private static final EnumMap Catsit = new EnumMap(CatSIT.class); static {Catsit.put(CatSIT.SIT_UNKN, new S57enum(0, "")); Catsit.put(CatSIT.SIT_PRTC, new S57enum(1, "port_control")); Catsit.put(CatSIT.SIT_PRTE, new S57enum(2, "port_entry_departure")); Catsit.put(CatSIT.SIT_IPT, new S57enum(3, "ipt")); Catsit.put(CatSIT.SIT_BRTH, new S57enum(4, "berthing")); Catsit.put(CatSIT.SIT_DOCK, new S57enum(5, "dock")); Catsit.put(CatSIT.SIT_LOCK, new S57enum(6, "lock")); Catsit.put(CatSIT.SIT_FLDB, new S57enum(7, "flood_barrage")); Catsit.put(CatSIT.SIT_BRDG, new S57enum(8, "bridge_passage")); Catsit.put(CatSIT.SIT_DRDG, new S57enum(9, "dredging")); - Catsit.put(CatSIT.SIT_TCLT, new S57enum(10, "traffic_control_light")); + Catsit.put(CatSIT.SIT_TCLT, new S57enum(10, "traffic_control")); Catsit.put(CatSIT.SIT_PLTG, new S57enum(11, "pilotage")); Catsit.put(CatSIT.SIT_SPCL, new S57enum(12, "special")); + Catsit.put(CatSIT.SIT_ONCT, new S57enum(13, "oncoming_traffic")); } public enum CatSIW { SIW_UNKN, SIW_DNGR, SIW_OBST, SIW_CABL, SIW_MILY, SIW_DSTR, SIW_WTHR, SIW_STRM, SIW_ICE, SIW_TIME, SIW_TIDE, SIW_TSTR, - SIW_TIDG, SIW_TIDS, SIW_DIVE, SIW_WTLG, SIW_VRCL, SIW_DPTH } + SIW_TIDG, SIW_TIDS, SIW_DIVE, SIW_WTLG, SIW_VRCL, SIW_HIWM, SIW_DPTH, SIW_CURR } private static final EnumMap Catsiw = new EnumMap(CatSIW.class); static {Catsiw.put(CatSIW.SIW_UNKN, new S57enum(0, "")); Catsiw.put(CatSIW.SIW_DNGR, new S57enum(1, "danger")); Catsiw.put(CatSIW.SIW_OBST, new S57enum(2, "maritime_obstruction")); Catsiw.put(CatSIW.SIW_CABL, new S57enum(3, "cable")); @@ -414,5 +418,6 @@ Catsiw.put(CatSIW.SIW_TIDE, new S57enum(10, "tide")); Catsiw.put(CatSIW.SIW_TSTR, new S57enum(11, "tidal_stream")); Catsiw.put(CatSIW.SIW_TIDG, new S57enum(12, "tide_gauge")); Catsiw.put(CatSIW.SIW_TIDS, new S57enum(13, "tide_scale")); Catsiw.put(CatSIW.SIW_DIVE, new S57enum(14, "diving")); Catsiw.put(CatSIW.SIW_WTLG, new S57enum(15, "water_level_gauge")); - Catsiw.put(CatSIW.SIW_VRCL, new S57enum(16, "vertical_clearance")); Catsiw.put(CatSIW.SIW_DPTH, new S57enum(18, "depth")); + Catsiw.put(CatSIW.SIW_VRCL, new S57enum(16, "vertical_clearance")); Catsiw.put(CatSIW.SIW_HIWM, new S57enum(17, "high_water")); Catsiw.put(CatSIW.SIW_DPTH, new S57enum(18, "depth")); + Catsiw.put(CatSIW.SIW_CURR, new S57enum(19, "current")); } public enum CatSIL { SIL_UNKN, SIL_SILO, SIL_TANK, SIL_GRNE, SIL_WTRT } @@ -491,5 +496,5 @@ private static final EnumMap Catwed = new EnumMap(CatWED.class); static { Catwed.put(CatWED.WED_UNKN, new S57enum(0, "")); Catwed.put(CatWED.WED_KELP, new S57enum(1, "kelp")); Catwed.put(CatWED.WED_SWED, new S57enum(2, "sea_weed")); Catwed.put(CatWED.WED_SGRS, new S57enum(3, "sea_grass")); - Catwed.put(CatWED.WED_SGSO, new S57enum(4, "saragasso")); + Catwed.put(CatWED.WED_SGSO, new S57enum(4, "sargasso")); } public enum CatWRK { WRK_UNKN, WRK_NDGR, WRK_DNGR, WRK_DREM, WRK_MSTS, WRK_HULS } Index: /applications/editors/josm/plugins/smed2/src/seamap/Renderer.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/seamap/Renderer.java (revision 29928) +++ /applications/editors/josm/plugins/smed2/src/seamap/Renderer.java (revision 29929) @@ -27,4 +27,39 @@ public class Renderer { + public static final EnumMap bodyColours = new EnumMap(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); + } + + public static final EnumMap pattMap = new EnumMap(ColPAT.class); + static { + pattMap.put(ColPAT.PAT_UNKN, Patt.Z); + pattMap.put(ColPAT.PAT_HORI, Patt.H); + pattMap.put(ColPAT.PAT_VERT, Patt.V); + pattMap.put(ColPAT.PAT_DIAG, Patt.D); + pattMap.put(ColPAT.PAT_BRDR, Patt.B); + pattMap.put(ColPAT.PAT_SQUR, Patt.S); + pattMap.put(ColPAT.PAT_CROS, Patt.C); + pattMap.put(ColPAT.PAT_SALT, Patt.X); + pattMap.put(ColPAT.PAT_STRP, Patt.H); + } + + 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 }; + static MapHelper helper; static SeaMap map; @@ -39,6 +74,6 @@ helper = h; map = m; - sScale = Symbols.symbolScale[zoom] * factor; - tScale = Symbols.textScale[zoom] * factor; + sScale = symbolScale[zoom] * factor; + tScale = textScale[zoom] * factor; if (map != null) { g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); @@ -73,7 +108,13 @@ Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, null); } else { - ArrayList colours = (ArrayList) getAttVal(feature, obj, 0, Att.COLOUR); - ArrayList pattern = (ArrayList) getAttVal(feature, obj, 0, Att.COLPAT); - Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, new Scheme(pattern, colours)); + ArrayList colours = new ArrayList(); + for (ColCOL col : (ArrayList)getAttVal(feature, obj, 0, Att.COLOUR)) { + colours.add(bodyColours.get(col)); + } + ArrayList patterns = new ArrayList(); + for(ColPAT pat: (ArrayList) getAttVal(feature, obj, 0, Att.COLPAT)) { + patterns.add(pattMap.get(pat)); + } + Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, new Scheme(patterns, colours)); } } Index: /applications/editors/josm/plugins/smed2/src/symbols/Notices.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/symbols/Notices.java (revision 29928) +++ /applications/editors/josm/plugins/smed2/src/symbols/Notices.java (revision 29929) @@ -972,4 +972,13 @@ 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(); Index: /applications/editors/josm/plugins/smed2/src/symbols/Symbols.java =================================================================== --- /applications/editors/josm/plugins/smed2/src/symbols/Symbols.java (revision 29928) +++ /applications/editors/josm/plugins/smed2/src/symbols/Symbols.java (revision 29929) @@ -18,7 +18,4 @@ import java.awt.geom.*; import java.util.ArrayList; -import java.util.EnumMap; - -import s57.S57val.*; public class Symbols { @@ -28,30 +25,10 @@ } + 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 bodyColours = new EnumMap(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,8 +54,8 @@ public static class Scheme { - public ArrayList pat; - public ArrayList col; - - public Scheme(ArrayList ipat, ArrayList icol) { + public ArrayList pat; + public ArrayList col; + + public Scheme(ArrayList ipat, ArrayList icol) { pat = ipat; col = icol; @@ -205,5 +182,5 @@ 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,7 +189,7 @@ 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,30 +197,30 @@ 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); }