Changeset 30298 in osm

Timestamp:

2014-02-19T10:26:43+01:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2

Files:

• images/exportButton.png (copied) (copied from applications/editors/josm/plugins/smed2/src/images/exportButton.png )
• images/fileButton.png (copied) (copied from applications/editors/josm/plugins/smed2/src/images/fileButton.png )
• images/fileButton.svg (copied) (copied from applications/editors/josm/plugins/smed2/src/images/fileButton.svg )
• images/importButton.png (copied) (copied from applications/editors/josm/plugins/smed2/src/images/importButton.png )
• js57toosm/src/js57toosm/Js57toosm.java (modified) (1 diff)
• resources/msg (moved) (moved from applications/editors/josm/plugins/smed2/src/messages/msg )
• src/images (deleted)
• src/messages/Messages.java (modified) (1 diff)
• src/panels/PanelMain.java (modified) (5 diffs)
• src/panels/PanelS57.java (modified) (6 diffs)
• src/smed2/Smed2Action.java (modified) (2 diffs)

applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java

@@ -52 +52 @@
 
                 out.format("<?xml version='1.0' encoding='UTF-8'?>%n");
-                out.format("<osm version='0.6' generator='js57toosm'>%n");
+                out.format("<osm version='0.6' upload='false' generator='js57toosm'>%n");
                 out.format("<bounds minlat='%.8f' minlon='%.8f' maxlat='%.8f' maxlon='%.8f'/>%n", bounds.minlat, bounds.minlon, bounds.maxlat, bounds.maxlon);
 

applications/editors/josm/plugins/smed2/src/messages/Messages.java

@@ -14 +14 @@
 
 public class Messages {
-        private static final String BUNDLE_NAME = "msg.messages";
+        private static final String BUNDLE_NAME = "resources/msg.messages";
 
         private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

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

@@ -52 +52 @@
                         if (e.getSource() == importButton) {
                                 Smed2Action.panelS57.setVisible(true);
-        messageBar.setText("Select S-57 ENC file for import");
+        setStatus("Select S-57 ENC file for import", Color.yellow);
                                 int returnVal = ifc.showOpenDialog(Main.parent);
                                 if (returnVal == JFileChooser.APPROVE_OPTION) {
@@ -60 +60 @@
                                         } catch (IOException e1) {
                                                 Smed2Action.panelS57.setVisible(false);
-                                                messageBar.setText("IO Exception");
+                                                setStatus("IO Exception", Color.red);
                                         }
                                 } else {
                                         Smed2Action.panelS57.setVisible(false);
-                                        messageBar.setText("");
+                                        clrStatus();
                                 }
                         }
@@ -76 +76 @@
                         if (e.getSource() == exportButton) {
                                 Smed2Action.panelS57.setVisible(true);
-        messageBar.setText("Select S-57 ENC file for export");
+        setStatus("Select S-57 ENC file for export", Color.yellow);
         int returnVal = efc.showOpenDialog(Main.parent);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
@@ -83 +83 @@
                                         } catch (IOException e1) {
                                                 Smed2Action.panelS57.setVisible(false);
-                                                messageBar.setText("IO Exception");
+                                                setStatus("IO Exception", Color.red);
                                         }
          } else {
                                         Smed2Action.panelS57.setVisible(false);
-                                        messageBar.setText("");
+                                        clrStatus();
          }
       }
@@ -153 +153 @@
                 g2.setBackground(new Color(0xb5d0d0));
                 if (img != null) g2.clearRect(0, 0, img.getWidth(), img.getHeight());
-                g2.drawImage(img, 0, 0, null);;
+                g2.drawImage(img, 0, 0, null);
+        }
+        
+        public static void setStatus(String text, Color bg) {
+                messageBar.setBackground(bg);
+                messageBar.setText(text);
+        }
+        
+        public static void clrStatus() {
+                messageBar.setBackground(Color.white);
+                messageBar.setText("");
         }
         

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

@@ -10 +10 @@
 package panels;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.io.*;
@@ -51 +52 @@
                 JFileChooser ifc = new JFileChooser(Main.pref.get("smed2plugin.file"));
                 FileInputStream in = new FileInputStream(inf);
-                PanelMain.messageBar.setText("Select OSM types file");
+                PanelMain.setStatus("Select OSM types file", Color.yellow);
                 ifc.setCurrentDirectory(inf);
                 int returnVal = ifc.showOpenDialog(Main.parent);
@@ -65 +66 @@
                 MapBounds bounds = S57dec.decodeFile(in, types, map);
 
-                PanelMain.messageBar.setText("Import done");
                 in.close();
                 
@@ -85 +85 @@
                                                                         node.setOsmId(ref, 1);
                                                                         data.addPrimitive(node);
-//                                                                      out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
-//                                                                      out.format("    <tag k='seamark:type' v=\"%s\"/>%n", type);
-//                                                                      if ((feature.type == Obj.SOUNDG) && (node.flg == S57map.Nflag.DPTH))
-//                                                                              out.format("    <tag k='seamark:sounding:depth' v='%.1f'/>%n", ((Dnode) node).val);
                                                                         addKeys(node, feature, type);
                                                                         done.add(ref);
@@ -195 +191 @@
                 Main.map.mapView.addLayer(layer);
                 Main.map.mapView.zoomTo(new Bounds(bounds.minlat, bounds.minlon, bounds.maxlat, bounds.maxlon));
+                PanelMain.setStatus("Import done", Color.green);
         }
 
@@ -203 +200 @@
                 }
                 keys.put("seamark:type", type);
+                if (feature.type == Obj.SOUNDG) {
+                        Snode snode = map.nodes.get(feature.geom.elems.get(0).id);
+                        if (snode.flg == S57map.Nflag.DPTH) {
+                                keys.put("seamark:sounding:depth", ((Double)((Dnode)snode).val).toString());
+                        }
+                }
                 for (Map.Entry<Att, AttVal<?>> item : feature.atts.entrySet()) {
                         String attstr = S57att.stringAttribute(item.getKey());

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

@@ -191 +191 @@
                                 } else {
                                         showFrame.setVisible(false);
-                                        PanelMain.messageBar.setText(tr("Select only one object"));
+                                        PanelMain.setStatus(tr("Select only one object"), Color.orange);
                                 }
                         }
@@ -198 +198 @@
                                 panelMain.clearMark();
                                 showFrame.setVisible(false);
-                                PanelMain.messageBar.setText(tr("Select a map object"));
+                                PanelMain.setStatus(tr("Select a map object"), Color.yellow);
                         }
                 }