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

Timestamp:

2011-11-22T17:37:01+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• panels/PanelLit.java (modified) (5 diffs)
• seamarks/SeaMark.java (modified) (3 diffs)

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

@@ -81 +81 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         dlg.mark.setLightAtt(Att.MLT, 0, multipleBox.getText());
+                        dlg.mark.paintSign();
                 }
         };
@@ -94 +95 @@
                         }
                         if (dlg.mark.getLightAtt(Att.LIT, 0) == Lit.DIR) {
+                                dlg.mark.setLightAtt(Att.MLT, 0, "");
+                                multipleBox.setText("");
                                 orientationLabel.setVisible(true);
                                 orientationBox.setVisible(true);
@@ -99 +102 @@
                                 multipleBox.setVisible(false);
                         } else if ((dlg.mark.getLightAtt(Att.LIT, 0) == Lit.VERT) || (dlg.mark.getLightAtt(Att.LIT, 0) == Lit.HORIZ)) {
+                                dlg.mark.setLightAtt(Att.ORT, 0, "");
+                                orientationBox.setText("");
                                 orientationLabel.setVisible(false);
                                 orientationBox.setVisible(false);
@@ -104 +109 @@
                                 multipleBox.setVisible(true);
                         } else {
+                                dlg.mark.setLightAtt(Att.MLT, 0, "");
+                                multipleBox.setText("");
+                                dlg.mark.setLightAtt(Att.ORT, 0, "");
+                                orientationBox.setText("");
                                 orientationLabel.setVisible(false);
                                 orientationBox.setVisible(false);
@@ -109 +118 @@
                                 multipleBox.setVisible(false);
                         }
+                        dlg.mark.paintSign();
                 }
         };

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

@@ -509 +509 @@
 
         public enum Exh {
-                UNKNOWN, H24, DAY, NIGHT, FOG
+                UNKNOWN, H24, DAY, NIGHT, FOG, WARN, STORM
         }
 
@@ -519 +519 @@
                 ExhSTR.put(Exh.NIGHT, "night");
                 ExhSTR.put(Exh.FOG, "fog");
+                ExhSTR.put(Exh.WARN, "warning");
+                ExhSTR.put(Exh.STORM, "storm");
         }
 
@@ -1971 +1973 @@
                         switch ((Col) getLightAtt(Att.COL, 0)) {
                         case RED:
-                                c += " R";
+                                c += ".R";
                                 break;
                         case GREEN:
-                                c += " G";
+                                c += ".G";
                                 break;
                         case AMBER:
-                                c += " Am";
+                                c += ".Am";
                                 break;
                         case ORANGE:
-                                c += " Or";
+                                c += ".Or";
                                 break;
                         case BLUE:
-                                c += " Bu";
+                                c += ".Bu";
                                 break;
                         case VIOLET:
-                                c += " Vi";
-                                break;
+                                c += ".Vi";
+                                break;
+                        }
+                        tmp = (String) getLightAtt(Att.MLT, 0);
+                        if (!tmp.isEmpty())
+                                c = tmp + c;
+                        if (dlg.mark.getLightAtt(Att.LIT, 0) != Lit.UNKNOWN) {
+                                switch ((Lit)dlg.mark.getLightAtt(Att.LIT, 0)) {
+                                case VERT:
+                                        c += "(Vert)";
+                                        break;
+                                case HORIZ:
+                                                c += "(Horiz)";
+                                                break;
+                                }
                         }
                         tmp = (String) getLightAtt(Att.PER, 0);