Changeset 27055 in osm for applications/editors/josm

Timestamp:

2011-11-14T11:13:57+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src

Files:

• images/Chimney.png (added)
• images/DishAerial.png (added)
• images/Flagstaff.png (added)
• images/FlareStack.png (added)
• images/LandTower.png (added)
• images/Monument.png (added)
• images/RadioMast.png (added)
• images/WaterTower.png (added)
• images/Wind_Farm.png (added)
• images/Wind_Motor.png (added)
• oseam/panels/PanelLights.java (modified) (2 diffs)
• oseam/panels/PanelLit.java (modified) (5 diffs)
• oseam/panels/PanelMain.java (modified) (2 diffs)
• oseam/seamarks/SeaMark.java (modified) (3 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java

@@ -30 +30 @@
                 }
         };
-
         public JComboBox warningCatBox;
         public EnumMap<Cat, Integer> warningCats = new EnumMap<Cat, Integer>(Cat.class);
@@ -42 +41 @@
                 }
         };
-
         private ButtonGroup objButtons = new ButtonGroup();
         public JRadioButton houseButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LighthouseButton.png")));

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java

@@ -22 +22 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         dlg.mark.setLightAtt(Att.GRP, 0, groupBox.getText());
+                        dlg.mark.paintSign();
                 }
         };
@@ -29 +30 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         dlg.mark.setLightAtt(Att.PER, 0, periodBox.getText());
+                        dlg.mark.paintSign();
                 }
         };
@@ -36 +38 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         dlg.mark.setLightAtt(Att.SEQ, 0, sequenceBox.getText());
+                        dlg.mark.paintSign();
                 }
         };
@@ -55 +58 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         dlg.mark.setLightAtt(Att.HGT, 0, heightBox.getText());
+                        dlg.mark.paintSign();
                 }
         };
@@ -62 +66 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         dlg.mark.setLightAtt(Att.RNG, 0, rangeBox.getText());
+                        dlg.mark.paintSign();
                 }
         };

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java

@@ -84 +84 @@
         private ActionListener alType = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        if (dlg.node == null)
-                                typeButtons.clearSelection();
                         if (chanButton.isSelected()) {
                                 chanButton.setBorderPainted(true);
@@ -131 +129 @@
         private ActionListener alMisc = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        if (dlg.mark == null) {
-                                miscButtons.clearSelection();
-                        }
                         if (topButton.isSelected()) {
                                 moreButton.setText("v v v");

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -17 +17 @@
         public SeaMark(OSeaMAction dia) {
                 dlg = dia;
-        }
-
-        public void clearSign() {
-                setObject(Obj.UNKNOWN);
-                setCategory(Cat.NONE);
-                setShape(Shp.UNKNOWN);
-                setColour(Ent.BODY, Col.UNKNOWN);
-                setPattern(Ent.BODY, Pat.NONE);
-                setColour(Ent.TOPMARK, Col.UNKNOWN);
-                setPattern(Ent.TOPMARK, Pat.NONE);
-                dlg.panelMain.moreButton.setVisible(false);
-                dlg.panelMain.saveButton.setEnabled(false);
-                dlg.panelMain.topButton.setEnabled(false);
-                dlg.panelMain.fogButton.setEnabled(false);
-                dlg.panelMain.radButton.setEnabled(false);
-                dlg.panelMain.litButton.setEnabled(false);
-                dlg.panelMain.panelMore.syncPanel();
-                dlg.panelMain.panelMore.setVisible(false);
-                paintSign();
-        }
-        
-        public String validDecimal(String str) {
-                str = str.trim().replace(',', '.');
-                if ((!str.isEmpty()) && (!str.matches("^[+-]??\\d+(\\.\\d+)??$"))) {
-                        dlg.manager.showVisualMessage("Not a valid decimal string");
-                        return "";
-                } else {
-                        dlg.manager.showVisualMessage("");
-                        return str;
-                }
         }
 
@@ -1022 +992 @@
                         dlg.panelMain.saveButton.setEnabled(true);
                         Ent ent = EntMAP.get(getObject());
-                        if ((ent == Ent.BUOY) || (ent == Ent.BEACON) || (ent == Ent.FLOAT))
-                                dlg.panelMain.topButton.setEnabled(true);
+                        dlg.panelMain.topButton.setEnabled((ent == Ent.BUOY) || (ent == Ent.BEACON) || (ent == Ent.FLOAT));
                         dlg.panelMain.fogButton.setEnabled(true);
                         dlg.panelMain.radButton.setEnabled(true);
@@ -1036 +1005 @@
                         dlg.manager.showVisualMessage("Seamark not recognised");
                         return false;
+                }
+        }
+
+        public void clearSign() {
+                setObject(Obj.UNKNOWN);
+                setCategory(Cat.NONE);
+                setShape(Shp.UNKNOWN);
+                setColour(Ent.BODY, Col.UNKNOWN);
+                setPattern(Ent.BODY, Pat.NONE);
+                setColour(Ent.TOPMARK, Col.UNKNOWN);
+                setPattern(Ent.TOPMARK, Pat.NONE);
+                dlg.panelMain.moreButton.setVisible(false);
+                dlg.panelMain.saveButton.setEnabled(false);
+                dlg.panelMain.topButton.setEnabled(false);
+                dlg.panelMain.fogButton.setEnabled(false);
+                dlg.panelMain.radButton.setEnabled(false);
+                dlg.panelMain.litButton.setEnabled(false);
+                dlg.panelMain.panelMore.syncPanel();
+                dlg.panelMain.panelMore.setVisible(false);
+                paintSign();
+        }
+        
+        public String validDecimal(String str) {
+                str = str.trim().replace(',', '.');
+                if ((!str.isEmpty()) && (!str.matches("^[+-]??\\d+(\\.\\d+)??$"))) {
+                        dlg.manager.showVisualMessage("Not a valid decimal string");
+                        return "";
+                } else {
+                        dlg.manager.showVisualMessage("");
+                        return str;
                 }
         }