Changeset 27941 in osm
- Timestamp:
- 2012-02-26T20:59:47+01:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
r27405 r27941 120 120 switch (dlg.panelMain.mark.getCategory()) { 121 121 case LAM_PORT: 122 case LAM_P PORT:123 dlg.panelMain.mark.setTopmark(Top.C AN);122 case LAM_PSTBD: 123 dlg.panelMain.mark.setTopmark(Top.CYL); 124 124 switch (dlg.panelMain.mark.getRegion()) { 125 125 case A: … … 132 132 break; 133 133 case C: 134 dlg.panelMain.mark.setTopPattern(Pat.HSTRP); 135 dlg.panelMain.mark.setTopColour(Col.RED); 136 dlg.panelMain.mark.addTopColour(Col.WHITE); 134 if (dlg.panelMain.mark.getCategory() == Cat.LAM_PORT) { 135 dlg.panelMain.mark.setTopPattern(Pat.HSTRP); 136 dlg.panelMain.mark.setTopColour(Col.RED); 137 dlg.panelMain.mark.addTopColour(Col.WHITE); 138 } else { 139 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 140 dlg.panelMain.mark.setTopColour(Col.RED); 141 } 137 142 break; 138 143 } 139 144 break; 140 145 case LAM_STBD: 141 case LAM_P STBD:146 case LAM_PPORT: 142 147 dlg.panelMain.mark.setTopmark(Top.CONE); 143 148 switch (dlg.panelMain.mark.getRegion()) { … … 151 156 break; 152 157 case C: 153 dlg.panelMain.mark.setTopPattern(Pat.HSTRP); 154 dlg.panelMain.mark.setTopColour(Col.GREEN); 155 dlg.panelMain.mark.addTopColour(Col.WHITE); 158 if (dlg.panelMain.mark.getCategory() == Cat.LAM_STBD) { 159 dlg.panelMain.mark.setTopPattern(Pat.HSTRP); 160 dlg.panelMain.mark.setTopColour(Col.GREEN); 161 dlg.panelMain.mark.addTopColour(Col.WHITE); 162 } else { 163 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 164 dlg.panelMain.mark.setTopColour(Col.GREEN); 165 } 156 166 break; 157 167 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java
r27423 r27941 272 272 addCnsItem(Messages.getString("Wooden"), Cns.WOOD); 273 273 addCnsItem(Messages.getString("Metal"), Cns.METAL); 274 addCnsItem(Messages.getString("GRP"), Cns.G RP);274 addCnsItem(Messages.getString("GRP"), Cns.GLAS); 275 275 addCnsItem(Messages.getString("Painted"), Cns.PAINT); 276 276 add(constrBox); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java
r27423 r27941 53 53 add(panelPat); 54 54 add(getTopButton(noTopButton, 0, 5, 27, 27, "NoTop", Top.NOTOP)); 55 add(getTopButton(canTopButton, 30, 5, 27, 27, "CanTop", Top.C AN));55 add(getTopButton(canTopButton, 30, 5, 27, 27, "CanTop", Top.CYL)); 56 56 add(getTopButton(coneTopButton, 60, 5, 27, 27, "ConeTop", Top.CONE)); 57 57 add(getTopButton(sphereTopButton, 90, 5, 27, 27, "SphereTop", Top.SPHERE)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
r27610 r27941 773 773 774 774 public enum Top { 775 NOTOP, C AN, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, BOARD, RHOMBUS, CIRCLE, TRIANGLE, TRIANGLE_INV, SQUARE775 NOTOP, CYL, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, BOARD, RHOMBUS, CIRCLE, TRIANGLE, TRIANGLE_INV, SQUARE 776 776 } 777 777 778 778 public static final EnumMap<Top, String> TopSTR = new EnumMap<Top, String>(Top.class); 779 779 static { 780 TopSTR.put(Top.C AN, "cylinder");780 TopSTR.put(Top.CYL, "cylinder"); 781 781 TopSTR.put(Top.CONE, "cone, point up"); 782 782 TopSTR.put(Top.SPHERE, "sphere"); … … 1016 1016 1017 1017 public enum Cns { 1018 UNKCNS, BRICK, CONC, BOULD, HSURF, USURF, WOOD, METAL, G RP, PAINT1018 UNKCNS, BRICK, CONC, BOULD, HSURF, USURF, WOOD, METAL, GLAS, PAINT 1019 1019 } 1020 1020 … … 1028 1028 CnsSTR.put(Cns.WOOD, "wooden"); 1029 1029 CnsSTR.put(Cns.METAL, "metal"); 1030 CnsSTR.put(Cns.G RP, "grp");1030 CnsSTR.put(Cns.GLAS, "grp"); 1031 1031 CnsSTR.put(Cns.PAINT, "painted"); 1032 1032 } … … 2021 2021 imgStr = "/images/Top_"; 2022 2022 switch (getTopmark()) { 2023 case C AN:2023 case CYL: 2024 2024 imgStr += "Can"; 2025 2025 break;
Note:
See TracChangeset
for help on using the changeset viewer.