Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.svg (revision 24600)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.svg (revision 24600)
@@ -0,0 +1,4428 @@
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionBButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionBButton.svg (revision 24600)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionBButton.svg (revision 24600)
@@ -0,0 +1,4428 @@
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24599)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24600)
@@ -50,4 +50,10 @@
private JPanel oseamPanel = null;
+ private JLabel shapeIcon = null;
+ private JLabel lightIcon = null;
+ private JLabel topIcon = null;
+ private JLabel reflIcon = null;
+ private JLabel raconIcon = null;
+ private JLabel fogIcon = null;
private ButtonGroup typeButtons = null;
private JRadioButton chanButton = null;
@@ -71,5 +77,5 @@
panelChan= new PanelChan();
- panelChan.setBounds(new Rectangle(110, 0, 290, 160));
+ panelChan.setBounds(new Rectangle(105, 0, 295, 160));
panelChan.setVisible(false);
}
@@ -80,4 +86,24 @@
oseamPanel.setLayout(null);
oseamPanel.setSize(new Dimension(400, 360));
+
+ shapeIcon = new JLabel();
+ shapeIcon.setBounds(new Rectangle(270, 160, 125, 155));
+ shapeIcon.setBorder(BorderFactory.createLineBorder(Color.black, 1));
+ oseamPanel.add(shapeIcon, null);
+ lightIcon = new JLabel();
+ lightIcon.setBounds(new Rectangle(270, 160, 125, 155));
+ oseamPanel.add(lightIcon, null);
+ topIcon = new JLabel();
+ topIcon.setBounds(new Rectangle(270, 160, 125, 155));
+ oseamPanel.add(topIcon, null);
+ reflIcon = new JLabel();
+ reflIcon.setBounds(new Rectangle(270, 160, 125, 155));
+ oseamPanel.add(reflIcon, null);
+ raconIcon = new JLabel();
+ raconIcon.setBounds(new Rectangle(270, 160, 125, 155));
+ oseamPanel.add(raconIcon, null);
+ fogIcon = new JLabel();
+ fogIcon.setBounds(new Rectangle(270, 160, 125, 155));
+ oseamPanel.add(fogIcon, null);
oseamPanel.add(getChanButton(), null);
@@ -118,5 +144,5 @@
chanButton = new JRadioButton(new ImageIcon(getClass().getResource(
Messages.getString("ChanButton"))));
- chanButton.setBounds(new Rectangle(5, 0, 105, 40));
+ chanButton.setBounds(new Rectangle(0, 0, 105, 40));
chanButton.setToolTipText(Messages.getString("ChanTip"));
}
@@ -128,5 +154,5 @@
hazButton = new JRadioButton(new ImageIcon(getClass().getResource(
Messages.getString("HazButton"))));
- hazButton.setBounds(new Rectangle(5, 40, 105, 40));
+ hazButton.setBounds(new Rectangle(0, 40, 105, 40));
hazButton.setToolTipText(Messages.getString("HazTip"));
}
@@ -138,5 +164,5 @@
specButton = new JRadioButton(new ImageIcon(getClass().getResource(
Messages.getString("SpecButton"))));
- specButton.setBounds(new Rectangle(5, 80, 105, 40));
+ specButton.setBounds(new Rectangle(0, 80, 105, 40));
specButton.setToolTipText(Messages.getString("SpecTip"));
}
@@ -148,5 +174,5 @@
lightButton = new JRadioButton(new ImageIcon(getClass().getResource(
Messages.getString("LightsButton"))));
- lightButton.setBounds(new Rectangle(5, 120, 105, 40));
+ lightButton.setBounds(new Rectangle(0, 120, 105, 40));
lightButton.setToolTipText(Messages.getString("LightsTip"));
}
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 24599)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 24600)
@@ -19,2 +19,15 @@
SafeWaterButton=/images/SafeWaterButton.png
SafeWaterTip=Safe Water marks
+PillarButton=/images/PillarButton.png
+SparButton=/images/SparButton.png
+CanButton=/images/CanButton.png
+ConeButton=/images/ConeButton.png
+SphereButton=/images/SphereButton.png
+BarrelButton=/images/BarrelButton.png
+FloatButton=/images/FloatButton.png
+SuperButton=/images/SuperButton.png
+BeaconButton=/images/BeaconButton.png
+TowerButton=/images/TowerButton.png
+PerchPButton=/images/PerchPButton.png
+PerchSButton=/images/PerchSButton.png
+StakeButton=/images/StakeButton.png
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 24599)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 24600)
@@ -19,2 +19,15 @@
SafeWaterButton=/images/SafeWaterButton_de.png
SafeWaterTip=Safe Water marks
+PillarButton=/images/PillarButton_de.png
+SparButton=/images/SparButton_de.png
+CanButton=/images/CanButton_de.png
+ConeButton=/images/ConeButton_de.png
+SphereButton=/images/SphereButton_de.png
+BarrelButton=/images/BarrelButton_de.png
+FloatButton=/images/FloatButton_de.png
+SuperButton=/images/SuperButton_de.png
+BeaconButton=/images/BeaconButton_de.png
+TowerButton=/images/TowerButton_de.png
+PerchPButton=/images/PerchPButton_de.png
+PerchSButton=/images/PerchSButton_de.png
+StakeButton=/images/StakeButton_de.png
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 24599)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 24600)
@@ -19,2 +19,15 @@
SafeWaterButton=/images/SafeWaterButton.png
SafeWaterTip=Safe Water marks
+PillarButton=/images/PillarButton.png
+SparButton=/images/SparButton.png
+CanButton=/images/CanButton.png
+ConeButton=/images/ConeButton.png
+SphereButton=/images/SphereButton.png
+BarrelButton=/images/BarrelButton.png
+FloatButton=/images/FloatButton.png
+SuperButton=/images/SuperButton.png
+BeaconButton=/images/BeaconButton.png
+TowerButton=/images/TowerButton.png
+PerchPButton=/images/PerchPButton.png
+PerchSButton=/images/PerchSButton.png
+StakeButton=/images/StakeButton.png
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 24599)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 24600)
@@ -30,6 +30,11 @@
private JRadioButton prefStbdButton = null;
private JRadioButton safeWaterButton = null;
+ private PanelPort panelPort = null;
+
public PanelChan() {
super();
+ panelPort= new PanelPort();
+ panelPort.setBounds(new Rectangle(105, 0, 185, 160));
+ panelPort.setVisible(false);
initialize();
}
@@ -37,4 +42,5 @@
private void initialize() {
this.setLayout(null);
+ this.add(panelPort, null);
this.add(getPortButton(), null);
this.add(getStbdButton(), null);
@@ -52,8 +58,8 @@
if (portButton.isSelected()) {
portButton.setEnabled(false);
-// panelPort.setVisible(true);
+ panelPort.setVisible(true);
} else {
portButton.setEnabled(true);
-// panelPort.setVisible(false);
+ panelPort.setVisible(false);
}
stbdButton.setEnabled(!stbdButton.isSelected());
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 24600)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 24600)
@@ -0,0 +1,185 @@
+package oseam.panels;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.Font;
+
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JComboBox;
+import javax.swing.JCheckBox;
+import javax.swing.JRadioButton;
+
+import oseam.Messages;
+
+import java.awt.Cursor;
+import java.awt.event.ActionListener;
+
+public class PanelPort extends JPanel {
+
+ private ButtonGroup regionButtons = null;
+ private JRadioButton regionAButton = null;
+ private JRadioButton regionBButton = null;
+ private ButtonGroup shapeButtons = null;
+ private JRadioButton pillarButton = null;
+ private JRadioButton sparButton = null;
+ private JRadioButton canButton = null;
+ private JRadioButton floatButton = null;
+ private JRadioButton beaconButton = null;
+ private JRadioButton towerButton = null;
+ private JRadioButton perchButton = null;
+
+ public PanelPort() {
+ super();
+ initialize();
+ }
+
+ private void initialize() {
+ this.setLayout(null);
+ this.add(getRegionAButton(), null);
+ this.add(getRegionBButton(), null);
+ this.add(getPillarButton(), null);
+ this.add(getSparButton(), null);
+ this.add(getCanButton(), null);
+ this.add(getFloatButton(), null);
+ this.add(getBeaconButton(), null);
+ this.add(getTowerButton(), null);
+ this.add(getPerchButton(), null);
+
+ regionButtons = new ButtonGroup();
+ regionButtons.add(regionAButton);
+ regionButtons.add(regionBButton);
+ ActionListener alRegion = new ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ if (regionAButton.isSelected()) {
+ regionAButton.setEnabled(false);
+ } else {
+ regionAButton.setEnabled(true);
+ }
+ if (regionBButton.isSelected()) {
+ regionBButton.setEnabled(false);
+ } else {
+ regionBButton.setEnabled(true);
+ }
+ }
+ };
+ regionAButton.addActionListener(alRegion);
+ regionBButton.addActionListener(alRegion);
+
+ shapeButtons = new ButtonGroup();
+ shapeButtons.add(pillarButton);
+ shapeButtons.add(sparButton);
+ shapeButtons.add(canButton);
+ shapeButtons.add(floatButton);
+ shapeButtons.add(beaconButton);
+ shapeButtons.add(towerButton);
+ shapeButtons.add(perchButton);
+ ActionListener alShape = new ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ pillarButton.setEnabled(!pillarButton.isSelected());
+ sparButton.setEnabled(!sparButton.isSelected());
+ canButton.setEnabled(!canButton.isSelected());
+ floatButton.setEnabled(!floatButton.isSelected());
+ beaconButton.setEnabled(!beaconButton.isSelected());
+ towerButton.setEnabled(!towerButton.isSelected());
+ perchButton.setEnabled(!perchButton.isSelected());
+ }
+ };
+ pillarButton.addActionListener(alShape);
+ sparButton.addActionListener(alShape);
+ canButton.addActionListener(alShape);
+ floatButton.addActionListener(alShape);
+ beaconButton.addActionListener(alShape);
+ towerButton.addActionListener(alShape);
+ perchButton.addActionListener(alShape);
+ }
+
+ private JRadioButton getRegionAButton() {
+ if (regionAButton == null) {
+ regionAButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ "/images/RegionAButton.png")));
+ regionAButton.setBounds(new Rectangle(10, 0, 65, 30));
+ }
+ return regionAButton;
+ }
+
+ private JRadioButton getRegionBButton() {
+ if (regionBButton == null) {
+ regionBButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ "/images/RegionBButton.png")));
+ regionBButton.setBounds(new Rectangle(10, 30, 65, 30));
+ }
+ return regionBButton;
+ }
+
+ private JRadioButton getPillarButton() {
+ if (pillarButton == null) {
+ pillarButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("PillarButton"))));
+ pillarButton.setBounds(new Rectangle(0, 64, 90, 32));
+ }
+ return pillarButton;
+ }
+
+ private JRadioButton getSparButton() {
+ if (sparButton == null) {
+ sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("SparButton"))));
+ sparButton.setBounds(new Rectangle(0, 96, 90, 32));
+ }
+ return sparButton;
+ }
+
+ private JRadioButton getCanButton() {
+ if (canButton == null) {
+ canButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("CanButton"))));
+ canButton.setBounds(new Rectangle(0, 128, 90, 32));
+ }
+ return canButton;
+ }
+
+ private JRadioButton getFloatButton() {
+ if (floatButton == null) {
+ floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("FloatButton"))));
+ floatButton.setBounds(new Rectangle(90, 0, 90, 32));
+ }
+ return floatButton;
+ }
+
+ private JRadioButton getBeaconButton() {
+ if (beaconButton == null) {
+ beaconButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("BeaconButton"))));
+ beaconButton.setBounds(new Rectangle(90, 32, 90, 32));
+ }
+ return beaconButton;
+ }
+
+ private JRadioButton getTowerButton() {
+ if (towerButton == null) {
+ towerButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("TowerButton"))));
+ towerButton.setBounds(new Rectangle(90, 64, 90, 32));
+ }
+ return towerButton;
+ }
+
+ private JRadioButton getPerchButton() {
+ if (perchButton == null) {
+ perchButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("PerchPButton"))));
+ perchButton.setBounds(new Rectangle(90, 96, 90, 32));
+ }
+ return perchButton;
+ }
+
+
+}