Changeset 23058 in osm for applications/editors/josm/plugins/toms

Timestamp:

2010-09-07T16:24:42+02:00 (14 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/toms/src/toms

Files:

• dialogs/SmpDialogAction.java (modified) (5 diffs)
• seamarks/SeaMark.java (modified) (1 diff)
• seamarks/buoys/Buoy.java (modified) (3 diffs)
• seamarks/buoys/BuoyCard.java (modified) (1 diff)
• seamarks/buoys/BuoyIsol.java (modified) (1 diff)
• seamarks/buoys/BuoyLat.java (modified) (1 diff)
• seamarks/buoys/BuoyNota.java (modified) (2 diffs)
• seamarks/buoys/BuoySaw.java (modified) (1 diff)
• seamarks/buoys/BuoySpec.java (modified) (1 diff)

applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java

@@ -116 +116 @@
         public JRadioButton rbM01RegionA = null;
         public JRadioButton rbM01RegionB = null;
-        public JLabel lM01Icon = null;
-        public JLabel lM02Icon = null;
-        public JLabel lM03Icon = null;
-        public JLabel lM04Icon = null;
+        public JLabel lM01Icon = null;  // Shape
+        public JLabel lM02Icon = null;  // Light
+        public JLabel lM03Icon = null;  // Reflector
+        public JLabel lM04Icon = null;  // Racon
+        public JLabel lM05Icon = null;  // Fog
         public JLabel lM01FireMark = null;
         private JLabel lM01TypeOfMark = null;
@@ -525 +526 @@
                         lM04Icon.setText(""); //$NON-NLS-1$
 
+                        lM05Icon = new JLabel();
+                        lM05Icon.setBounds(new Rectangle(210, 20, 150, 200));
+                        lM05Icon.setIcon(null);
+                        lM05Icon.setText(""); //$NON-NLS-1$
+
                         lM01FireMark = new JLabel();
                         lM01FireMark.setBounds(new Rectangle(300, 85, 95, 20));
@@ -676 +682 @@
                         pM01SeaMap.add(lM03Icon, null);
                         pM01SeaMap.add(lM04Icon, null);
+                        pM01SeaMap.add(lM05Icon, null);
                         pM01SeaMap.add(getCbM01TypeOfMark(), null);
                         pM01SeaMap.add(lM01TypeOfMark, null);
@@ -830 +837 @@
                                                         cbM01CatOfMark.addItem(Messages.getString("SmpDialogAction.207")); //$NON-NLS-1$
                                                         cbM01CatOfMark.addItem(Messages.getString("SmpDialogAction.208")); //$NON-NLS-1$
-                                                        cbM01CatOfMark.addItem(Messages.getString("SmpDialogAction.209")); //$NON-NLS-1$
                                                 }
                                                 break;
@@ -1044 +1050 @@
                         cM01Fog.setFont(new Font("Dialog", Font.PLAIN, 12)); //$NON-NLS-1$
                         cM01Fog.setText(Messages.getString("SmpDialogAction.174")); //$NON-NLS-1$
+                        cM01Fog.addActionListener(new ActionListener() {
+                                public void actionPerformed(ActionEvent e) {
+                                        buoy.setFog(cM01Fog.isSelected());
+                                        buoy.paintSign();
+                                }
+                        });
                 }
                 return cM01Fog;

applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java

@@ -64 +64 @@
         public final static int LIGHT_MAJOR = 2;
         public final static int LIGHT_MINOR = 3;
-        public final static int LIGHT_FLOAT = 4;
 
         /**

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java

@@ -259 +259 @@
                 dlg.lM03Icon.setIcon(null);
                 dlg.lM04Icon.setIcon(null);
+                dlg.lM05Icon.setIcon(null);
                 
                 dlg.rbM01RegionA.setSelected(!getRegion());
@@ -289 +290 @@
                         dlg.lM01Racon.setVisible(false);
                         dlg.tfM01Racon.setVisible(false);
+                }
+                
+                if (hasFog()) {
+                        dlg.lM05Icon.setIcon(new ImageIcon(getClass().getResource("/images/Fog_Signal.png")));
                 }
                 
@@ -418 +423 @@
                 dlg.cM01Racon.setVisible(false);
                 dlg.cbM01Racon.setVisible(false);
-                setRatyp(0);
                 dlg.tfM01Racon.setText("");
                 dlg.tfM01Racon.setVisible(false);
                 dlg.lM01Racon.setVisible(false);
                 setRacon(false);
+                setRatyp(0);
                 dlg.cM01Fog.setSelected(false);
                 dlg.cM01Fog.setVisible(false);

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java

@@ -203 +203 @@
                 dlg.cM01Racon.setEnabled(true);
                 dlg.cM01Racon.setVisible(true);
+                dlg.cM01Fog.setEnabled(true);
+                dlg.cM01Fog.setVisible(true);
+
                 dlg.cM01Fired.setEnabled(true);
                 dlg.cM01Fired.setVisible(true);

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java

@@ -117 +117 @@
                 dlg.cM01Racon.setEnabled(true);
                 dlg.cM01Racon.setVisible(true);
+                dlg.cM01Fog.setEnabled(true);
+                dlg.cM01Fog.setVisible(true);
+
+                dlg.cM01Fired.setVisible(true);
                 dlg.cM01Fired.setEnabled(true);
 

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java

@@ -358 +358 @@
                 dlg.cM01Racon.setEnabled(true);
                 dlg.cM01Racon.setVisible(true);
+                dlg.cM01Fog.setEnabled(true);
+                dlg.cM01Fog.setVisible(true);
+
+                dlg.cM01Fired.setVisible(true);
                 dlg.cM01Fired.setEnabled(true);
 

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java

@@ -52 +52 @@
                 dlg.sM01StatusBar.setText(getErrMsg());
 
-                switch (getStyleIndex()) {
+                dlg.cM01Radar.setEnabled(true);
+                dlg.cM01Radar.setVisible(true);
+                dlg.cM01Racon.setEnabled(true);
+                dlg.cM01Racon.setVisible(true);
+
+                dlg.cM01Fog.setEnabled(true);
+                dlg.cM01Fog.setVisible(true);
+
+                dlg.cM01Fired.setVisible(true);
+                dlg.cM01Fired.setEnabled(false);
+                dlg.cM01Fired.setSelected(true);
+
+                switch (getBuoyIndex()) {
                 case SeaMark.LIGHT_HOUSE:
                         dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
@@ -66 +78 @@
                         dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
                                         "/images/Light_Minor.png")));
-                        break;
-
-                case SeaMark.LIGHT_FLOAT:
-//                      dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
-//                                      "/images/Light_Float.png")));
                         break;
 

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java

@@ -118 +118 @@
                 dlg.cM01Fired.setEnabled(true);
 
+                dlg.cM01Fog.setEnabled(true);
+                dlg.cM01Fog.setVisible(true);
+
+                dlg.cM01Fired.setVisible(true);
+                dlg.cM01Fired.setEnabled(true);
+
                 String image = "/images/Safe_Water";
 

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java

@@ -158 +158 @@
                 }
 
+                dlg.cM01Fog.setEnabled(true);
+                dlg.cM01Fog.setVisible(true);
+
+                dlg.cM01Fired.setVisible(true);
+                dlg.cM01Fired.setEnabled(true);
+
                 String image = "/images/Special_Purpose";