Changeset 27201 in osm for applications/editors/josm/plugins

Timestamp:

2011-12-10T14:41:01+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• dialogs/OSeaMAction.java (modified) (2 diffs)
• panels/PanelLit.java (modified) (4 diffs)
• panels/PanelSectors.java (modified) (3 diffs)
• seamarks/SeaMark.java (modified) (7 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java

@@ -40 +40 @@
                                                 node = null;
                                                 panelMain.mark.clearSign();
-                                                panelMain.syncPanel();
                                                 manager.showVisualMessage(Messages.getString("OneNode"));
                                         }
@@ -48 +47 @@
                                 node = null;
                                 panelMain.mark.clearSign();
-                                panelMain.syncPanel();
                                 manager.showVisualMessage(Messages.getString("SelectNode"));
                         }

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

@@ -134 +134 @@
                         sectorButton.setBorderPainted(sectorButton.isSelected());
                         if (sectorButton.isSelected()) {
-                                if (panelSector == null) {
-                                        panelSector = new PanelSectors(dlg);
-                                }
                                 panelSector.setVisible(true);
                         } else {
-                                if (panelSector != null) {
-                                        panelSector.setVisible(false);
-                                        panelSector = null;
-                                }
+                                panelSector.setVisible(false);
                                 while (dlg.panelMain.mark.getSectorCount() > 1)
                                         dlg.panelMain.mark.delLight(1);
@@ -158 +152 @@
                 this.add(panelChr, null);
                 this.add(panelCol, null);
+                panelSector = new PanelSectors(dlg);
+                panelSector.setVisible(false);
 
                 typeButtons = new ButtonGroup();
@@ -285 +281 @@
 
         public void syncPanel() {
-                if (panelSector != null) {
-                        panelSector.setVisible(false);
-                        panelSector = null;
-                }
-                singleButton.setBorderPainted(false);
-                sectorButton.setBorderPainted(false);
                 orientationLabel.setVisible(false);
                 orientationBox.setVisible(false);
@@ -319 +309 @@
                                 exhibitionBox.setSelectedIndex(item);
                 }
+                if (dlg.panelMain.mark.isSectored()) {
+                        singleButton.setBorderPainted(false);
+                        sectorButton.setBorderPainted(true);
+                        panelSector.setVisible(true);
+                } else {
+                        singleButton.setBorderPainted(true);
+                        sectorButton.setBorderPainted(false);
+                        panelSector.setVisible(false);
+                        while (dlg.panelMain.mark.getSectorCount() > 1)
+                                dlg.panelMain.mark.delLight(dlg.panelMain.mark.getSectorCount() - 1);
+                }
                 panelCol.syncPanel();
                 panelChr.syncPanel();

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

@@ -68 +68 @@
                 this.getContentPane().add(panel);
 
-                table.setSize(860, ((table.getRowCount() * 16) + 18));
+                table.setSize(860, ((table.getRowCount() * 16) + 20));
                 if (table.getRowCount() > 3) {
-                        this.setSize(900, ((table.getRowCount() * 16) + 40));
+                        this.setSize(900, ((table.getRowCount() * 16) + 42));
                 }
                 
@@ -126 +126 @@
 
                 public int getRowCount() {
-                        return dlg.panelMain.mark.getSectorCount();
+                        if (dlg.panelMain == null)
+                                return 1;
+                        else
+                                return dlg.panelMain.mark.getSectorCount();
                 }
 
@@ -258 +261 @@
         public void deleteSector(int idx) {
                 dlg.panelMain.mark.delLight(idx);
-                table.setSize(860, ((table.getRowCount() * 16) + 18));
+                table.setSize(860, ((table.getRowCount() * 16) + 20));
                 if (table.getRowCount() > 3) {
-                        this.setSize(900, ((table.getRowCount() * 16) + 40));
+                        this.setSize(900, ((table.getRowCount() * 16) + 42));
                 } else {
                         this.setSize(900, 100);

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

@@ -21 +21 @@
         public SeaMark(OSeaMAction dia) {
                 dlg = dia;
+                clrLight();
         }
 
@@ -101 +102 @@
         public void setObject(Obj obj) {
                 object = obj;
+                if (obj == Obj.UNKNOWN) {
+                        setCategory(Cat.NONE);
+                        setShape(Shp.UNKNOWN);
+                        setColour(Ent.BODY, Col.UNKNOWN);
+                        setPattern(Ent.BODY, Pat.NONE);
+                        setTopmark(Top.NONE);
+                        setColour(Ent.TOPMARK, Col.UNKNOWN);
+                        setPattern(Ent.TOPMARK, Pat.NONE);
+                        setFogSound(Fog.NONE);
+                        setRadar(Rtb.NONE);
+                        setStatus(Sts.UNKNOWN);
+                        setConstr(Cns.UNKNOWN);
+                        setConsp(Con.UNKNOWN);
+                        setRefl(Con.UNKNOWN);
+                        setRef("");
+                        setObjectHeight("");
+                        setElevation("");
+                        setInfo("");
+                        setSource("");
+                        setFixme("");
+                }
                 repaint();
         }
@@ -559 +581 @@
         }
 
+        public boolean isSectored() {
+                return (sectors.size() > 1);
+        }
+
         public Object getLightAtt(Att att, int i) {
                 return getLightAtt(att.ordinal(), i);
@@ -619 +645 @@
 
         public void clrLight() {
-                delLight(0);
+                sectors.clear();
                 addLight();
         }
@@ -723 +749 @@
         public void setRadar(Rtb type) {
                 RaType = type;
+                if (type == Rtb.NONE) {
+                        setRaconGroup("");
+                        setRaconSequence("");
+                        setRaconPeriod("");
+                        setRaconRange("");
+                        setRaconSector1("");
+                        setRaconSector2("");
+                }
                 repaint();
         }
@@ -816 +850 @@
         public void setFogSound(Fog sound) {
                 fogSound = sound;
+                if (sound == Fog.NONE) {
+                        setFogGroup("");
+                        setFogSequence("");
+                        setFogPeriod("");
+                        setFogRange("");
+                }
                 repaint();
         }
@@ -1094 +1134 @@
         public void clearSign() {
                 setObject(Obj.UNKNOWN);
-                setCategory(Cat.NONE);
-                setShape(Shp.UNKNOWN);
-                setColour(Ent.BODY, Col.UNKNOWN);
-                setPattern(Ent.BODY, Pat.NONE);
-                setTopmark(Top.NONE);
-                setColour(Ent.TOPMARK, Col.UNKNOWN);
-                setPattern(Ent.TOPMARK, Pat.NONE);
-                setFogSound(Fog.NONE);
-                setRadar(Rtb.NONE);
+                setName("");
                 clrLight();
-                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);
+                dlg.panelMain.syncPanel();
                 repaint();
         }