Changeset 26925 in osm
- Timestamp:
- 2011-10-22T19:51:37+02:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
r26881 r26925 2 2 3 3 import javax.swing.*; 4 4 5 import java.awt.*; 5 6 import java.awt.event.*; … … 90 91 if (safeWaterButton.isSelected()) { 91 92 dlg.mark.setCategory(Cat.UNKNOWN); 92 dlg.mark.setColour(Ent.BODY, Col.RED);93 dlg.mark.addColour(Ent.BODY, Col.WHITE);94 dlg.mark.setPattern(Ent.BODY, Pat.VERT);95 93 if (panelSaw.shapes.containsKey(shp)) { 96 94 panelSaw.shapes.get(shp).doClick(); … … 107 105 } 108 106 }; 107 public JToggleButton topmarkButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/ChanTopButton.png"))); 108 private ActionListener alTop = new ActionListener() { 109 public void actionPerformed(java.awt.event.ActionEvent e) { 110 if (topmarkButton.isSelected()) { 111 topmarkButton.setBorderPainted(true); 112 } else { 113 // dlg.panelMain.panelTop.clearSelections(); 114 topmarkButton.setBorderPainted(false); 115 } 116 } 117 }; 109 118 110 119 public PanelChan(OSeaMAction dia) { 111 120 dlg = dia; 112 121 panelPort = new PanelPort(dlg); 113 panelPort.setBounds(new Rectangle(55, 0, 180, 160));122 panelPort.setBounds(new Rectangle(55, 0, 70, 160)); 114 123 panelPort.setVisible(false); 115 124 panelStbd = new PanelStbd(dlg); 116 panelStbd.setBounds(new Rectangle(55, 0, 180, 160));125 panelStbd.setBounds(new Rectangle(55, 0, 70, 160)); 117 126 panelStbd.setVisible(false); 118 127 panelSaw = new PanelSaw(dlg); 119 panelSaw.setBounds(new Rectangle(55, 0, 180, 160));128 panelSaw.setBounds(new Rectangle(55, 0, 70, 160)); 120 129 panelSaw.setVisible(false); 121 130 this.setLayout(null); … … 128 137 this.add(getCatButton(prefStbdButton, 0, 96, 52, 32, "PrefStbd"), null); 129 138 this.add(getCatButton(safeWaterButton, 0, 128, 52, 32, "SafeWater"), null); 139 140 topmarkButton.setBounds(new Rectangle(130, 0, 34, 32)); 141 topmarkButton.setBorder(BorderFactory.createLoweredBevelBorder()); 142 topmarkButton.addActionListener(alTop); 143 topmarkButton.setVisible(false); 144 this.add(topmarkButton); 130 145 } 131 146 132 147 public void clearSelections() { 148 topmarkButton.setSelected(false); 149 topmarkButton.setVisible(false); 150 alTop.actionPerformed(null); 133 151 catButtons.clearSelection(); 134 152 alCat.actionPerformed(null); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java
r26881 r26925 39 39 public void actionPerformed(java.awt.event.ActionEvent e) { 40 40 if (noneButton.isSelected()) { 41 if (dlg.panelMain.panelLit.panelCol. offButton.isSelected()) {41 if (dlg.panelMain.panelLit.panelCol.delButton.isSelected()) { 42 42 dlg.panelMain.lightIcon.setIcon(null); 43 43 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java
r26908 r26925 19 19 private Ent ent; 20 20 private ButtonGroup colourButtons = new ButtonGroup(); 21 public JRadioButton offButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png")));21 public JRadioButton delButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); 22 22 public JRadioButton addButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/AddButton.png"))); 23 23 public JRadioButton whiteButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WhiteButton.png"))); … … 44 44 dlg.mark.setColour(ent, col); 45 45 } else { 46 if (button == offButton) {47 if (stackCol.size() != 0) {46 if (button == delButton) { 47 if (stackCol.size() > 1) { 48 48 JRadioButton btnI = stackCol.get(stackIdx); 49 49 dlg.mark.subColour(ent, stackIdx); … … 52 52 stack.remove(btnI); 53 53 stackCol.remove(stackIdx); 54 if ( (stackCol.size() == stackIdx) && (stackIdx != 0))54 if (stackCol.size() == stackIdx) 55 55 stackIdx--; 56 } else { 57 dlg.mark.setColour(Ent.BODY, Col.UNKNOWN); 56 58 } 57 59 } else if (button == addButton) { 58 if (stackCol.size() != 0) stackIdx++; 60 if (stackCol.size() != 0) 61 stackIdx++; 59 62 dlg.mark.addColour(ent, stackIdx, col); 60 63 stackCol.add(stackIdx, new JRadioButton(new ImageIcon(getClass().getResource("/images/ColourButton.png")))); … … 67 70 dlg.mark.setColour(ent, stackIdx, col); 68 71 } 69 if (stackCol.size() != 0) { 70 int height = 60 / stackCol.size(); 71 for (int i = 0; stackCol.size() > i; i++) { 72 JRadioButton btnI = stackCol.get(i); 73 btnI.setBounds(2, (2 + (i * height)), 30, height); 74 btnI.setBackground(dlg.mark.ColMAP.get(dlg.mark.getColour(ent, i))); 75 if (stackIdx == i) { 76 btnI.setBorderPainted(true); 77 } else { 78 btnI.setBorderPainted(false); 79 } 72 int height = 60 / stackCol.size(); 73 for (int i = 0; stackCol.size() > i; i++) { 74 JRadioButton btnI = stackCol.get(i); 75 btnI.setBounds(2, (2 + (i * height)), 30, height); 76 btnI.setBackground(dlg.mark.ColMAP.get(dlg.mark.getColour(ent, i))); 77 if (stackIdx == i) { 78 btnI.setBorderPainted(true); 79 } else { 80 btnI.setBorderPainted(false); 80 81 } 81 } else {82 stack.repaint();83 82 } 84 83 } … … 113 112 ent = entity; 114 113 this.setLayout(null); 115 this.add(getColButton( offButton, 0, 0, 34, 16, Messages.getString("RemColour"), Col.UNKNOWN), null);114 this.add(getColButton(delButton, 0, 0, 34, 16, Messages.getString("RemColour"), Col.UNKNOWN), null); 116 115 this.add(getColButton(whiteButton, 0, 16, 34, 16, Messages.getString("White"), Col.WHITE), null); 117 116 this.add(getColButton(redButton, 0, 32, 34, 16, Messages.getString("Red"), Col.RED), null); … … 135 134 stack.setLayout(null); 136 135 this.add(stack); 137 if (dlg.mark != null) { 138 for (int i = 0; dlg.mark.getColour(ent, i) != Col.UNKNOWN; i++) { 139 stackCol.add(new JRadioButton()); 140 } 141 } 136 } 137 } 138 139 public void trimStack(int max) { 140 while (stackCol.size() > max) { 141 stackCol.get(stackCol.size() - 1).setSelected(true); 142 delButton.doClick(); 142 143 } 143 144 } … … 145 146 public void clearSelections() { 146 147 colourButtons.clearSelection(); 147 offButton.doClick(); 148 if (stackCol.size() == 0) { 149 addButton.doClick(); 150 } 151 do { 152 delButton.doClick(); 153 } while (stackCol.size() > 1); 154 alStack.actionPerformed(null); 148 155 } 149 156 -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java
r26881 r26925 3 3 import java.awt.event.*; 4 4 import java.awt.*; 5 5 6 import javax.swing.*; 7 6 8 import java.util.*; 7 9 … … 120 122 } 121 123 }; 124 public JToggleButton topmarkButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/HazTopButton.png"))); 125 private ActionListener alTop = new ActionListener() { 126 public void actionPerformed(java.awt.event.ActionEvent e) { 127 if (topmarkButton.isSelected()) { 128 topmarkButton.setBorderPainted(true); 129 } else { 130 topmarkButton.setBorderPainted(false); 131 } 132 } 133 }; 122 134 123 135 public PanelHaz(OSeaMAction dia) { … … 138 150 this.add(getShapeButton(beaconButton, 90, 32, 34, 32, "Beacon", Shp.BEACON, Obj.BCNCAR, Obj.BCNISD), null); 139 151 this.add(getShapeButton(towerButton, 90, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNCAR, Obj.BCNISD), null); 152 153 topmarkButton.setBounds(new Rectangle(130, 0, 34, 32)); 154 topmarkButton.setBorder(BorderFactory.createLoweredBevelBorder()); 155 topmarkButton.addActionListener(alTop); 156 this.add(topmarkButton); 140 157 } 141 158 142 159 public void clearSelections() { 160 topmarkButton.setSelected(false); 161 alTop.actionPerformed(null); 143 162 catButtons.clearSelection(); 144 163 alCat.actionPerformed(null); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java
r26908 r26925 225 225 alName = new ActionListener() { 226 226 public void actionPerformed(java.awt.event.ActionEvent e) { 227 if (dlg.mark == null) 228 return; 229 else 230 dlg.mark.setName(nameBox.getText().trim()); 227 if (dlg.mark != null) 228 dlg.mark.setName(nameBox.getText()); 231 229 } 232 230 }; … … 285 283 286 284 public void clearSelections() { 285 panelMore.clearSelections(); 287 286 typeButtons.clearSelection(); 287 alType.actionPerformed(null); 288 288 moreButton.setVisible(false); 289 alType.actionPerformed(null);290 289 nameBox.setText(""); 290 alName.actionPerformed(null); 291 291 clearType(); 292 292 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java
r26908 r26925 21 21 private ActionListener alInfo = new ActionListener() { 22 22 public void actionPerformed(java.awt.event.ActionEvent e) { 23 if (dlg.mark == null) 24 return; 25 else 26 dlg.mark.setInfo(infoBox.getText().trim()); 23 if (dlg.mark != null) 24 dlg.mark.setInfo(infoBox.getText()); 27 25 } 28 26 }; … … 31 29 private ActionListener alSource = new ActionListener() { 32 30 public void actionPerformed(java.awt.event.ActionEvent e) { 33 if (dlg.mark == null) 34 return; 35 else 36 dlg.mark.setSource(sourceBox.getText().trim()); 31 if (dlg.mark != null) 32 dlg.mark.setSource(sourceBox.getText()); 37 33 } 38 34 }; … … 41 37 private ActionListener alElev = new ActionListener() { 42 38 public void actionPerformed(java.awt.event.ActionEvent e) { 43 if (dlg.mark == null)44 return;39 if (dlg.mark != null) 40 dlg.mark.setElevation(elevBox.getText()); 45 41 } 46 42 }; … … 49 45 private ActionListener alHeight = new ActionListener() { 50 46 public void actionPerformed(java.awt.event.ActionEvent e) { 51 if (dlg.mark == null)52 return;47 if (dlg.mark != null) 48 dlg.mark.setHeight(heightBox.getText()); 53 49 } 54 50 }; … … 199 195 dlg = dia; 200 196 this.setLayout(null); 201 panelPat = new PanelPat(dlg );197 panelPat = new PanelPat(dlg, Ent.BODY); 202 198 panelPat.setBounds(new Rectangle(0, 0, 110, 160)); 203 199 this.add(panelPat, null); … … 310 306 public void clearSelections() { 311 307 panelPat.clearSelections(); 308 heightBox.setText(""); 309 alHeight.actionPerformed(null); 310 elevBox.setText(""); 311 alElev.actionPerformed(null); 312 sourceBox.setText(""); 313 alSource.actionPerformed(null); 314 infoBox.setText(""); 315 alInfo.actionPerformed(null); 316 statusBox.setSelectedIndex(0); 317 alStatus.actionPerformed(null); 318 constrBox.setSelectedIndex(0); 319 alConstr.actionPerformed(null); 320 visBox.setSelectedIndex(0); 321 alVis.actionPerformed(null); 322 reflBox.setSelectedIndex(0); 323 alRefl.actionPerformed(null); 312 324 } 313 325 -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPat.java
r26881 r26925 10 10 import oseam.Messages; 11 11 import oseam.dialogs.OSeaMAction; 12 import oseam.seamarks.SeaMark.* 12 import oseam.seamarks.SeaMark.*; 13 13 14 14 public class PanelPat extends JPanel { … … 28 28 private ActionListener alPat = new ActionListener() { 29 29 public void actionPerformed(java.awt.event.ActionEvent e) { 30 for (Pat pat : patterns.keySet()) { 31 JRadioButton button = patterns.get(pat); 32 if (button.isSelected()) { 33 dlg.mark.setPattern(Ent.BODY, pat); 34 button.setBorderPainted(true); 35 } else 36 button.setBorderPainted(false); 30 if (dlg.mark != null) { 31 for (Pat pat : patterns.keySet()) { 32 JRadioButton button = patterns.get(pat); 33 if (button.isSelected()) { 34 dlg.mark.setPattern(Ent.BODY, pat); 35 button.setBorderPainted(true); 36 } else 37 button.setBorderPainted(false); 38 } 39 switch (dlg.mark.getPattern(Ent.BODY)) { 40 case NONE: 41 panelCol.trimStack(1); 42 break; 43 case HORIZ: 44 case VERT: 45 case DIAG: 46 break; 47 case SQUARE: 48 panelCol.trimStack(4); 49 break; 50 case BORDER: 51 panelCol.trimStack(2); 52 break; 53 } 54 dlg.mark.paintSign(); 37 55 } 38 if (dlg.mark != null)39 dlg.mark.paintSign();40 56 } 41 57 }; 42 58 43 public PanelPat(OSeaMAction dia ) {59 public PanelPat(OSeaMAction dia, Ent entity) { 44 60 dlg = dia; 45 61 this.setLayout(null); 46 panelCol = new PanelCol(dlg, alType, Ent.BODY);62 panelCol = new PanelCol(dlg, alType, entity); 47 63 panelCol.setBounds(new Rectangle(0, 0, 72, 160)); 48 64 this.add(panelCol, null); … … 53 69 this.add(getPatButton(squareButton, 76, 104, 27, 27, "SquarePat", Pat.SQUARE), null); 54 70 this.add(getPatButton(borderButton, 76, 130, 27, 27, "BorderPat", Pat.BORDER), null); 55 71 56 72 } 57 73 58 74 public void clearSelections() { 75 panelCol.clearSelections(); 59 76 patButtons.clearSelection(); 60 77 alPat.actionPerformed(null); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java
r26881 r26925 37 37 } 38 38 if (dlg.mark != null) { 39 if ((dlg.mark.getObject() != Obj.UNKNOWN) && (dlg.mark.getShape() != Shp.UNKNOWN)) 39 if ((dlg.mark.getObject() != Obj.UNKNOWN) && (dlg.mark.getShape() != Shp.UNKNOWN)) { 40 40 dlg.panelMain.moreButton.setVisible(true); 41 else 41 dlg.panelMain.panelChan.topmarkButton.setVisible(true); 42 dlg.panelMain.panelMore.panelPat.panelCol.clearSelections(); 43 if (dlg.mark.getCategory() == Cat.LAM_PORT) { 44 switch (dlg.mark.getRegion()) { 45 case A: 46 dlg.panelMain.panelMore.panelPat.noneButton.doClick(); 47 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 48 break; 49 case B: 50 dlg.panelMain.panelMore.panelPat.noneButton.doClick(); 51 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 52 break; 53 case C: 54 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 55 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 56 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 57 dlg.panelMain.panelMore.panelPat.panelCol.whiteButton.doClick(); 58 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 59 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 60 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 61 dlg.panelMain.panelMore.panelPat.panelCol.whiteButton.doClick(); 62 break; 63 } 64 } else { 65 switch (dlg.mark.getRegion()) { 66 case A: 67 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 68 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 69 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 70 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 71 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 72 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 73 break; 74 case B: 75 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 76 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 77 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 78 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 79 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 80 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 81 break; 82 case C: 83 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 84 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 85 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 86 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 87 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 88 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 89 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 90 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 91 break; 92 } 93 } 94 } else { 42 95 dlg.panelMain.moreButton.setVisible(false); 96 dlg.panelMain.panelChan.topmarkButton.setVisible(false); 97 } 43 98 dlg.mark.paintSign(); 44 99 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java
r26881 r26925 33 33 } 34 34 if (dlg.mark != null) { 35 if ((dlg.mark.getObject() != Obj.UNKNOWN) && (dlg.mark.getShape() != Shp.UNKNOWN)) 35 if ((dlg.mark.getObject() != Obj.UNKNOWN) && (dlg.mark.getShape() != Shp.UNKNOWN)) { 36 36 dlg.panelMain.moreButton.setVisible(true); 37 else 37 dlg.panelMain.panelChan.topmarkButton.setVisible(true); 38 dlg.panelMain.panelMore.panelPat.panelCol.clearSelections(); 39 dlg.panelMain.panelMore.panelPat.vertButton.doClick(); 40 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 41 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 42 dlg.panelMain.panelMore.panelPat.panelCol.whiteButton.doClick(); 43 } else { 38 44 dlg.panelMain.moreButton.setVisible(false); 45 } 39 46 dlg.mark.paintSign(); 40 47 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
r26881 r26925 51 51 dlg.mark.setShape(shp); 52 52 dlg.mark.setObject(objects.get(shp)); 53 if ((button == cairnButton) && !(dlg.panelMain.panelMore.panelPat.panelCol. offButton.isSelected()))54 dlg.panelMain.panelMore.panelPat.panelCol. offButton.doClick();53 if ((button == cairnButton) && !(dlg.panelMain.panelMore.panelPat.panelCol.delButton.isSelected())) 54 dlg.panelMain.panelMore.panelPat.panelCol.delButton.doClick(); 55 55 button.setBorderPainted(true); 56 56 } else -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java
r26881 r26925 37 37 } 38 38 if (dlg.mark != null) { 39 if ((dlg.mark.getObject() != Obj.UNKNOWN) && (dlg.mark.getShape() != Shp.UNKNOWN)) 39 if ((dlg.mark.getObject() != Obj.UNKNOWN) && (dlg.mark.getShape() != Shp.UNKNOWN)) { 40 40 dlg.panelMain.moreButton.setVisible(true); 41 else 41 dlg.panelMain.panelChan.topmarkButton.setVisible(true); 42 dlg.panelMain.panelMore.panelPat.panelCol.clearSelections(); 43 if (dlg.mark.getCategory() == Cat.LAM_PORT) { 44 switch (dlg.mark.getRegion()) { 45 case A: 46 dlg.panelMain.panelMore.panelPat.noneButton.doClick(); 47 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 48 break; 49 case B: 50 dlg.panelMain.panelMore.panelPat.noneButton.doClick(); 51 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 52 break; 53 case C: 54 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 55 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 56 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 57 dlg.panelMain.panelMore.panelPat.panelCol.whiteButton.doClick(); 58 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 59 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 60 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 61 dlg.panelMain.panelMore.panelPat.panelCol.whiteButton.doClick(); 62 break; 63 } 64 } else { 65 switch (dlg.mark.getRegion()) { 66 case A: 67 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 68 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 69 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 70 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 71 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 72 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 73 break; 74 case B: 75 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 76 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 77 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 78 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 79 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 80 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 81 break; 82 case C: 83 dlg.panelMain.panelMore.panelPat.horizButton.doClick(); 84 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 85 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 86 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 87 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 88 dlg.panelMain.panelMore.panelPat.panelCol.redButton.doClick(); 89 dlg.panelMain.panelMore.panelPat.panelCol.addButton.doClick(); 90 dlg.panelMain.panelMore.panelPat.panelCol.greenButton.doClick(); 91 break; 92 } 93 } 94 } else { 42 95 dlg.panelMain.moreButton.setVisible(false); 96 dlg.panelMain.panelChan.topmarkButton.setVisible(false); 97 } 43 98 dlg.mark.paintSign(); 44 99 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java
r26881 r26925 13 13 14 14 private OSeaMAction dlg; 15 public Panel Col panelCol= null;15 public PanelPat panelPat = null; 16 16 private ButtonGroup topButtons = new ButtonGroup(); 17 17 public JRadioButton noTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/NoneButton.png"))); … … 60 60 public PanelTop(OSeaMAction dia) { 61 61 dlg = dia; 62 panelCol = new PanelCol(dlg, alTop, Ent.TOPMARK);63 panelCol.setBounds(new Rectangle(0, 0, 34, 160));64 62 this.setLayout(null); 65 this.add(panelCol, null); 66 this.add(getTopButton(noTopButton, 40, 5, 27, 27, "NoTop", Top.NONE), null); 67 this.add(getTopButton(canTopButton, 70, 5, 27, 27, "CanTop", Top.CAN), null); 68 this.add(getTopButton(coneTopButton, 100, 5, 27, 27, "ConeTop", Top.CONE), null); 69 this.add(getTopButton(sphereTopButton, 130, 5, 27, 27, "SphereTop", Top.SPHERE), null); 70 this.add(getTopButton(XTopButton, 160, 5, 27, 27, "XTop", Top.X_SHAPE), null); 71 this.add(getTopButton(northTopButton, 40, 35, 27, 27, "NorthTop", Top.NORTH), null); 72 this.add(getTopButton(southTopButton, 70, 35, 27, 27, "SouthTop", Top.SOUTH), null); 73 this.add(getTopButton(eastTopButton, 100, 35, 27, 27, "EastTop", Top.EAST), null); 74 this.add(getTopButton(westTopButton, 130, 35, 27, 27, "WestTop", Top.WEST), null); 75 this.add(getTopButton(spheres2TopButton, 160, 35, 27, 27, "Spheres2Top", Top.SPHERES2), null); 76 this.add(getDayButton(boardDayButton, 40, 65, 27, 27, "BoardDay", Day.BOARD), null); 77 this.add(getDayButton(diamondDayButton, 70, 65, 27, 27, "DiamondDay", Day.DIAMOND), null); 78 this.add(getDayButton(triangleDayButton, 100, 65, 27, 27, "TriangleDay", Day.TRIANGLE), null); 79 this.add(getDayButton(triangleInvDayButton, 130, 65, 27, 27, "TriangleInvDay", Day.TRIANGLE_INV), null); 80 this.add(getDayButton(squareDayButton, 160, 65, 27, 27, "SquareDay", Day.SQUARE), null); 81 this.add(getDayButton(circleDayButton, 160, 95, 27, 27, "CircleDay", Day.CIRCLE), null); 82 this.add(getMoorButton(mooringTopButton, 40, 95, 27, 27, "MooringTop"), null); 63 panelPat = new PanelPat(dlg, Ent.TOPMARK); 64 panelPat.setBounds(new Rectangle(0, 0, 110, 160)); 65 this.add(panelPat, null); 66 this.add(getTopButton(noTopButton, 110, 5, 27, 27, "NoTop", Top.NONE), null); 67 this.add(getTopButton(canTopButton, 140, 5, 27, 27, "CanTop", Top.CAN), null); 68 this.add(getTopButton(coneTopButton, 170, 5, 27, 27, "ConeTop", Top.CONE), null); 69 this.add(getTopButton(sphereTopButton, 200, 5, 27, 27, "SphereTop", Top.SPHERE), null); 70 this.add(getTopButton(XTopButton, 230, 5, 27, 27, "XTop", Top.X_SHAPE), null); 71 this.add(getTopButton(northTopButton, 110, 35, 27, 27, "NorthTop", Top.NORTH), null); 72 this.add(getTopButton(southTopButton, 140, 35, 27, 27, "SouthTop", Top.SOUTH), null); 73 this.add(getTopButton(eastTopButton, 170, 35, 27, 27, "EastTop", Top.EAST), null); 74 this.add(getTopButton(westTopButton, 200, 35, 27, 27, "WestTop", Top.WEST), null); 75 this.add(getTopButton(spheres2TopButton, 230, 35, 27, 27, "Spheres2Top", Top.SPHERES2), null); 76 this.add(getDayButton(boardDayButton, 110, 65, 27, 27, "BoardDay", Day.BOARD), null); 77 this.add(getDayButton(diamondDayButton, 140, 65, 27, 27, "DiamondDay", Day.DIAMOND), null); 78 this.add(getDayButton(triangleDayButton, 170, 65, 27, 27, "TriangleDay", Day.TRIANGLE), null); 79 this.add(getDayButton(triangleInvDayButton, 200, 65, 27, 27, "TriangleInvDay", Day.TRIANGLE_INV), null); 80 this.add(getDayButton(squareDayButton, 230, 65, 27, 27, "SquareDay", Day.SQUARE), null); 81 this.add(getDayButton(circleDayButton, 230, 95, 27, 27, "CircleDay", Day.CIRCLE), null); 82 this.add(getMoorButton(mooringTopButton, 110, 95, 27, 27, "MooringTop"), null); 83 83 } 84 84 … … 86 86 topButtons.clearSelection(); 87 87 alTop.actionPerformed(null); 88 panel Col.clearSelections();88 panelPat.clearSelections(); 89 89 } 90 90 -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
r26908 r26925 23 23 } 24 24 25 public String validDecimal(String str) { 26 str = str.trim().replace(',', '.'); 27 if ((!str.isEmpty()) && (!str.matches("^[+-]??\\d+(\\.\\d+)??$"))) { 28 dlg.manager.showVisualMessage("Not a valid decimal string"); 29 return ""; 30 } else { 31 dlg.manager.showVisualMessage(""); 32 return str; 33 } 34 } 35 25 36 public enum Reg { 26 37 A, B, C … … 44 55 45 56 public void setName(String nam) { 46 name = nam ;57 name = nam.trim(); 47 58 } 48 59 … … 725 736 726 737 public void setInfo(String str) { 727 information = str ;738 information = str.trim(); 728 739 } 729 740 … … 735 746 736 747 public void setSource(String str) { 737 source = str; 748 source = str.trim(); 749 } 750 751 public String elevation = ""; 752 753 public String getElevation() { 754 return elevation; 755 } 756 757 public void setElevation(String str) { 758 elevation = validDecimal(str); 759 } 760 761 public String height = ""; 762 763 public String getHeight() { 764 return height; 765 } 766 767 public void setHeight(String str) { 768 height = validDecimal(str); 738 769 } 739 770
Note:
See TracChangeset
for help on using the changeset viewer.