diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java index ac14872..2c79ac2 100644 --- a/importPicture/src/osm/jp/gpx/ImportPicture.java +++ b/importPicture/src/osm/jp/gpx/ImportPicture.java @@ -473,7 +473,8 @@ } } if (trkptE == null) { - System.out.println(String.format("%-52s|", " Out of GPX logging time.")); + System.out.print(String.format("%-14s %-14s|", "", "")); + System.out.println(String.format("%8s|%6s|%6s|", "", "", "")); if (!this.param_ImgOutputAll) { continue; } diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java index 8120a2b..ef12b72 100644 --- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java +++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java @@ -418,7 +418,7 @@ "testdata/separate.tar.gz", "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M3a.separate.ini", + "testdata/AdjustTime.M2a.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true), @@ -454,7 +454,7 @@ "testdata/separate.tar.gz", "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M3b.separate.ini", + "testdata/AdjustTime.M2b.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true), @@ -490,7 +490,7 @@ "testdata/separate.tar.gz", "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M3c.separate.ini", + "testdata/AdjustTime.M2c.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true), @@ -526,7 +526,7 @@ "testdata/separate.tar.gz", "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", "testdata/cameradata/separate.gpx", - "testdata/AdjustTime.M3d.separate.ini", + "testdata/AdjustTime.M2d.separate.ini", new Expecter[] { // GPX file new Expecter("separate/separate_.gpx", true), @@ -541,8 +541,8 @@ new Expecter("separate/20170529_102405A.jpg", true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", false), - new Expecter("separate/20170529_102418A.jpg", false), + new Expecter("separate/20170529_102409A.jpg", true), + new Expecter("separate/20170529_102418A.jpg", true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) new Expecter("separate/20170529_102448A.jpg", true), diff --git a/importPicture/testdata/AdjustTime.M2b.separate.ini b/importPicture/testdata/AdjustTime.M2b.separate.ini index 8be595f..12b8aed 100644 --- a/importPicture/testdata/AdjustTime.M2b.separate.ini +++ b/importPicture/testdata/AdjustTime.M2b.separate.ini @@ -1,16 +1,17 @@ -#defuilt settings -#Tue Jun 27 19:19:34 JST 2017 +#by AdjustTime +#Sun Jun 25 09:32:18 JST 2017 GPX.BASETIME=FILE_UPDATE IMG.OUTPUT_EXIF=true -GPX.OUTPUT_SPEED=false GPX.OUTPUT_WPT=false -IMG.OUTPUT_ALL=false +GPX.OUTPUT_SPEED=true +IMG.OUTPUT_ALL=true GPX.noFirstNode=true IMG.OUTPUT=true GPX.gpxSplit=true +IMG.TIME=2017-05-29T01\:31\:46Z +GPX.OVERWRITE_MAGVAR=true GPX.REUSE=false -GPX.OVERWRITE_MAGVAR=false -IMG.BASE_FILE= -IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. -GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. +IMG.BASE_FILE=20170529_103146A.jpg +IMG.SOURCE_FOLDER=testdata/cameradata/separate +GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx +IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/importPicture/testdata/AdjustTime.M2c.separate.ini b/importPicture/testdata/AdjustTime.M2c.separate.ini new file mode 100644 index 0000000..f432ba7 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M2c.separate.ini @@ -0,0 +1,17 @@ +#by AdjustTime +#Sun Jun 25 09:32:18 JST 2017 +GPX.BASETIME=EXIF_TIME +IMG.OUTPUT_EXIF=true +GPX.OUTPUT_WPT=false +GPX.OUTPUT_SPEED=true +IMG.OUTPUT_ALL=false +GPX.noFirstNode=true +IMG.OUTPUT=true +GPX.gpxSplit=true +IMG.TIME=2017-05-29T01\:31\:46Z +GPX.OVERWRITE_MAGVAR=true +GPX.REUSE=false +IMG.BASE_FILE=20170529_103146A.jpg +IMG.SOURCE_FOLDER=testdata/cameradata/separate +GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx +IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/importPicture/testdata/AdjustTime.M2d.separate.ini b/importPicture/testdata/AdjustTime.M2d.separate.ini new file mode 100644 index 0000000..d0ab153 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M2d.separate.ini @@ -0,0 +1,17 @@ +#by AdjustTime +#Sun Jun 25 09:32:18 JST 2017 +GPX.BASETIME=EXIF_TIME +IMG.OUTPUT_EXIF=true +GPX.OUTPUT_WPT=false +GPX.OUTPUT_SPEED=true +IMG.OUTPUT_ALL=true +GPX.noFirstNode=true +IMG.OUTPUT=true +GPX.gpxSplit=true +IMG.TIME=2017-05-29T01\:31\:46Z +GPX.OVERWRITE_MAGVAR=true +GPX.REUSE=false +IMG.BASE_FILE=20170529_103146A.jpg +IMG.SOURCE_FOLDER=testdata/cameradata/separate +GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx +IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output