Changeset 27461 in osm for applications/editors/josm/plugins/smed
- Timestamp:
- 2012-01-15T11:17:56+01:00 (12 years ago)
- Location:
- applications/editors/josm/plugins/smed
- Files:
-
- 4 edited
-
build.xml (modified) (1 diff)
-
plugs/oseam/src/oseam/dialogs/OSeaMAction.java (modified) (2 diffs)
-
plugs/oseam/src/oseam/panels/PanelSpec.java (modified) (5 diffs)
-
plugs/oseam/src/oseam/seamarks/SeaMark.java (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/build.xml
r27440 r27461 30 30 <project name="SeaMapEditor" basedir="."> 31 31 <!-- enter the SVN commit message --> 32 <property name="commit.message" value=" some new internationalized messages"/>32 <property name="commit.message" value="New release"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 34 <property name="plugin.main.version" value="4549"/> -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java
r27203 r27461 39 39 } else { 40 40 node = null; 41 panelMain.mark.cl earSign();41 panelMain.mark.clrMark(); 42 42 manager.showVisualMessage(Messages.getString("OneNode")); 43 43 } … … 46 46 if (nextNode == null) { 47 47 node = null; 48 panelMain.mark.cl earSign();48 panelMain.mark.clrMark(); 49 49 manager.showVisualMessage(Messages.getString("SelectNode")); 50 50 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
r27439 r27461 38 38 if ((cat == Cat.INB_CALM) || (cat == Cat.INB_SBM)) { 39 39 dlg.panelMain.mark.setObject(Obj.BOYINB); 40 dlg.panelMain.mark.setShape(Shp.UNKSHP); 40 41 } else { 41 42 dlg.panelMain.mark.setObject(Obj.MORFAC); 43 if (cat != Cat.MOR_BUOY) 44 dlg.panelMain.mark.setShape(Shp.UNKSHP); 42 45 } 43 46 } … … 63 66 public ActionListener alShape = new ActionListener() { 64 67 public void actionPerformed(java.awt.event.ActionEvent e) { 65 for (Shp shp : shapes.keySet()) { 66 JRadioButton button = shapes.get(shp); 67 if (button.isSelected()) { 68 dlg.panelMain.mark.setShape(shp); 69 if (SeaMark.EntMAP.get(dlg.panelMain.mark.getObject()) != Ent.MOORING) { 70 dlg.panelMain.mark.setObject(objects.get(shp)); 71 if (dlg.panelMain.mark.getObjColour(0) == Col.UNKCOL) { 72 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 73 dlg.panelMain.mark.setObjColour(Col.YELLOW); 68 if ((dlg.panelMain.mark.getObject() != Obj.MORFAC) || (dlg.panelMain.mark.getCategory() == Cat.MOR_BUOY)) { 69 for (Shp shp : shapes.keySet()) { 70 JRadioButton button = shapes.get(shp); 71 if (button.isSelected()) { 72 dlg.panelMain.mark.setShape(shp); 73 if (SeaMark.EntMAP.get(dlg.panelMain.mark.getObject()) != Ent.MOORING) { 74 dlg.panelMain.mark.setObject(objects.get(shp)); 75 if (dlg.panelMain.mark.getObjColour(0) == Col.UNKCOL) { 76 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 77 dlg.panelMain.mark.setObjColour(Col.YELLOW); 78 } 79 if (button == cairnButton) { 80 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 81 dlg.panelMain.mark.setObjColour(Col.UNKCOL); 82 } 83 topmarkButton.setVisible(dlg.panelMain.mark.testValid()); 74 84 } 75 if (button == cairnButton) { 76 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 77 dlg.panelMain.mark.setObjColour(Col.UNKCOL); 78 } 79 topmarkButton.setVisible(dlg.panelMain.mark.testValid()); 80 } 81 button.setBorderPainted(true); 82 } else 83 button.setBorderPainted(false); 84 } 85 dlg.panelMain.panelMore.syncPanel(); 85 button.setBorderPainted(true); 86 } else 87 button.setBorderPainted(false); 88 } 89 dlg.panelMain.panelMore.syncPanel(); 90 } 86 91 } 87 92 }; … … 110 115 dlg.panelMain.mark.setTopmark(Top.NOTOP); 111 116 if (mooringButton.isSelected()) { 117 dlg.panelMain.mark.setObject(Obj.MORFAC); 112 118 categoryBox.setVisible(false); 113 119 mooringBox.setVisible(true); 120 pillarButton.setEnabled(false); 121 sparButton.setEnabled(false); 122 beaconButton.setEnabled(false); 123 towerButton.setEnabled(false); 124 stakeButton.setEnabled(false); 125 cairnButton.setEnabled(false); 114 126 mooringButton.setBorderPainted(true); 115 127 } else { 116 128 mooringBox.setVisible(false); 117 129 categoryBox.setVisible(true); 130 pillarButton.setEnabled(true); 131 sparButton.setEnabled(true); 132 beaconButton.setEnabled(true); 133 towerButton.setEnabled(true); 134 stakeButton.setEnabled(true); 135 cairnButton.setEnabled(true); 118 136 mooringButton.setBorderPainted(false); 119 137 } 138 syncPanel(); 120 139 } 121 140 }; … … 199 218 categoryBox.setVisible(false); 200 219 mooringBox.setVisible(true); 220 pillarButton.setEnabled(false); 221 sparButton.setEnabled(false); 222 beaconButton.setEnabled(false); 223 towerButton.setEnabled(false); 224 stakeButton.setEnabled(false); 225 cairnButton.setEnabled(false); 201 226 topmarkButton.setVisible(false); 202 227 for (Cat cat : moorings.keySet()) { … … 209 234 mooringBox.setVisible(false); 210 235 categoryBox.setVisible(true); 236 pillarButton.setEnabled(true); 237 sparButton.setEnabled(true); 238 beaconButton.setEnabled(true); 239 towerButton.setEnabled(true); 240 stakeButton.setEnabled(true); 241 cairnButton.setEnabled(true); 211 242 topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP); 212 243 topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
r27445 r27461 120 120 setColour(Ent.TOPMARK, Col.UNKCOL); 121 121 setPattern(Ent.TOPMARK, Pat.NOPAT); 122 setFogSound(Fog.NOFOG);123 setRadar(Rtb.NORTB);124 setStatus(Sts.UNKSTS);125 setConstr(Cns.UNKCNS);126 setConsp(Con.UNKCON);127 setRefl(Con.UNKCON);128 setRef("");129 setObjectHeight("");130 setElevation("");131 setChannel("");132 setInfo("");133 setSource("");134 setFixme("");135 122 } 136 123 repaint(); … … 1236 1223 } 1237 1224 1238 public void clearSign() { 1225 public void clrMark() { 1226 setName(""); 1239 1227 setObject(Obj.UNKOBJ); 1240 setName("");1241 1228 clrLight(); 1229 setFogSound(Fog.NOFOG); 1230 setRadar(Rtb.NORTB); 1231 setStatus(Sts.UNKSTS); 1232 setConstr(Cns.UNKCNS); 1233 setConsp(Con.UNKCON); 1234 setRefl(Con.UNKCON); 1235 setRef(""); 1236 setObjectHeight(""); 1237 setElevation(""); 1238 setChannel(""); 1239 setInfo(""); 1240 setSource(""); 1241 setFixme(""); 1242 1242 dlg.panelMain.syncPanel(); 1243 1243 repaint(); … … 1282 1282 str = keys.get("seamark:type"); 1283 1283 1284 setObject(Obj.UNKOBJ);1284 clrMark(); 1285 1285 for (Obj obj : ObjSTR.keySet()) { 1286 1286 if (ObjSTR.get(obj).equals(str)) { … … 2134 2134 case BARREL: 2135 2135 imgStr += "_Buoy_Small"; 2136 break;2137 case PILLAR:2138 case SPAR:2139 imgStr += "_Buoy";2140 2136 break; 2141 2137 case FLOAT:
Note:
See TracChangeset
for help on using the changeset viewer.
