Changeset 28157 in osm

Timestamp:

2012-03-27T23:29:27+02:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• images/Notice_A1.png (modified) ( previous)
• images/Notice_A10a.png (modified) ( previous)
• images/Notice_A10b.png (modified) ( previous)
• images/Notice_A12.png (modified) ( previous)
• images/Notice_A13.png (modified) ( previous)
• images/Notice_A14.png (modified) ( previous)
• images/Notice_A15.png (modified) ( previous)
• images/Notice_A16.png (modified) ( previous)
• images/Notice_A17.png (modified) ( previous)
• images/Notice_A18.png (modified) ( previous)
• images/Notice_A19.png (modified) ( previous)
• images/Notice_A1a.png (modified) ( previous)
• images/Notice_A2.png (modified) ( previous)
• images/Notice_A20.png (modified) ( previous)
• images/Notice_A3.png (modified) ( previous)
• images/Notice_A4.png (modified) ( previous)
• images/Notice_A4_1.png (modified) ( previous)
• images/Notice_A5.png (modified) ( previous)
• images/Notice_A5_1.png (modified) ( previous)
• images/Notice_A6.png (modified) ( previous)
• images/Notice_A7.png (modified) ( previous)
• images/Notice_A8.png (modified) ( previous)
• images/Notice_A9.png (modified) ( previous)
• images/Notice_B11.png (added)
• images/Notice_B1a.png (added)
• images/Notice_B1b.png (added)
• images/Notice_B2a.png (added)
• images/Notice_B2b.png (added)
• images/Notice_B3a.png (added)
• images/Notice_B3b.png (added)
• images/Notice_B4a.png (added)
• images/Notice_B4b.png (added)
• images/Notice_B5.png (added)
• images/Notice_B6.png (added)
• images/Notice_B7.png (added)
• images/Notice_B8.png (added)
• images/Notice_B9a.png (added)
• images/Notice_B9b.png (added)
• images/Notice_C1.png (added)
• images/Notice_C2.png (added)
• images/Notice_C3.png (added)
• images/Notice_C4.png (added)
• images/Notice_C5a.png (added)
• images/Notice_C5b.png (added)
• images/Notice_D1a.png (added)
• images/Notice_D1b.png (added)
• images/Notice_D2a.png (added)
• images/Notice_D2b.png (added)
• images/Notice_D3a.png (added)
• images/Notice_D3b.png (added)
• oseam/panels/PanelMain.java (modified) (5 diffs)
• oseam/panels/PanelSpec.java (modified) (3 diffs)
• oseam/seamarks/SeaMark.java (modified) (2 diffs)

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

@@ -20 +20 @@
         public PanelLights panelLights = null;
         public PanelMore panelMore = null;
+        public PanelNotice panelNotice = null;
         public PanelTop panelTop = null;
         public PanelFog panelFog = null;
@@ -181 +182 @@
                 panelMore.setBounds(new Rectangle(40, 165, 360, 160));
                 panelMore.setVisible(false);
+                panelNotice = new PanelNotice(dlg);
+                panelNotice.setBounds(new Rectangle(40, 165, 360, 160));
+                panelNotice.setVisible(false);
                 panelTop = new PanelTop(dlg);
                 panelTop.setBounds(new Rectangle(40, 165, 360, 160));
@@ -203 +207 @@
                 add(panelLights);
                 add(panelMore);
+                add(panelNotice);
                 add(panelTop);
                 add(panelFog);
@@ -284 +289 @@
                 panelLights.setVisible(false);
                 panelMore.setVisible(false);
+                panelNotice.setVisible(false);
                 panelTop.setVisible(false);
                 panelFog.setVisible(false);
@@ -309 +315 @@
                                 panelHaz.syncPanel();
                                 break;
+                        case NTC:
+                                panelNotice.setVisible(true);
                         case SPP:
                                 specButton.setBorderPainted(true);

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

@@ -111 +111 @@
         private ActionListener alNotice = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
+                        dlg.panelMain.mark.clrMark();
                         if (noticeButton.isSelected()) {
+                                dlg.panelMain.mark.setObject(Obj.NOTMRK);
                                 noticeButton.setBorderPainted(true);
                         } else {
+                                dlg.panelMain.mark.setObject(Obj.UNKOBJ);
                                 noticeButton.setBorderPainted(false);
                         }
+                        dlg.panelMain.syncPanel();
                 }
         };
@@ -193 +197 @@
                 addCatItem(Messages.getString("Anchorage"), Cat.SPM_ANCH);
                 mooringBox = new JComboBox();
-                mooringBox.setBounds(new Rectangle(5, 130, 160, 20));
+                mooringBox.setBounds(new Rectangle(5, 142, 160, 18));
                 add(mooringBox);
                 mooringBox.setVisible(false);
@@ -221 +225 @@
                 noticeButton.addActionListener(alNotice);
                 add(noticeButton);
-                noticeButton.setVisible(false);
 
                 mooringButton.setBounds(new Rectangle(136, 64, 34, 32));

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

@@ -1297 +1297 @@
                         tmp = true;
                         break;
+                case NOTMRK:
+                        if (getCategory() != Cat.NOCAT) 
+                                tmp = true;
                 case LNDMRK:
                         if ((getCategory() != Cat.NOCAT) || (getFunc() != Fnc.UNKFNC))
@@ -1405 +1408 @@
                         str = keys.get("seamark:name");
                         setName(str);
-                }
-                if (getName().isEmpty()) {
-                        if (keys.containsKey("name")) {
-                                str = keys.get("name");
-                                setName(str);
-                        }
                 }