Changeset 27317 in osm for applications/editors/josm/plugins/smed

Timestamp:

2011-12-26T16:09:04+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• panels/PanelChan.java (modified) (1 diff)
• panels/PanelHaz.java (modified) (1 diff)
• panels/PanelMain.java (modified) (4 diffs)
• seamarks/SeaMark.java (modified) (4 diffs)

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

@@ -105 +105 @@
                         }
                         topmarkButton.setVisible(dlg.panelMain.mark.testValid());
-                        alTop.actionPerformed(null);
                         lightButton.setVisible(dlg.panelMain.mark.testValid());
-                        alLit.actionPerformed(null);
+                        dlg.panelMain.panelMore.syncPanel();
                 }
         };

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

@@ -68 +68 @@
                                 isolButton.setBorderPainted(false);
                         }
-                        alTop.actionPerformed(null);
-                        alLit.actionPerformed(null);
+                        topmarkButton.setVisible(dlg.panelMain.mark.testValid());
+                        lightButton.setVisible(dlg.panelMain.mark.testValid());
                         dlg.panelMain.panelMore.syncPanel();
                 }

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

@@ -74 +74 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         if (chanButton.isSelected()) {
-                                mark.clearSign();
                                 chanButton.setBorderPainted(true);
+                                panelChan.syncPanel();
                                 panelChan.setVisible(true);
                         } else {
@@ -82 +82 @@
                         }
                         if (hazButton.isSelected()) {
-                                mark.clearSign();
                                 hazButton.setBorderPainted(true);
+                                panelHaz.syncPanel();
                                 panelHaz.setVisible(true);
                         } else {
@@ -90 +90 @@
                         }
                         if (specButton.isSelected()) {
-                                mark.clearSign();
                                 specButton.setBorderPainted(true);
+                                panelSpec.syncPanel();
                                 panelSpec.setVisible(true);
                         } else {
@@ -98 +98 @@
                         }
                         if (lightsButton.isSelected()) {
-                                mark.clearSign();
                                 lightsButton.setBorderPainted(true);
+                                panelLights.syncPanel();
                                 panelLights.setVisible(true);
                         } else {

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

@@ -636 +636 @@
 
         public void nulLight(int i) {
-                if (sectors.size() >= i) {
-                        if (sectors.size() == 0)
-                                sectors.add(sector.clone());
-                        else
-                                sectors.add(i, sector.clone());
+                if (i == 0) {
+                        clrLight();
+                } else {
+                        sectors.add(i, sector.clone());
                 }
         }
@@ -654 +653 @@
                 if (sectors.size() > i)
                         sectors.remove(i);
+                repaint();
         }
 
@@ -660 +660 @@
                 addLight();
                 setLightRef("");
+                repaint();
         }
 
@@ -1508 +1509 @@
                         if (keys.containsKey("seamark:light" + secStr + ":category")) {
                                 str = keys.get("seamark:light" + secStr + ":category");
+                                if (str.equals("vert"))
+                                        str = "vertical";
+                                if (str.equals("horiz"))
+                                        str = "horizontal";
                                 for (Lit lit : LitSTR.keySet())
                                         if (LitSTR.get(lit).equals(str))