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

Timestamp:

2011-06-10T11:21:54+02:00 (14 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• images/MinusButton.png (added)
• images/MinusButton.svg (added)
• images/PlusButton.png (added)
• images/PlusButton.svg (added)
• oseam/panels/PanelLit.java (modified) (2 diffs)
• oseam/panels/PanelSectors.java (modified) (4 diffs)
• oseam/seamarks/Light.java (added)
• oseam/seamarks/SeaMark.java (modified) (6 diffs)

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

@@ -61 +61 @@
         public PanelLit(OSeaMAction dia) {
                 dlg = dia;
-                panelSector = new PanelSectors();
-                panelSector.setAlwaysOnTop(true);
-                panelSector.setLocation(450, 0);
                 panelChr = new PanelChr(dlg);
                 panelChr.setBounds(new Rectangle(0, 0, 88, 160));
@@ -78 +75 @@
                                 sectorButton.setBorderPainted(sectorButton.isSelected());
                                 if (sectorButton.isSelected()) {
+                                        if (panelSector == null) {
+                                                panelSector = new PanelSectors(dlg.mark.light);
+                                                panelSector.setAlwaysOnTop(true);
+                                                panelSector.setLocation(450, 0);
+                                        }
+                                        if (dlg.mark.light.getRowCount() == 1) {
+                                                dlg.mark.light.addSector(1);
+                                                dlg.mark.setSectored(true);
+                                        }
                                         panelSector.setVisible(true);
                                 } else {
+                                        dlg.mark.setSectored(false);
                                         panelSector.setVisible(false);
                                 }

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

@@ -1 +1 @@
 package oseam.panels;
+
+import java.util.ArrayList;
 
 import javax.swing.ImageIcon;
@@ -9 +11 @@
 import javax.swing.table.AbstractTableModel;
 
+import oseam.seamarks.Light;
+import oseam.seamarks.SeaMark;
+
 public class PanelSectors extends JFrame {
         
@@ -16 +21 @@
         public JTable table;
         
-        class TableModel extends AbstractTableModel {
-
-                private String[] columns = { "Sector", "Start", "End", "Colour",
-                                "Character", "Group", "Period", "Height", "Range", "Visibility" };
-                private Object[][] data = { { new Integer(1), "", "", "", "", "", "", "", "", "" } };
-
-                public String getColumnName(int col) {
-                        return columns[col].toString();
-                }
-
-                public int getColumnCount() {
-                        return columns.length;
-                }
-
-                public int getRowCount() {
-                        return data.length;
-                }
-
-                public Object getValueAt(int row, int col) {
-                        return data[row][col];
-                }
-
-                public boolean isCellEditable(int row, int col) {
-                        return (col > 0);
-                }
-
-                public void setValueAt(Object value, int row, int col) {
-                        data[row][col] = value;
-                        fireTableCellUpdated(row, col);
-                }
-}
-        
-        public PanelSectors() {
+        public PanelSectors(Light light) {
                 super("Sector Table");
                 panel = new JPanel();
@@ -58 +31 @@
                 plusButton = new JButton(new ImageIcon(getClass().getResource("/images/PlusButton.png")));
                 plusButton.setBounds(0, 34, 32, 34);
-                table = new JTable(new TableModel());
+                table = new JTable(light);
                 JScrollPane tablePane = new JScrollPane(table);
                 tablePane.setBounds(40, 0, 660, 34);

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

@@ -440 +440 @@
                         setBearing1("");
                         setBearing2("");
-                        setRadius("");
+                        setVisibility(Vis.UNKNOWN);
                 }
         }
@@ -453 +453 @@
                 sectorIndex = sector;
         }
-
+        
         public enum Chr {
                 UNKNOWN, FIXED, FLASH, LONGFLASH, QUICK, VERYQUICK, ULTRAQUICK,
@@ -490 +490 @@
         }
         
+        public Light light = new Light();
+        
         private String[] LightChar = new String[10];
 
@@ -596 +598 @@
         }
 
-        private String[] Radius = new String[10];
-
-        public String getRadius() {
-                if (Radius[sectorIndex] == null)
-                        return (Radius[0]);
-                return Radius[sectorIndex];
-        }
-
-        public void setRadius(String radius) {
+        public enum Vis { UNKNOWN, HIGH, LOW, FAINT, INTEN, UNINTEN, REST, OBS, PARTOBS }
+        public static final Map<EnumSet<Vis>, String> VisMAP = new HashMap<EnumSet<Vis>, String>();
+        static {
+                VisMAP.put(EnumSet.of(Vis.UNKNOWN), "");
+                VisMAP.put(EnumSet.of(Vis.HIGH), "high");
+                VisMAP.put(EnumSet.of(Vis.LOW), "low");
+                VisMAP.put(EnumSet.of(Vis.FAINT), "faint");
+                VisMAP.put(EnumSet.of(Vis.INTEN), "intensified");
+                VisMAP.put(EnumSet.of(Vis.UNINTEN), "unintensified");
+                VisMAP.put(EnumSet.of(Vis.REST), "restricted");
+                VisMAP.put(EnumSet.of(Vis.OBS), "obscured");
+                VisMAP.put(EnumSet.of(Vis.PARTOBS), "part_obscured");
+        }
+        
+        private Vis[] Visibility = new Vis[10];
+
+        public Vis getVisibility() {
+                if (Visibility[sectorIndex] == null)
+                        return (Visibility[0]);
+                return Visibility[sectorIndex];
+        }
+
+        public void setVisibility(Vis visibility) {
                 if (sectorIndex == 0)
-                        Radius = new String[10];
-                Radius[sectorIndex] = radius;
+                        Visibility = new Vis[10];
+                Visibility[sectorIndex] = visibility;
         }
 
@@ -926 +942 @@
                                         if (values.length > 2)
                                                 Bearing2[index] = values[2];
-                                        if (values.length > 3)
-                                                Radius[index] = values[3];
                                 } else {
                                         index = 0;
@@ -1191 +1205 @@
                         for (int i = 1; i < 10; i++) {
                                 if ((colour = lightColour[i]) != Col.UNKNOWN)
-                                        if (colour.equals("R")) {
-                                                Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i + ":colour", "red"));
-                                                if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null))
-                                                        Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i, "red:" + Bearing1[i] + ":"
-                                                            + Bearing2[i] + ":" + Radius[i]));
-                                        } else if (colour.equals("G")) {
-                                                Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i + ":colour", "green"));
-                                                if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null))
-                                                        Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i, "green:" + Bearing1[i] + ":"
-                                                            + Bearing2[i] + ":" + Radius[i]));
-                                        } else if (colour.equals("W")) {
-                                                Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i + ":colour", "white"));
-                                                if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null))
-                                                        Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i, "white:" + Bearing1[i] + ":"
-                                                            + Bearing2[i] + ":" + Radius[i]));
-                                        }
+//                                      if (colour.equals("R")) {
+//                                              Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i + ":colour", "red"));
+//                                              if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null))
+//                                                      Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i, "red:" + Bearing1[i] + ":"
+//                                                          + Bearing2[i] + ":" + Radius[i]));
+//                                      } else if (colour.equals("G")) {
+//                                              Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i + ":colour", "green"));
+//                                              if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null))
+//                                                      Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i, "green:" + Bearing1[i] + ":"
+//                                                          + Bearing2[i] + ":" + Radius[i]));
+//                                      } else if (colour.equals("W")) {
+//                                              Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i + ":colour", "white"));
+//                                              if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null))
+//                                                      Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i, "white:" + Bearing1[i] + ":"
+//                                                          + Bearing2[i] + ":" + Radius[i]));
+//                                      }
                                 if (LightPeriod[i] != null)
                                         Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:" + i + ":period", LightPeriod[i]));