Changeset 27955 in osm

Timestamp:

2012-02-28T15:08:45+01:00 (13 years ago)

Author:

malcolmh

Message:

radar range fix

Location:

applications/editors/josm/plugins/smed

Files:

• plugs/oseam/src/images/Top_Black_Yellow_Beacon.png (deleted)
• plugs/oseam/src/images/Top_Black_Yellow_Black_Beacon.png (deleted)
• plugs/oseam/src/images/Top_Black_Yellow_Black_Buoy.png (deleted)
• plugs/oseam/src/images/Top_Black_Yellow_Black_Buoy_Small.png (deleted)
• plugs/oseam/src/images/Top_Black_Yellow_Black_Float.png (deleted)
• plugs/oseam/src/images/Top_Black_Yellow_Buoy.png (deleted)
• plugs/oseam/src/images/Top_Black_Yellow_Buoy_Small.png (deleted)
• plugs/oseam/src/images/Top_Black_Yellow_Float.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Beacon.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Buoy.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Buoy_Small.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Float.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Yellow_Beacon.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Yellow_Buoy.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Yellow_Buoy_Small.png (deleted)
• plugs/oseam/src/images/Top_Yellow_Black_Yellow_Float.png (deleted)
• plugs/oseam/src/oseam/panels/PanelRadar.java (modified) (1 diff)
• plugs/oseam/src/oseam/seamarks/SeaMark.java (modified) (2 diffs)
• src/smed/tabs/SmedTabAction.java (modified) (2 diffs)

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

@@ -119 +119 @@
                 rangeBox.setBounds(new Rectangle(155, 60, 50, 20));
                 rangeBox.setHorizontalAlignment(SwingConstants.CENTER);
+                add(rangeBox);
                 rangeBox.addFocusListener(flRange);
                 

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

@@ -725 +725 @@
 
         public enum Pat {
-                NOPAT, HSTRP, VSTRP, DIAG, SQUARED, BORDER, CROSS
+                NOPAT, HSTRP, VSTRP, DIAG, SQUARED, BORDER, CROSS, SALTIRE
         }
 
@@ -736 +736 @@
                 PatSTR.put(Pat.BORDER, "border");
                 PatSTR.put(Pat.CROSS, "cross");
+                PatSTR.put(Pat.SALTIRE, "saltire");
         }
 

applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java

@@ -23 +23 @@
 public class SmedTabAction extends JosmAction {
 
-        /**
+    /**
      *
      */
@@ -31 +31 @@
         private JFrame frame = null;
         private boolean isOpen = false;
-        private JMenuItem osmItem = null;
+        private JMenuItem osmItem =null;
         public static JTextField smedStatusBar = null;
-        private static String editor = tr("SeaMap Editor");
+        private static String editor =tr("SeaMap Editor");
+        
+        public SmedTabAction() {
+        super( editor, "Smed",editor, 
+            Shortcut.registerShortcut("tools:Seamaps", tr("Tool: {0}", tr("SeaMap Editor")),
+                    KeyEvent.VK_K, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT),
+            true);  //$NON-NLS-1$ //$NON-NLS-2$
+    }
 
-        public SmedTabAction() {
-        super( editor, "Smed",editor, Shortcut.registerShortcut("tools:Seamaps", tr("Tool: {0}", tr("SeaMap Editor")), KeyEvent.VK_K, Shortcut.SHIFT_DEFAULT), true);  //$NON-NLS-1$ //$NON-NLS-2$
-        }
 
-        @Override
-        public void actionPerformed(ActionEvent e) {
-                SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                                createAndShowTabs();
-                        }
-                });
-
-                isOpen = true;
-                if (osmItem == null)
-                        return;
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                createAndShowTabs();
+            }
+        });
+        
+        isOpen = true;
+                if (osmItem == null) return;
 
                 osmItem.setEnabled(false);
-        }
+    }
 
-        protected void createAndShowTabs() {
-                // Create and set up the window.
-                frame = new JFrame(editor);
-                smedStatusBar = new JTextField();
-                frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-                frame.setResizable(false);
-                frame.setAlwaysOnTop(true);
 
-                // Add content to the window.
-                frame.setJMenuBar(smedMenu);
-                frame.add(smedTabs, BorderLayout.CENTER);
-                frame.add(smedStatusBar, BorderLayout.PAGE_END);
+    protected void createAndShowTabs() {
+        //Create and set up the window.
+        frame = new JFrame(editor);
+        smedStatusBar = new JTextField();
+        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        frame.setResizable(false);
+        frame.setAlwaysOnTop(true);
 
-                // Display the window.
-                frame.addWindowListener(new java.awt.event.WindowAdapter() {
-                        public void windowClosing(java.awt.event.WindowEvent e) {
-                                osmItem.setEnabled(true);
+        //Add content to the window.
+        frame.setJMenuBar(smedMenu);
+        frame.add(smedTabs, BorderLayout.CENTER);
+        frame.add(smedStatusBar,BorderLayout.PAGE_END);
 
-                                closeDialog();
-                        }
-                });
-                frame.setSize(new Dimension(420, 470));
-                // frame.pack();
-                frame.setVisible(true);
-        }
+        //Display the window.
+        frame.addWindowListener(new java.awt.event.WindowAdapter() {
+                public void windowClosing(java.awt.event.WindowEvent e) {
+                        osmItem.setEnabled(true);
+                        
+                        closeDialog();
+                }
+        });
+        frame.setSize(new Dimension(420, 470));
+        // frame.pack();
+        frame.setVisible(true);
+    }
+
 
         public void closeDialog() {
                 List<SmedPluggable> plugins = SmedTabbedPane.getPlugins();
-
-                if (plugins != null) {
-                        for (SmedPluggable p : plugins)
-                                p.stop();
+                
+                if(plugins != null) {
+                        for(SmedPluggable p : plugins) p.stop();
                 }
-
-                if (isOpen) {
+                
+                if(isOpen) {
                         frame.setVisible(false);
                         frame.dispose();
                 }
-
+                
                 isOpen = false;
         }
 
+
         public void setOsmItem(JMenuItem item) {
-                osmItem = item;
+                osmItem = item;         
         }