Changeset 29215 in osm for applications

Timestamp:

2013-01-29T21:49:08+01:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src

Files:

• images/exportButton.png (added)
• images/importButton.png (added)
• panels/PanelMain.java (modified) (2 diffs)
• s57/S57att.java (modified) (1 diff)
• s57/S57dat.java (modified) (6 diffs)
• s57/S57obj.java (modified) (2 diffs)
• seamap/Renderer.java (modified) (2 diffs)
• seamap/SeaMap.java (modified) (2 diffs)
• smed2/Smed2Action.java (modified) (1 diff)

applications/editors/josm/plugins/smed2/src/panels/PanelMain.java

@@ -25 +25 @@
                 }
         };
-        private JButton openButton = null;
-        final JFileChooser fc = new JFileChooser();
-        private ActionListener alOpen = new ActionListener() {
+        private JButton importButton = null;
+        final JFileChooser ifc = new JFileChooser();
+        private ActionListener alImport = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                        if (e.getSource() == openButton) {
+                        if (e.getSource() == importButton) {
         messageBar.setText("Select file");
-        int returnVal = fc.showOpenDialog(Main.parent);
+        int returnVal = ifc.showOpenDialog(Main.parent);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
-          Smed2Action.panelS57.startImport(fc.getSelectedFile());
+          Smed2Action.panelS57.startImport(ifc.getSelectedFile());
+         } else {
+           messageBar.setText("");
+         }
+      }
+                }
+        };
+
+        private JButton exportButton = null;
+        final JFileChooser efc = new JFileChooser();
+        private ActionListener alExport = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        if (e.getSource() == exportButton) {
+        messageBar.setText("Select file");
+        int returnVal = efc.showOpenDialog(Main.parent);
+        if (returnVal == JFileChooser.APPROVE_OPTION) {
+          Smed2Action.panelS57.startExport(efc.getSelectedFile());
          } else {
            messageBar.setText("");
@@ -54 +70 @@
                 
     messageBar = new JTextField();
-    messageBar.setBounds(40, 430, 320, 20);
+    messageBar.setBounds(70, 430, 290, 20);
     messageBar.setEditable(false);
     messageBar.setBackground(Color.WHITE);
     add(messageBar);
-                openButton = new JButton(new ImageIcon(getClass().getResource("/images/fileButton.png")));
-                openButton.setBounds(10, 430, 20, 20);
-                add(openButton);
-                openButton.addActionListener(alOpen);
+                importButton = new JButton(new ImageIcon(getClass().getResource("/images/importButton.png")));
+                importButton.setBounds(10, 430, 20, 20);
+                add(importButton);
+                importButton.addActionListener(alImport);
+                exportButton = new JButton(new ImageIcon(getClass().getResource("/images/exportButton.png")));
+                exportButton.setBounds(40, 430, 20, 20);
+                add(exportButton);
+                exportButton.addActionListener(alExport);
                 saveButton = new JButton();
                 saveButton.setBounds(370, 430, 100, 20);

applications/editors/josm/plugins/smed2/src/s57/S57att.java

@@ -246 +246 @@
         
         public static Att enumAttribute(String attribute, Obj obj) {    // Convert OSeaM attribute string to OSeaM enumeration
-          if ((attribute != null) && (attribute.length() > 0)) {
+          if ((attribute != null) && !attribute.isEmpty()) {
             for (Att att : AttStr.keySet()) {
               if (AttStr.get(att).equals(attribute) && (verifyAttribute(obj, att) != Ver.NON ))

applications/editors/josm/plugins/smed2/src/s57/S57dat.java

@@ -7 +7 @@
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 
@@ -66 +66 @@
         private File importFile;
         private FileInputStream inp;
+        private File exportFile;
+        private FileOutputStream outp;
         private OsmDataLayer layer;
         private DataSet data;
@@ -74 +76 @@
                         if (e.getSource() == importButton) {
                                 readFile();
-                    Smed2Action.panelS57.setVisible(false);
-                    Smed2Action.panelMain.setVisible(true);
+                    Smed2Action.panelS57.setVisible(true);
+                    Smed2Action.panelMain.setVisible(false);
         PanelMain.messageBar.setText("File imported");
+      }
+                }
+        };
+        private JButton exportButton;
+        private ActionListener alExport = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        if (e.getSource() == exportButton) {
+                                writeFile();
+                    Smed2Action.panelS57.setVisible(true);
+                    Smed2Action.panelMain.setVisible(false);
+        PanelMain.messageBar.setText("File exported");
       }
                 }
@@ -89 +102 @@
                     Smed2Action.panelS57.setVisible(false);
                     Smed2Action.panelMain.setVisible(true);
-        PanelMain.messageBar.setText("Import cancelled");
+        PanelMain.messageBar.setText("Operation cancelled");
       }
                 }
@@ -108 +121 @@
                 importButton.addActionListener(alImport);
                 add(importButton);
+                exportButton = new JButton();
+                exportButton.setBounds(370, 430, 100, 20);
+                exportButton.setText(tr("Export"));
+                exportButton.addActionListener(alExport);
+                add(exportButton);
         }
 
@@ -120 +138 @@
     Smed2Action.panelMain.setVisible(false);
     Smed2Action.panelS57.setVisible(true);
+        }
+
+        public void startExport(File file) {
+                exportFile = file;
+                try {
+                        outp = new FileOutputStream(file);
+                } catch (IOException e) {
+      PanelMain.messageBar.setText("Failed to open file");
+                        return;
+                }
+    Smed2Action.panelMain.setVisible(false);
+    Smed2Action.panelS57.setVisible(true);
+        }
+
+        private void writeFile() {
         }
 

applications/editors/josm/plugins/smed2/src/s57/S57obj.java

@@ -150 +150 @@
         static {
                 for (Map.Entry<Obj, String> entry : ObjStr.entrySet()) {
-                        StrObj.put(entry.getValue(), entry.getKey());
+                        if (!entry.getValue().isEmpty())
+                                StrObj.put(entry.getValue(), entry.getKey());
                 }
         }
@@ -173 +174 @@
 
         public static Obj enumType(String type) { // Convert OSeaM object string to OSeaM object enumeration
-                if (StrObj.containsKey(type))
+                if ((type != null) && !type.isEmpty() && (StrObj.containsKey(type)))
                         return StrObj.get(type);
                 else

applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

@@ -71 +71 @@
         }
 
-        public static double calcArea(Feature feature) {
+        public static double signedArea(Feature feature) {
           if (feature.flag == Fflag.AREA) {
                         ArrayList<Long> way;
@@ -91 +91 @@
                                 llat = lat;
             }
-            return Math.abs(sigma) * 3444 * 3444 / 2.0;
+            return sigma;
           }
-          return 0.0;
+          return 0;
+        }
+
+        public boolean handOfArea(Feature feature) {
+                return (signedArea(feature) < 0);
+        }
+        
+        public static double calcArea(Feature feature) {
+          return Math.abs(signedArea(feature)) * 3444 * 3444 / 2.0;
         }
 

applications/editors/josm/plugins/smed2/src/seamap/SeaMap.java

@@ -26 +26 @@
                 UNKN, NODE, LINE, AREA
         }
+        
+        public enum Nflag {
+                ANON, ISOL, CONN
+        }
+
+        public class Coord {
+                public double lat;
+                public double lon;
+                public Nflag flg;
+
+                public Coord(double ilat, double ilon) {
+                        lat = ilat;
+                        lon = ilon;
+                        flg = Nflag.ANON;
+                }
+                public Coord(double ilat, double ilon, Nflag iflg) {
+                        lat = ilat;
+                        lon = ilon;
+                        flg = iflg;
+                }
+        }
 
         public class AttItem {
@@ -98 +119 @@
                         atts = new AttMap();
                         objs = new ObjMap();
-                }
-        }
-
-        public class Coord {
-                public double lat;
-                public double lon;
-
-                public Coord(double ilat, double ilon) {
-                        lat = ilat;
-                        lon = ilon;
                 }
         }

applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

@@ -112 +112 @@
                 editFrame.setResizable(true);
                 editFrame.setAlwaysOnTop(true);
-                editFrame.setVisible(false);
+                editFrame.setVisible(true);
                 panelMain = new PanelMain();
                 editFrame.add(panelMain);