Changeset 30285 in osm for applications/editors/josm/plugins/smed2/src/panels

Timestamp:

2014-02-17T14:27:01+01:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/panels

Files:

• PanelMain.java (modified) (8 diffs)
• ShowFrame.java (modified) (1 diff)

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

@@ +1 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see <http://www.gnu.org/licenses/>.
+ */
+
 package panels;
 
@@ -9 +18 @@
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.io.*;
 
 import javax.imageio.ImageIO;
@@ -20 +27 @@
 import org.openstreetmap.josm.Main;
 
-import s57.S57att.Att;
-import s57.S57obj.Obj;
-import s57.S57val.*;
+import s57.S57att.*;
+import s57.S57obj.*;
 import s57.S57map.*;
 import render.Renderer;
@@ -29 +35 @@
 public class PanelMain extends JPanel {
 
-        Smed2Action dlg;
         BufferedImage img;
         int w, h, z, f;
@@ -42 +47 @@
         };
         private JButton importButton = null;
-        final JFileChooser ifc = new JFileChooser();
+        JFileChooser ifc = new JFileChooser(Main.pref.get("smed2plugin.file"));
         private ActionListener alImport = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         if (e.getSource() == importButton) {
-        messageBar.setText("Select file");
-        int returnVal = ifc.showOpenDialog(Main.parent);
-        if (returnVal == JFileChooser.APPROVE_OPTION) {
-//          xxx.startImport(ifc.getSelectedFile());
-         } else {
-           messageBar.setText("");
-         }
-      }
+                                Smed2Action.panelS57.setVisible(true);
+        messageBar.setText("Select S-57 ENC file for import");
+                                int returnVal = ifc.showOpenDialog(Main.parent);
+                                if (returnVal == JFileChooser.APPROVE_OPTION) {
+                                        try {
+                                                Main.pref.put("smed2plugin.file", ifc.getSelectedFile().getPath());
+                                                Smed2Action.panelS57.startImport(ifc.getSelectedFile());
+                                        } catch (IOException e1) {
+                                                Smed2Action.panelS57.setVisible(false);
+                                                messageBar.setText("IO Exception");
+                                        }
+                                } else {
+                                        Smed2Action.panelS57.setVisible(false);
+                                        messageBar.setText("");
+                                }
+                        }
                 }
         };
@@ -62 +75 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
                         if (e.getSource() == exportButton) {
-        messageBar.setText("Select file");
+                                Smed2Action.panelS57.setVisible(true);
+        messageBar.setText("Select S-57 ENC file for export");
         int returnVal = efc.showOpenDialog(Main.parent);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
-//          xxx.startExport(efc.getSelectedFile());
+                try {
+                                                Smed2Action.panelS57.startExport(efc.getSelectedFile());
+                                        } catch (IOException e1) {
+                                                Smed2Action.panelS57.setVisible(false);
+                                                messageBar.setText("IO Exception");
+                                        }
          } else {
-           messageBar.setText("");
+                                        Smed2Action.panelS57.setVisible(false);
+                                        messageBar.setText("");
          }
       }
@@ -73 +93 @@
         };
 
-        public PanelMain(Smed2Action dia) {
-                dlg = dia;
+        public PanelMain() {
                 setLayout(null);
                 setSize(new Dimension(480, 480));
@@ -120 +139 @@
                 img = new BufferedImage(Integer.parseInt(wt.getText()), Integer.parseInt(ht.getText()), BufferedImage.TYPE_INT_ARGB);
                 Graphics2D g2 = img.createGraphics();
-                Renderer.reRender(g2, Integer.parseInt(zt.getText()), Integer.parseInt(ft.getText()), dlg.map, dlg.rendering);
+                Renderer.reRender(g2, Integer.parseInt(zt.getText()), Integer.parseInt(ft.getText()), Smed2Action.map, Smed2Action.rendering);
                 try {
                         ImageIO.write(img, "png", new File("/Users/mherring/Desktop/export.png"));

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

@@ +1 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see <http://www.gnu.org/licenses/>.
+ */
+
 package panels;