Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefPortButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefPortButton.svg (revision 27404)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefPortButton.svg (revision 27405)
@@ -16,6 +16,6 @@
version="1.1"
inkscape:version="0.47 r22583"
- sodipodi:docname="PrefPortButton.svg"
- inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanSelected_de.png"
+ sodipodi:docname="PrefStbdButton.svg"
+ inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton_de.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
@@ -351,4 +351,165 @@
inkscape:vp_x="0 : 160 : 1"
sodipodi:type="inkscape:persp3d" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ transform="matrix(0.4,0,0,0.4,-35.06138,986.93649)"
+ style="display:inline"
+ inkscape:label="Cone Buoy 3 Band"
+ id="g3714">
+
+
+
+
+
+
+
+
+
-
-
+ transform="translate(0,-60)"
+ id="path7528"
+ d="m 158.51663,177.90266 c -10.20886,-3.42089 -18.72001,-6.26497 -18.91367,-6.32017 -0.29493,-0.0841 -0.17262,-0.23098 0.75322,-0.90466 6.42523,-4.6753 13.41958,-7.23788 22.16288,-8.12002 l 0.99723,-0.10061 1.71218,1.6204 c 4.96711,4.70087 8.97702,10.99941 11.13903,17.49658 0.45404,1.36444 0.79968,2.49599 0.7681,2.51455 -0.0316,0.0186 -8.41012,-2.76517 -18.61897,-6.18607 z"
+ style="fill:none;stroke:#000000;stroke-width:0.17677669;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ transform="translate(0,-60)"
+ id="path7530"
+ d="m 123.24968,196.95735 c 0,-0.39927 1.29553,-4.79875 1.86415,-6.33044 0.73144,-1.97028 2.47717,-5.55025 3.60847,-7.39989 0.9254,-1.51297 3.34337,-4.86148 3.51016,-4.86101 0.0667,1.9e-4 10.5422,3.49154 23.27896,7.75857 l 23.15775,7.75822 0,1.5664 0,1.56641 -8.16113,0.0459 -8.16113,0.046 -0.30173,-0.92984 c -0.81943,-2.52528 -2.80031,-5.13489 -5.03868,-6.63791 -5.6791,-3.81343 -13.40367,-2.2805 -17.36975,3.44698 -0.5736,0.82835 -1.70928,3.35371 -1.71245,3.8079 -0.002,0.28962 -0.47018,0.30936 -7.33839,0.30936 -4.03493,0 -7.33623,-0.066 -7.33623,-0.14665 z"
+ style="fill:none;stroke:#000000;stroke-width:0.17677669;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-
+ transform="translate(0,-60)"
+ id="path7532"
+ d="m 155.65165,185.10701 c -12.36796,-4.15306 -22.5351,-7.59893 -22.59366,-7.65748 -0.12569,-0.12569 3.34138,-3.65299 4.55754,-4.63671 l 0.84243,-0.68143 19.3985,6.49887 c 10.66917,3.57437 19.45531,6.54931 19.52474,6.61097 0.18448,0.16383 0.64812,2.47085 0.94296,4.69207 0.31363,2.36277 0.31874,2.75501 0.0357,2.738 -0.12153,-0.007 -10.34021,-3.41123 -22.70816,-7.56429 l 0,0 z"
+ style="fill:none;stroke:#000000;stroke-width:0.17677669;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+
+ d="m 28.216727,1033.9876 -7.394882,-2.4701 0.16274,-0.1336 c 0.221873,-0.1822 1.154587,-0.8048 1.59131,-1.0623 1.271272,-0.7495 2.921003,-1.4126 4.464286,-1.7943 1.131268,-0.2797 2.988779,-0.5596 3.261033,-0.4912 0.171331,0.043 1.586755,1.4828 2.144245,2.1811 1.134134,1.4207 2.047253,2.9844 2.676491,4.5833 0.303689,0.7718 0.589574,1.6691 0.529481,1.662 -0.0219,0 -3.367519,-1.1163 -7.434704,-2.4749 l 0,0 z"
+ id="path6297" />
-
+ style="fill:#00d400;fill-opacity:1;stroke:none;display:inline"
+ d="m 14.5253,1041.6622 c -0.106399,-0.013 -0.193452,-0.048 -0.193452,-0.077 0,-0.1302 0.623318,-2.103 0.835454,-2.6441 0.331941,-0.8468 1.049605,-2.247 1.519224,-2.9642 0.525779,-0.803 1.112446,-1.5905 1.186988,-1.5934 0.03274,0 4.204611,1.3846 9.270828,3.0796 l 9.211304,3.0819 6e-6,0.5804 5e-6,0.5803 -3.216153,0 c -3.010453,0 -3.218315,-0.01 -3.249937,-0.1042 -0.604293,-1.8633 -1.945112,-3.1513 -3.772005,-3.6234 -0.585914,-0.1515 -1.673535,-0.1381 -2.351191,0.029 -1.65576,0.4078 -2.943138,1.5472 -3.551691,3.1435 -0.135626,0.3557 -0.219104,0.4954 -0.310906,0.52 -0.139322,0.037 -5.071947,0.03 -5.378474,-0.01 z"
+ id="path6809" />
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton.svg (revision 27404)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton.svg (revision 27405)
@@ -16,6 +16,6 @@
version="1.1"
inkscape:version="0.47 r22583"
- sodipodi:docname="PrefStbdButton.svg"
- inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton_de.png"
+ sodipodi:docname="PrefPortButton.svg"
+ inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanSelected_de.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
@@ -351,165 +351,4 @@
inkscape:vp_x="0 : 160 : 1"
sodipodi:type="inkscape:persp3d" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ transform="matrix(0.4,0,0,0.4,-35.302351,987.50542)"
+ id="g4867"
+ inkscape:label="Can Buoy 3 Band"
+ style="display:inline">
+ style="fill:#000407;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ d="m 22.3125,3.78125 -6.09375,18.28125 -3.1875,0 0,2.28125 11.875,0 c 0.514928,2.21318 2.505808,3.843746 4.875,3.84375 2.36998,0 4.32963,-1.629458 4.84375,-3.84375 l 11.9375,0 0,-0.03125 0,-2.25 -3.0625,0 L 47.09375,11.59375 35.125,7.8125 33.53125,7.3125 22.3125,3.78125 z m 2,3.4375 18.875,6.40625 -2.90625,8.4375 -5.65625,0 c -0.51412,-2.214292 -2.47377,-3.84375 -4.84375,-3.84375 -2.369192,4e-6 -4.360072,1.63057 -4.875,3.84375 l -5.5,0 4.90625,-14.84375 z m 5.46875,12.96875 c 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3 -1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 z"
+ transform="matrix(2.5,0,0,2.5,75.607067,81.993125)"
+ id="path4869"
+ sodipodi:nodetypes="cccccscccccccccccccsccccsssc" />
+
+
+ id="path5563"
+ d="m 165.46613,128.93882 c -6.60225,-2.21512 -17.10346,-5.73888 -23.33602,-7.83058 l -11.33192,-3.80309 1.11599,-3.44304 c 0.61379,-1.89367 1.12847,-3.45785 1.14374,-3.47596 0.0308,-0.0365 46.85669,15.62169 46.92707,15.69207 0.0849,0.0849 -2.26697,6.83654 -2.39036,6.86221 -0.0684,0.0142 -5.52624,-1.78649 -12.1285,-4.00161 z"
+ style="fill:none;stroke:none" />
+ id="path5565"
+ d="m 156.82069,117.41803 c -12.86242,-4.3118 -23.40489,-7.85574 -23.42771,-7.87543 -0.0314,-0.0271 2.94008,-9.18881 3.03531,-9.35852 0.0348,-0.062 46.76082,15.78383 46.8757,15.89662 0.10724,0.10529 -2.90186,9.21699 -3.03487,9.18972 -0.0342,-0.007 -10.586,-3.54059 -23.44843,-7.85239 z"
+ style="fill:none;stroke:none" />
+
+
+ d="m 27.3891,1034.4533 -9.353463,-3.1367 0.604244,-1.8396 c 0.332334,-1.0118 0.631965,-1.8489 0.665845,-1.8602 0.05292,-0.018 18.597067,6.2468 18.723812,6.3251 0.02542,0.016 -0.204817,0.7577 -0.511636,1.649 -0.705594,2.0495 -0.690347,2.008 -0.73652,2.0032 -0.02135,0 -4.247878,-1.4156 -9.392282,-3.1408 l 0,0 z"
+ id="path5504" />
-
+ style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
+ d="m 14.392817,1042.3458 c 7.95e-4,-0.01 0.559484,-1.703 1.241533,-3.7655 0.900042,-2.7217 1.262812,-3.7457 1.322959,-3.7342 0.04558,0.01 4.264003,1.4136 9.374273,3.122 l 9.291401,3.1063 -0.212369,0.6428 -0.212369,0.6429 -2.802898,0 -2.802898,0 -0.07887,-0.3078 c -0.04338,-0.1692 -0.194403,-0.5385 -0.33561,-0.8206 -1.147805,-2.2928 -3.884882,-3.3245 -6.324255,-2.3838 -1.304455,0.5031 -2.433864,1.6815 -2.879297,3.0043 l -0.161002,0.4781 -2.711022,0.015 c -1.491061,0.01 -2.710371,0.01 -2.709576,0 l 0,0 z"
+ id="path6016" />
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27404)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27405)
@@ -7,7 +7,7 @@
Port=Port hand marks
Stbd=Starboard hand marks
-PrefPort=Preferred Port hand marks
-PrefStbd=Preferred Starboard hand marks
-SafeWater=Safe Water marks
+PrefPort=Preferred port channel marks
+PrefStbd=Preferred starboard channel marks
+SafeWater=Safe water marks
North=North cardinal marks
South=South cardinal marks
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27404)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27405)
@@ -3,11 +3,11 @@
Chan=Lateral & Safe Water marks
Haz=Cardinal & Isolated Danger marks
-Spec=Special Purpose marks
+Spec=Special purpose marks
Lights=Lights marks
Port=Port hand marks
Stbd=Starboard hand marks
-PrefPort=Preferred Port hand marks
-PrefStbd=Preferred Starboard hand marks
-SafeWater=Safe Water marks
+PrefPort=Preferred port channel marks
+PrefStbd=Preferred starboard channel marks
+SafeWater=Safe water marks
North=North cardinal marks
South=South cardinal marks
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27404)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27405)
@@ -20,6 +20,6 @@
public JRadioButton portButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PortButton.png")));
public JRadioButton stbdButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StbdButton.png")));
+ public JRadioButton prefStbdButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PrefStbdButton.png")));
public JRadioButton prefPortButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PrefPortButton.png")));
- public JRadioButton prefStbdButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PrefStbdButton.png")));
public JRadioButton safeWaterButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SafeWaterButton.png")));
private ActionListener alCat = new ActionListener() {
@@ -47,18 +47,4 @@
portButton.setBorderPainted(false);
}
- if (prefPortButton.isSelected()) {
- dlg.panelMain.mark.setCategory(Cat.LAM_PPORT);
- if (panelPort.shapes.containsKey(shp)) {
- panelPort.shapes.get(shp).setSelected(true);
- } else {
- panelPort.shapeButtons.clearSelection();
- dlg.panelMain.mark.setShape(Shp.UNKSHP);
- }
- panelPort.alShape.actionPerformed(null);
- panelPort.setVisible(true);
- prefPortButton.setBorderPainted(true);
- } else {
- prefPortButton.setBorderPainted(false);
- }
if (stbdButton.isSelected()) {
dlg.panelMain.mark.setCategory(Cat.LAM_STBD);
@@ -77,4 +63,18 @@
if (prefStbdButton.isSelected()) {
dlg.panelMain.mark.setCategory(Cat.LAM_PSTBD);
+ if (panelPort.shapes.containsKey(shp)) {
+ panelPort.shapes.get(shp).setSelected(true);
+ } else {
+ panelPort.shapeButtons.clearSelection();
+ dlg.panelMain.mark.setShape(Shp.UNKSHP);
+ }
+ panelPort.alShape.actionPerformed(null);
+ panelPort.setVisible(true);
+ prefStbdButton.setBorderPainted(true);
+ } else {
+ prefStbdButton.setBorderPainted(false);
+ }
+ if (prefPortButton.isSelected()) {
+ dlg.panelMain.mark.setCategory(Cat.LAM_PPORT);
if (panelStbd.shapes.containsKey(shp)) {
panelStbd.shapes.get(shp).setSelected(true);
@@ -85,7 +85,7 @@
panelStbd.alShape.actionPerformed(null);
panelStbd.setVisible(true);
- prefStbdButton.setBorderPainted(true);
- } else {
- prefStbdButton.setBorderPainted(false);
+ prefPortButton.setBorderPainted(true);
+ } else {
+ prefPortButton.setBorderPainted(false);
}
if (safeWaterButton.isSelected()) {
@@ -231,6 +231,6 @@
add(getCatButton(portButton, 0, 0, 52, 32, "Port"));
add(getCatButton(stbdButton, 0, 32, 52, 32, "Stbd"));
- add(getCatButton(prefPortButton, 0, 64, 52, 32, "PrefPort"));
- add(getCatButton(prefStbdButton, 0, 96, 52, 32, "PrefStbd"));
+ add(getCatButton(prefStbdButton, 0, 64, 52, 32, "PrefStbd"));
+ add(getCatButton(prefPortButton, 0, 96, 52, 32, "PrefPort"));
add(getCatButton(safeWaterButton, 0, 128, 52, 32, "SafeWater"));
@@ -260,5 +260,5 @@
}
if (dlg.panelMain.mark.getCategory() == Cat.LAM_PPORT) {
- panelPort.setVisible(true);
+ panelStbd.setVisible(true);
prefPortButton.setBorderPainted(true);
} else {
@@ -272,5 +272,5 @@
}
if (dlg.panelMain.mark.getCategory() == Cat.LAM_PSTBD) {
- panelStbd.setVisible(true);
+ panelPort.setVisible(true);
prefStbdButton.setBorderPainted(true);
} else {
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java (revision 27404)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java (revision 27405)
@@ -182,4 +182,5 @@
regionCButton.setBorderPainted(false);
}
+ panelPat.syncPanel();
}
};
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27404)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27405)
@@ -1432,8 +1432,8 @@
setRegion(Reg.C);
else
- setRegion(Reg.A);
+ setRegion(Reg.B);
}
if (getObjColour(0) == Col.GREEN)
- setRegion(Reg.B);
+ setRegion(Reg.A);
break;
case LAM_STBD:
@@ -1449,10 +1449,10 @@
case LAM_PSTBD:
if (getObjColour(0) == Col.GREEN)
- setRegion(Reg.A);
+ setRegion(Reg.B);
if (getObjColour(0) == Col.RED) {
if (getObjColour(3) == Col.GREEN)
setRegion(Reg.C);
else
- setRegion(Reg.B);
+ setRegion(Reg.A);
}
break;