diff --git a/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java b/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java index d54e1bd..a3bcae0 100644 --- a/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java +++ b/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java @@ -38,15 +38,23 @@ } } - public void printinfo() { - System.out.println(" +--------------------+--------------------|"); - System.out.println(" GPS logging time | First Time | Last Time |"); + public void printheader() { System.out.println("|--------------------------------+--------------------+--------------------|"); + System.out.println("| GPS logging time | First Time | Last Time |"); + System.out.println("|--------------------------------+--------------------+--------------------|"); + } + + public void printfooter() { + System.out.println("|--------------------------------+--------------------+--------------------|"); + System.out.println(); + } + + public void printinfo() { + printheader(); for (java.util.Map.Entry map : this.entrySet()) { ElementMapTRKPT mapTRKPT = map.getValue(); mapTRKPT.printinfo(); } - System.out.println("|--------------------------------+--------------------+--------------------|"); - System.out.println(); + printfooter(); } } diff --git a/src/main/java/osm/jp/gpx/GpxFile.java b/src/main/java/osm/jp/gpx/GpxFile.java index d8d5c2f..3b16595 100644 --- a/src/main/java/osm/jp/gpx/GpxFile.java +++ b/src/main/java/osm/jp/gpx/GpxFile.java @@ -22,6 +22,10 @@ this.gpx = new GpxParser(params); } + /** + * XMLパースを実行する + * + */ public ElementMapTRKSEG parse() throws ParserConfigurationException, SAXException, IOException { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setValidating(false); @@ -43,9 +47,16 @@ gpx.trkseg.put((ElementMapTRKPT)gpx.trkpt.clone()); gpx.trkpt.clear(); } - - // 表示 - gpx.trkseg.printinfo(); return gpx.trkseg; } + + /** + * インスタンス状態の表示(parse()実行後に有効になる) + * + */ + public void printinfo() { + // 表示 + System.out.println(String.format("GPX file: '%s'", getName())); + gpx.trkseg.printinfo(); + } } diff --git a/src/main/java/osm/jp/gpx/ImgFile.java b/src/main/java/osm/jp/gpx/ImgFile.java index 000f7c8..6c7309f 100644 --- a/src/main/java/osm/jp/gpx/ImgFile.java +++ b/src/main/java/osm/jp/gpx/ImgFile.java @@ -130,25 +130,6 @@ return true; } - String toText() { - String ret = ""; - if (isDone()) { - ret += (String.format("|%-32s|", this.getName())); - ret += (String.format("%20s|", (imgtime==null ? "" : ImportPicture.toUTCString(imgtime)))); - ret += (String.format("%20s|", (gpstime==null ? "" : ImportPicture.toUTCString(gpstime)))); - ret += (String.format("%14.10f|%14.10f|", latitude, longitude)); - ret += (String.format("%8s|%6s|%6s|", eleStr, magvarStr, speedStr)); - } - else { - ret += (String.format("|%-32s|", this.getName())); - ret += (String.format("%20s|", (imgtime==null ? "" : ImportPicture.toUTCString(imgtime)))); - ret += (String.format("%20s|", (gpstime==null ? "" : ImportPicture.toUTCString(gpstime)))); - ret += (String.format("%-14s|%-14s|", "", "")); - ret += (String.format("%8s|%6s|%6s|", "", "", "")); - } - return ret; - } - void exifWrite(File imageFile, Date correctedtime, TagTrkpt trkptT, File outDir) throws ImageReadException, IOException, ImageWriteException { DecimalFormat yearFormatter = new DecimalFormat("0000"); DecimalFormat monthFormatter = new DecimalFormat("00"); @@ -279,4 +260,41 @@ } } + /** + * ImgFileインスタンスの状態をTEXT化 + * @return 1行 + */ + String toText() { + String ret = ""; + if (isDone()) { + ret += (String.format("|%-32s|", this.getName())); + ret += (String.format("%20s|", (imgtime==null ? "" : ImportPicture.toUTCString(imgtime)))); + ret += (String.format("%20s|", (gpstime==null ? "" : ImportPicture.toUTCString(gpstime)))); + ret += (String.format("%14.10f|%14.10f|", latitude, longitude)); + ret += (String.format("%8s|%6s|%6s|", eleStr, magvarStr, speedStr)); + } + else { + ret += (String.format("|%-32s|", this.getName())); + ret += (String.format("%20s|", (imgtime==null ? "" : ImportPicture.toUTCString(imgtime)))); + ret += (String.format("%20s|", (gpstime==null ? "" : ImportPicture.toUTCString(gpstime)))); + ret += (String.format("%-14s|%-14s|", "", "")); + ret += (String.format("%8s|%6s|%6s|", "", "", "")); + } + return ret; + } + + public void printinfo() { + System.out.println(toText()); + } + + public static void printheader() { + System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |"); + System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + } + + public static void printfooter() { + System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + System.out.println(); + } } diff --git a/src/main/java/osm/jp/gpx/ImgFolder.java b/src/main/java/osm/jp/gpx/ImgFolder.java index afdfee0..bd63ee6 100644 --- a/src/main/java/osm/jp/gpx/ImgFolder.java +++ b/src/main/java/osm/jp/gpx/ImgFolder.java @@ -56,16 +56,16 @@ System.out.println(); // imgDir内の画像ファイルを処理する - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |"); - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + //System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + //System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |"); + //System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); //ElementMapTRKSEG seg = gpxFile.parse(); for (ImgFile image : this) { try { if (!image.isDone()) { if(image.procImageFile(params, delta, gpxFile, outDir)) { - System.out.println(image.toText()); + //System.out.println(image.toText()); image.setDone(true); } } @@ -76,7 +76,7 @@ } } - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + //System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); } /** diff --git a/src/main/java/osm/jp/gpx/ImportPicture.java b/src/main/java/osm/jp/gpx/ImportPicture.java index e2fb67f..8350e40 100644 --- a/src/main/java/osm/jp/gpx/ImportPicture.java +++ b/src/main/java/osm/jp/gpx/ImportPicture.java @@ -158,18 +158,18 @@ return; } - for (File gpxFile : gpxFolder) { - imgFolder.procGPXfile(new GpxFile(params, gpxFile), delta); + for (GpxFile gpxFile : gpxFolder) { + gpxFile.parse(); + gpxFile.printinfo(); + imgFolder.procGPXfile(gpxFile, delta); } // imgDir内の画像ファイルを処理する - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |"); - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + ImgFile.printheader(); for (ImgFile image : imgFolder) { - System.out.println(image.toText()); + image.printinfo(); } - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); + ImgFile.printfooter(); } catch(ParserConfigurationException | SAXException | IOException | ParseException | ImageReadException | ImageWriteException | IllegalArgumentException | TransformerException e) { e.printStackTrace();