Changeset 26554 in osm for applications/editors/josm

Timestamp:

2011-08-21T19:30:39+02:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• images/Barrel_Yellow.png (added)
• images/Beacon_Black_Red_BLack.png (deleted)
• images/Beacon_Black_Red_Black.png (added)
• images/Beacon_Yellow.png (added)
• images/Can_Black_Red_Black.png (added)
• images/Can_Yellow.png (added)
• images/Cone_Black_Red_Black.png (added)
• images/Cone_Yellow.png (added)
• images/Float_Black_Red_BLack.png (deleted)
• images/Float_Black_Red_Black.png (added)
• images/LLight.png (added)
• images/Pillar_Black_Red_BLack.png (deleted)
• images/Pillar_Black_Red_Black.png (added)
• images/Pillar_Yellow.png (added)
• images/Spar_Black_Red_BLack.png (deleted)
• images/Spar_Black_Red_Black.png (added)
• images/Sphere_Black_Red_Black.png (added)
• images/Sphere_Yellow.png (added)
• images/Tower_Black_Red_BLack.png (deleted)
• images/Tower_Black_Red_Black.png (added)
• images/Tower_Yellow.png (added)
• oseam/panels/PanelHaz.java (modified) (6 diffs)

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

@@ -32 +32 @@
         private ActionListener alCat = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        if (catButtons.getSelection() != null) {
-                                dlg.panelMain.topButton.setEnabled(true);
-                                dlg.panelMain.fogButton.setEnabled(true);
-                                dlg.panelMain.radButton.setEnabled(true);
-                                dlg.panelMain.litButton.setEnabled(true);
-                                dlg.panelMain.panelTop.enableAll(false);
-                                dlg.panelMain.panelTop.panelCol.enableAll(false);
-                                dlg.panelMain.panelTop.panelCol.blackButton.setEnabled(true);
-                                dlg.panelMain.panelTop.panelCol.blackButton.doClick();
-                        }
                         if (northButton.isSelected()) {
                                 dlg.mark.setCategory(Cat.CARD_NORTH);
                                 dlg.mark.setColour(Ent.BODY, Col.BLACK);
                                 dlg.mark.addColour(Ent.BODY, Col.YELLOW);
-                                dlg.panelMain.panelTop.northTopButton.setEnabled(true);
-                                dlg.panelMain.panelTop.northTopButton.doClick();
                                 northButton.setBorderPainted(true);
                         } else {
@@ -56 +44 @@
                                 dlg.mark.setColour(Ent.BODY, Col.YELLOW);
                                 dlg.mark.addColour(Ent.BODY, Col.BLACK);
-                                dlg.panelMain.panelTop.southTopButton.setEnabled(true);
-                                dlg.panelMain.panelTop.southTopButton.doClick();
                                 southButton.setBorderPainted(true);
                         } else {
@@ -67 +53 @@
                                 dlg.mark.addColour(Ent.BODY, Col.YELLOW);
                                 dlg.mark.addColour(Ent.BODY, Col.BLACK);
-                                dlg.panelMain.panelTop.eastTopButton.setEnabled(true);
-                                dlg.panelMain.panelTop.eastTopButton.doClick();
                                 eastButton.setBorderPainted(true);
                         } else {
@@ -78 +62 @@
                                 dlg.mark.addColour(Ent.BODY, Col.BLACK);
                                 dlg.mark.addColour(Ent.BODY, Col.YELLOW);
-                                dlg.panelMain.panelTop.westTopButton.setEnabled(true);
-                                dlg.panelMain.panelTop.westTopButton.doClick();
                                 westButton.setBorderPainted(true);
                         } else {
@@ -88 +70 @@
                                 dlg.mark.addColour(Ent.BODY, Col.RED);
                                 dlg.mark.addColour(Ent.BODY, Col.BLACK);
-                                dlg.panelMain.panelTop.spheres2TopButton.setEnabled(true);
-                                dlg.panelMain.panelTop.spheres2TopButton.doClick();
                                 isolButton.setBorderPainted(true);
                         } else {
@@ -123 +103 @@
                                         button.setBorderPainted(false);
                         }
+                        if (dlg.mark != null)
+                                dlg.mark.paintSign();
                 }
         };