Changeset 29992 in osm
- Timestamp:
- 2013-10-04T14:33:00+02:00 (11 years ago)
- Location:
- applications/editors/josm/plugins/smed2/src
- Files:
-
- 1 added
- 5 edited
-
panels/PanelMain.java (modified) (2 diffs)
-
s57/S57att.java (modified) (1 diff)
-
seamap/Renderer.java (modified) (1 diff)
-
seamap/Rules.java (modified) (18 diffs)
-
smed2/S57en.java (added)
-
symbols/Notices.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed2/src/panels/PanelMain.java
r29881 r29992 54 54 }; 55 55 56 public ButtonGroup sectionButtons = null;57 public JRadioButton eButton = new JRadioButton();58 public JRadioButton fButton = new JRadioButton();59 public JRadioButton jButton = new JRadioButton();60 public JRadioButton kButton = new JRadioButton();61 public JRadioButton lButton = new JRadioButton();62 public JRadioButton mButton = new JRadioButton();63 public JRadioButton nButton = new JRadioButton();64 public JRadioButton pButton = new JRadioButton();65 public JRadioButton qButton = new JRadioButton();66 public JRadioButton rButton = new JRadioButton();67 public JRadioButton sButton = new JRadioButton();68 public JRadioButton tButton = new JRadioButton();69 public JRadioButton uButton = new JRadioButton();70 private ActionListener alSection = new ActionListener() {71 public void actionPerformed(java.awt.event.ActionEvent e) {72 if (eButton.isSelected()) {73 eButton.setBorderPainted(true);74 } else {75 eButton.setBorderPainted(false);76 }77 if (fButton.isSelected()) {78 fButton.setBorderPainted(true);79 } else {80 fButton.setBorderPainted(false);81 }82 if (jButton.isSelected()) {83 jButton.setBorderPainted(true);84 } else {85 jButton.setBorderPainted(false);86 }87 if (kButton.isSelected()) {88 kButton.setBorderPainted(true);89 } else {90 kButton.setBorderPainted(false);91 }92 }93 };94 95 56 public PanelMain() { 96 57 … … 117 78 saveButton.addActionListener(alSave); 118 79 119 add(getButton(eButton, 0, 0, 200, 20, "E Landmarks"), null);120 add(getButton(fButton, 0, 20, 200, 20, "F Ports"), null);121 add(getButton(jButton, 0, 40, 200, 20, "J Seabed"), null);122 add(getButton(kButton, 0, 60, 200, 20, "K Obstructions"), null);123 add(getButton(lButton, 0, 80, 200, 20, "L Obstructions"), null);124 add(getButton(mButton, 0, 100, 200, 20, "M Offshore Installations"), null);125 add(getButton(nButton, 0, 120, 200, 20, "N Areas & Limits"), null);126 add(getButton(pButton, 0, 140, 200, 20, "P Lights"), null);127 add(getButton(qButton, 0, 160, 200, 20, "Q Buoys & Beacons"), null);128 add(getButton(rButton, 0, 180, 200, 20, "R Fog Sigals"), null);129 add(getButton(sButton, 0, 200, 200, 20, "S Radio & Radar"), null);130 add(getButton(tButton, 0, 220, 200, 20, "T Services"), null);131 add(getButton(uButton, 0, 240, 200, 20, "U Small Craft Facilities"), null);132 sectionButtons = new ButtonGroup();133 sectionButtons.add(eButton);134 sectionButtons.add(fButton);135 sectionButtons.add(jButton);136 sectionButtons.add(kButton);137 sectionButtons.add(lButton);138 sectionButtons.add(mButton);139 sectionButtons.add(nButton);140 sectionButtons.add(pButton);141 sectionButtons.add(qButton);142 sectionButtons.add(rButton);143 sectionButtons.add(sButton);144 sectionButtons.add(tButton);145 sectionButtons.add(uButton);146 eButton.addActionListener(alSection);147 fButton.addActionListener(alSection);148 jButton.addActionListener(alSection);149 kButton.addActionListener(alSection);150 lButton.addActionListener(alSection);151 mButton.addActionListener(alSection);152 nButton.addActionListener(alSection);153 pButton.addActionListener(alSection);154 qButton.addActionListener(alSection);155 rButton.addActionListener(alSection);156 sButton.addActionListener(alSection);157 tButton.addActionListener(alSection);158 uButton.addActionListener(alSection);159 80 } 160 81 -
applications/editors/josm/plugins/smed2/src/s57/S57att.java
r29940 r29992 131 131 AttStr.put(Att.SORIND, "source"); AttStr.put(Att.STATUS, "status"); AttStr.put(Att.SURATH, "authority"); AttStr.put(Att.SUREND, "end_date"); 132 132 AttStr.put(Att.SURSTA, "start_date"); AttStr.put(Att.SURTYP, "survey"); AttStr.put(Att.TECSOU, "technique"); AttStr.put(Att.TXTDSC, "description"); 133 AttStr.put(Att.TIMEND, "end_time"); AttStr.put(Att.TIMSTA, "start_time"); AttStr.put(Att.TOPSHP, "shape"); AttStr.put(Att.TRAFIC, " flow");133 AttStr.put(Att.TIMEND, "end_time"); AttStr.put(Att.TIMSTA, "start_time"); AttStr.put(Att.TOPSHP, "shape"); AttStr.put(Att.TRAFIC, "traffic_flow"); 134 134 AttStr.put(Att.VALACM, "variation_change"); AttStr.put(Att.VALDCO, "depth"); AttStr.put(Att.VALLMA, "anomaly"); AttStr.put(Att.VALMAG, "variation"); 135 135 AttStr.put(Att.VALMXR, "maximum_range"); AttStr.put(Att.VALNMR, "range"); AttStr.put(Att.VALSOU, "sounding"); AttStr.put(Att.VERACC, "vertical_accuracy"); -
applications/editors/josm/plugins/smed2/src/seamap/Renderer.java
r29929 r29992 103 103 } 104 104 105 public static void symbol(Feature feature, Symbol symbol, Obj obj, Delta delta ) {105 public static void symbol(Feature feature, Symbol symbol, Obj obj, Delta delta, Scheme scheme) { 106 106 Point2D point = helper.getPoint(feature.centre); 107 107 if (obj == null) { 108 Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, null);108 Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, scheme); 109 109 } else { 110 110 ArrayList<Color> colours = new ArrayList<Color>(); -
applications/editors/josm/plugins/smed2/src/seamap/Rules.java
r29884 r29992 107 107 case SPLARE: 108 108 if (zoom >= 12) { 109 Renderer.symbol(feature, Areas.Plane, Obj.SPLARE, null );109 Renderer.symbol(feature, Areas.Plane, Obj.SPLARE, null, null); 110 110 Renderer.lineSymbols(feature, Areas.Restricted, 0.5, Areas.LinePlane, 10); 111 111 } … … 115 115 case MARCUL: 116 116 if (zoom >= 14) 117 Renderer.symbol(feature, Areas.MarineFarm, Obj.MARCUL, null );117 Renderer.symbol(feature, Areas.MarineFarm, Obj.MARCUL, null, null); 118 118 if (zoom >= 16) 119 119 Renderer.lineVector(feature, new LineStyle( Color.black, 4, new float[] { 10, 10 }, null)); … … 147 147 case OSPARE: 148 148 if ((CatPRA)Renderer.getAttVal(feature, feature.type, 0, Att.CATPRA) == CatPRA.PRA_WFRM) { 149 Renderer.symbol(feature, Areas.WindFarm, Obj.OSPARE, null );149 Renderer.symbol(feature, Areas.WindFarm, Obj.OSPARE, null, null); 150 150 Renderer.lineVector(feature, new LineStyle(Color.black, 20, new float[] { 40, 40 }, null)); 151 151 if ((zoom >= 15) && (name != null)) … … 213 213 case LAM_PORT: 214 214 if (shape == BcnSHP.BCN_PRCH) 215 Renderer.symbol(feature, Beacons.PerchPort, null, null );215 Renderer.symbol(feature, Beacons.PerchPort, null, null, null); 216 216 else 217 Renderer.symbol(feature, Beacons.WithyPort, null, null );217 Renderer.symbol(feature, Beacons.WithyPort, null, null, null); 218 218 break; 219 219 case LAM_STBD: 220 220 if (shape == BcnSHP.BCN_PRCH) 221 Renderer.symbol(feature, Beacons.PerchStarboard, null, null );221 Renderer.symbol(feature, Beacons.PerchStarboard, null, null, null); 222 222 else 223 Renderer.symbol(feature, Beacons.WithyStarboard, null, null );223 Renderer.symbol(feature, Beacons.WithyStarboard, null, null, null); 224 224 break; 225 225 default: 226 Renderer.symbol(feature, Beacons.Stake, feature.type, null );226 Renderer.symbol(feature, Beacons.Stake, feature.type, null, null); 227 227 } 228 228 } else { 229 Renderer.symbol(feature, Beacons.Shapes.get(shape), feature.type, null );229 Renderer.symbol(feature, Beacons.Shapes.get(shape), feature.type, null, null); 230 230 if (feature.objs.get(Obj.TOPMAR) != null) 231 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), Obj.TOPMAR, Topmarks.Beacons );231 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), Obj.TOPMAR, Topmarks.Beacons, null); 232 232 } 233 233 } 234 234 private static void buoys(Feature feature) { 235 235 BoySHP shape = (BoySHP) Renderer.getAttVal(feature, feature.type, 0, Att.BOYSHP); 236 Renderer.symbol(feature, Buoys.Shapes.get(shape), feature.type, null );236 Renderer.symbol(feature, Buoys.Shapes.get(shape), feature.type, null, null); 237 237 if (feature.objs.get(Obj.TOPMAR) != null) { 238 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), Obj.TOPMAR, Topmarks.Buoys.get(shape) );238 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), Obj.TOPMAR, Topmarks.Buoys.get(shape), null); 239 239 } 240 240 } … … 287 287 switch (feature.type) { 288 288 case LITVES: 289 Renderer.symbol(feature, Buoys.Super, feature.type, null );289 Renderer.symbol(feature, Buoys.Super, feature.type, null, null); 290 290 break; 291 291 case LITFLT: 292 Renderer.symbol(feature, Buoys.Float, feature.type, null );292 Renderer.symbol(feature, Buoys.Float, feature.type, null, null); 293 293 break; 294 294 case BOYINB: 295 Renderer.symbol(feature, Buoys.Super, feature.type, null );295 Renderer.symbol(feature, Buoys.Super, feature.type, null, null); 296 296 break; 297 297 } 298 298 if (feature.objs.get(Obj.TOPMAR) != null) 299 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), Obj.TOPMAR, Topmarks.Floats );299 Renderer.symbol(feature, Topmarks.Shapes.get(feature.objs.get(Obj.TOPMAR).get(0).get(Att.TOPSHP).val), Obj.TOPMAR, Topmarks.Floats, null); 300 300 } 301 301 private static void gauges(Feature feature) { … … 311 311 if (zoom >= 12) { 312 312 if (feature.flag != Fflag.LINE) 313 Renderer.symbol(feature, Harbours.Anchorage, null, null );313 Renderer.symbol(feature, Harbours.Anchorage, null, null, null); 314 314 Renderer.lineSymbols(feature, Areas.Restricted, 1.0, Areas.LineAnchor, 10); 315 315 if ((zoom >= 15) && ((name) != null)) { … … 351 351 if (cats.get(0) == CatLMK.LMK_RADR) 352 352 fncSym = Landmarks.RadioTV; 353 Renderer.symbol(feature, catSym, null, null );354 Renderer.symbol(feature, fncSym, null, null );353 Renderer.symbol(feature, catSym, null, null, null); 354 Renderer.symbol(feature, fncSym, null, null, null); 355 355 /* if (!has_attribute("function") && !has_attribute("category") && has_object("light")) { 356 356 symbol("lighthouse"); … … 371 371 switch (feature.type) { 372 372 case LITMAJ: 373 Renderer.symbol(feature, Beacons.LightMajor, null, null );373 Renderer.symbol(feature, Beacons.LightMajor, null, null, null); 374 374 break; 375 375 case LITMIN: 376 376 case LIGHTS: 377 Renderer.symbol(feature, Beacons.LightMinor, null, null );377 Renderer.symbol(feature, Beacons.LightMinor, null, null, null); 378 378 break; 379 379 } … … 445 445 switch (cat) { 446 446 case MOR_DLPN: 447 Renderer.symbol(feature, Harbours.Dolphin, null, null );447 Renderer.symbol(feature, Harbours.Dolphin, null, null, null); 448 448 break; 449 449 case MOR_DDPN: 450 Renderer.symbol(feature, Harbours.DeviationDolphin, null, null );450 Renderer.symbol(feature, Harbours.DeviationDolphin, null, null, null); 451 451 break; 452 452 case MOR_BLRD: 453 453 case MOR_POST: 454 Renderer.symbol(feature, Harbours.Bollard, null, null );454 Renderer.symbol(feature, Harbours.Bollard, null, null, null); 455 455 break; 456 456 case MOR_BUOY: … … 458 458 if (shape == BoySHP.BOY_UNKN) 459 459 shape = BoySHP.BOY_SPHR; 460 Renderer.symbol(feature, Buoys.Shapes.get(shape), feature.type, null );460 Renderer.symbol(feature, Buoys.Shapes.get(shape), feature.type, null, null); 461 461 break; 462 462 } … … 501 501 CatNMK cat = CatNMK.NMK_UNKN; 502 502 if (atts.get(Att.CATNMK) != null) cat = (CatNMK)atts.get(Att.CATNMK).val; 503 s2 = Notices.getNotice(cat, sys , bnk);503 s2 = Notices.getNotice(cat, sys); 504 504 } 505 505 } … … 689 689 switch (lvl) { 690 690 case LEV_CVRS: 691 Renderer.symbol(feature, Areas.RockC, null, null );691 Renderer.symbol(feature, Areas.RockC, null, null, null); 692 692 break; 693 693 case LEV_AWSH: 694 Renderer.symbol(feature, Areas.RockA, null, null );694 Renderer.symbol(feature, Areas.RockA, null, null, null); 695 695 break; 696 696 default: 697 Renderer.symbol(feature, Areas.Rock, null, null );697 Renderer.symbol(feature, Areas.Rock, null, null, null); 698 698 } 699 699 } else { 700 Renderer.symbol(feature, Areas.Rock, null, null );700 Renderer.symbol(feature, Areas.Rock, null, null, null); 701 701 } 702 702 } … … 713 713 ArrayList<CatOFP> cats = (ArrayList<CatOFP>)Renderer.getAttVal(feature, Obj.OFSPLF, 0, Att.CATOFP); 714 714 if ((CatOFP) cats.get(0) == CatOFP.OFP_FPSO) 715 Renderer.symbol(feature, Buoys.Storage, null, null );715 Renderer.symbol(feature, Buoys.Storage, null, null, null); 716 716 else 717 Renderer.symbol(feature, Landmarks.Platform, null, null );717 Renderer.symbol(feature, Landmarks.Platform, null, null, null); 718 718 AttItem name = feature.atts.get(Att.OBJNAM); 719 719 if ((zoom >= 15) && (name != null)) … … 730 730 if (feature.type == Obj.CRANES) { 731 731 if ((CatCRN) Renderer.getAttVal(feature, feature.type, 0, Att.CATCRN) == CatCRN.CRN_CONT) 732 Renderer.symbol(feature, Harbours.ContainerCrane, null, null );732 Renderer.symbol(feature, Harbours.ContainerCrane, null, null, null); 733 733 else 734 Renderer.symbol(feature, Harbours.PortCrane, null, null );734 Renderer.symbol(feature, Harbours.PortCrane, null, null, null); 735 735 } else if (feature.type == Obj.HULKES) { 736 736 Renderer.lineVector(feature, new LineStyle(Color.black, 4, null, new Color(0xffe000))); … … 790 790 case SISTAT: 791 791 case SISTAW: 792 Renderer.symbol(feature, Harbours.SignalStation, null, null );792 Renderer.symbol(feature, Harbours.SignalStation, null, null, null); 793 793 break; 794 794 case RDOSTA: 795 Renderer.symbol(feature, Harbours.SignalStation, null, null );796 Renderer.symbol(feature, Beacons.RadarStation, null, null );795 Renderer.symbol(feature, Harbours.SignalStation, null, null, null); 796 Renderer.symbol(feature, Beacons.RadarStation, null, null, null); 797 797 ArrayList<CatROS> cats = (ArrayList<CatROS>)Renderer.getAttVal(feature, Obj.RDOSTA, 0, Att.CATROS); 798 798 String str = ""; … … 855 855 case ROS_VANC: 856 856 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 857 Renderer.symbol(feature, Topmarks.TopNorth, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );857 Renderer.symbol(feature, Topmarks.TopNorth, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 858 858 break; 859 859 case ROS_VASC: 860 860 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 861 Renderer.symbol(feature, Topmarks.TopSouth, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );861 Renderer.symbol(feature, Topmarks.TopSouth, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 862 862 break; 863 863 case ROS_VAEC: 864 864 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 865 Renderer.symbol(feature, Topmarks.TopEast, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );865 Renderer.symbol(feature, Topmarks.TopEast, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 866 866 break; 867 867 case ROS_VAWC: 868 868 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 869 Renderer.symbol(feature, Topmarks.TopWest, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );869 Renderer.symbol(feature, Topmarks.TopWest, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 870 870 break; 871 871 case ROS_VAPL: 872 872 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 873 Renderer.symbol(feature, Topmarks.TopCan, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );873 Renderer.symbol(feature, Topmarks.TopCan, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 874 874 break; 875 875 case ROS_VASL: 876 876 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 877 Renderer.symbol(feature, Topmarks.TopCone, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );877 Renderer.symbol(feature, Topmarks.TopCone, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 878 878 break; 879 879 case ROS_VAID: 880 880 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 881 Renderer.symbol(feature, Topmarks.TopIsol, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );881 Renderer.symbol(feature, Topmarks.TopIsol, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 882 882 break; 883 883 case ROS_VASW: 884 884 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 885 Renderer.symbol(feature, Topmarks.TopSphere, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );885 Renderer.symbol(feature, Topmarks.TopSphere, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 886 886 break; 887 887 case ROS_VASP: 888 888 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 889 Renderer.symbol(feature, Topmarks.TopX, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );889 Renderer.symbol(feature, Topmarks.TopX, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 890 890 break; 891 891 case ROS_VAWK: 892 892 Renderer.labelText(feature, " V-AIS", new Font("Arial", Font.PLAIN, 70), Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 180))); 893 Renderer.symbol(feature, Topmarks.TopCross, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)) );893 Renderer.symbol(feature, Topmarks.TopCross, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -25)), null); 894 894 break; 895 895 } … … 898 898 break; 899 899 case RADSTA: 900 Renderer.symbol(feature, Harbours.SignalStation, null, null );901 Renderer.symbol(feature, Beacons.RadarStation, null, null );900 Renderer.symbol(feature, Harbours.SignalStation, null, null, null); 901 Renderer.symbol(feature, Beacons.RadarStation, null, null, null); 902 902 break; 903 903 case PILBOP: 904 Renderer.symbol(feature, Harbours.Pilot, null, null );904 Renderer.symbol(feature, Harbours.Pilot, null, null, null); 905 905 break; 906 906 case CGUSTA: 907 Renderer.symbol(feature, Harbours.SignalStation, null, null );907 Renderer.symbol(feature, Harbours.SignalStation, null, null, null); 908 908 break; 909 909 case RSCSTA: 910 Renderer.symbol(feature, Harbours.Rescue, null, null );910 Renderer.symbol(feature, Harbours.Rescue, null, null, null); 911 911 break; 912 912 } … … 940 940 case WRK_DNGR: 941 941 case WRK_MSTS: 942 Renderer.symbol(feature, Areas.WreckD, null, null );942 Renderer.symbol(feature, Areas.WreckD, null, null, null); 943 943 break; 944 944 case WRK_HULS: 945 Renderer.symbol(feature, Areas.WreckS, null, null );945 Renderer.symbol(feature, Areas.WreckS, null, null, null); 946 946 break; 947 947 default: 948 Renderer.symbol(feature, Areas.WreckND, null, null );948 Renderer.symbol(feature, Areas.WreckND, null, null, null); 949 949 } 950 950 } -
applications/editors/josm/plugins/smed2/src/symbols/Notices.java
r29929 r29992 15 15 import java.awt.Rectangle; 16 16 import java.awt.geom.*; 17 import java.util.ArrayList; 17 18 import java.util.EnumMap; 18 19 … … 1005 1006 } 1006 1007 1007 public static Symbol getNotice(CatNMK cat, MarSYS sys, BnkWTW bank) { 1008 public static Scheme getScheme(MarSYS sys, BnkWTW bank) { 1009 ArrayList<Color> colours = new ArrayList<Color>(); 1010 Scheme scheme = new Scheme(null, colours); 1011 switch (sys) { 1012 case SYS_BNWR: 1013 switch (bank) { 1014 case BWW_LEFT: 1015 colours.add(Color.white); 1016 colours.add(new Color(0xf00000)); 1017 break; 1018 case BWW_RGHT: 1019 colours.add(Color.white); 1020 colours.add(new Color(0x00a000)); 1021 break; 1022 default: 1023 colours.add(new Color(0xff8040)); 1024 colours.add(Color.black); 1025 break; 1026 } 1027 break; 1028 case SYS_PPWB: 1029 switch (bank) { 1030 case BWW_LEFT: 1031 colours.add(Color.white); 1032 colours.add(new Color(0xd40000)); 1033 break; 1034 case BWW_RGHT: 1035 colours.add(Color.white); 1036 colours.add(new Color(0x00d400)); 1037 break; 1038 default: 1039 break; 1040 } 1041 break; 1042 } 1043 return scheme; 1044 } 1045 1046 public static Symbol getNotice(CatNMK cat, MarSYS sys) { 1008 1047 Symbol symbol = null; 1009 1048 switch (sys) {
Note:
See TracChangeset
for help on using the changeset viewer.
