OSDN > Buscar Software > Scientific/Engineering > Mapping > GPS (Global Positioning System) > AdjustTime > SCM > git > importpicture > Commit

AdjustTime
Fork

importpicture: Commit

green: ImportPictureTest

--- a/importPicture/src/osm/jp/gpx/ImportPicture.java

+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java

		@@ -473,7 +473,8 @@ public class ImportPicture extends Thread {
473	473	}
474	474	}
475	475	if (trkptE == null) {
476		- System.out.println(String.format("%-52s\|", " Out of GPX logging time."));
	476	+ System.out.print(String.format("%-14s %-14s\|", "", ""));
	477	+ System.out.println(String.format("%8s\|%6s\|%6s\|", "", "", ""));
477	478	if (!this.param_ImgOutputAll) {
478	479	continue;
479	480	}

--- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java

+++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java

		@@ -418,7 +418,7 @@ public class ImportPictureTest {
418	418	"testdata/separate.tar.gz",
419	419	"testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
420	420	"testdata/cameradata/separate.gpx",
421		- "testdata/AdjustTime.M3a.separate.ini",
	421	+ "testdata/AdjustTime.M2a.separate.ini",
422	422	new Expecter[] {
423	423	// GPX file
424	424	new Expecter("separate/separate_.gpx", true),

		@@ -454,7 +454,7 @@ public class ImportPictureTest {
454	454	"testdata/separate.tar.gz",
455	455	"testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
456	456	"testdata/cameradata/separate.gpx",
457		- "testdata/AdjustTime.M3b.separate.ini",
	457	+ "testdata/AdjustTime.M2b.separate.ini",
458	458	new Expecter[] {
459	459	// GPX file
460	460	new Expecter("separate/separate_.gpx", true),

		@@ -490,7 +490,7 @@ public class ImportPictureTest {
490	490	"testdata/separate.tar.gz",
491	491	"testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
492	492	"testdata/cameradata/separate.gpx",
493		- "testdata/AdjustTime.M3c.separate.ini",
	493	+ "testdata/AdjustTime.M2c.separate.ini",
494	494	new Expecter[] {
495	495	// GPX file
496	496	new Expecter("separate/separate_.gpx", true),

		@@ -526,7 +526,7 @@ public class ImportPictureTest {
526	526	"testdata/separate.tar.gz",
527	527	"testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
528	528	"testdata/cameradata/separate.gpx",
529		- "testdata/AdjustTime.M3d.separate.ini",
	529	+ "testdata/AdjustTime.M2d.separate.ini",
530	530	new Expecter[] {
531	531	// GPX file
532	532	new Expecter("separate/separate_.gpx", true),

		@@ -541,8 +541,8 @@ public class ImportPictureTest {
541	541	new Expecter("separate/20170529_102405A.jpg", true),
542	542
543	543	// out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
544		- new Expecter("separate/20170529_102409A.jpg", false),
545		- new Expecter("separate/20170529_102418A.jpg", false),
	544	+ new Expecter("separate/20170529_102409A.jpg", true),
	545	+ new Expecter("separate/20170529_102418A.jpg", true),
546	546
547	547	// in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
548	548	new Expecter("separate/20170529_102448A.jpg", true),

--- a/importPicture/testdata/AdjustTime.M2b.separate.ini

+++ b/importPicture/testdata/AdjustTime.M2b.separate.ini

		@@ -1,16 +1,17 @@
1		-#defuilt settings
2		-#Tue Jun 27 19:19:34 JST 2017
	1	+#by AdjustTime
	2	+#Sun Jun 25 09:32:18 JST 2017
3	3	GPX.BASETIME=FILE_UPDATE
4	4	IMG.OUTPUT_EXIF=true
5		-GPX.OUTPUT_SPEED=false
6	5	GPX.OUTPUT_WPT=false
7		-IMG.OUTPUT_ALL=false
	6	+GPX.OUTPUT_SPEED=true
	7	+IMG.OUTPUT_ALL=true
8	8	GPX.noFirstNode=true
9	9	IMG.OUTPUT=true
10	10	GPX.gpxSplit=true
	11	+IMG.TIME=2017-05-29T01\:31\:46Z
	12	+GPX.OVERWRITE_MAGVAR=true
11	13	GPX.REUSE=false
12		-GPX.OVERWRITE_MAGVAR=false
13		-IMG.BASE_FILE=
14		-IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
15		-GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
16		-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
	14	+IMG.BASE_FILE=20170529_103146A.jpg
	15	+IMG.SOURCE_FOLDER=testdata/cameradata/separate
	16	+GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
	17	+IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output

--- /dev/null

+++ b/importPicture/testdata/AdjustTime.M2c.separate.ini

		@@ -0,0 +1,17 @@
	1	+#by AdjustTime
	2	+#Sun Jun 25 09:32:18 JST 2017
	3	+GPX.BASETIME=EXIF_TIME
	4	+IMG.OUTPUT_EXIF=true
	5	+GPX.OUTPUT_WPT=false
	6	+GPX.OUTPUT_SPEED=true
	7	+IMG.OUTPUT_ALL=false
	8	+GPX.noFirstNode=true
	9	+IMG.OUTPUT=true
	10	+GPX.gpxSplit=true
	11	+IMG.TIME=2017-05-29T01\:31\:46Z
	12	+GPX.OVERWRITE_MAGVAR=true
	13	+GPX.REUSE=false
	14	+IMG.BASE_FILE=20170529_103146A.jpg
	15	+IMG.SOURCE_FOLDER=testdata/cameradata/separate
	16	+GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
	17	+IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output

--- /dev/null

+++ b/importPicture/testdata/AdjustTime.M2d.separate.ini

		@@ -0,0 +1,17 @@
	1	+#by AdjustTime
	2	+#Sun Jun 25 09:32:18 JST 2017
	3	+GPX.BASETIME=EXIF_TIME
	4	+IMG.OUTPUT_EXIF=true
	5	+GPX.OUTPUT_WPT=false
	6	+GPX.OUTPUT_SPEED=true
	7	+IMG.OUTPUT_ALL=true
	8	+GPX.noFirstNode=true
	9	+IMG.OUTPUT=true
	10	+GPX.gpxSplit=true
	11	+IMG.TIME=2017-05-29T01\:31\:46Z
	12	+GPX.OVERWRITE_MAGVAR=true
	13	+GPX.REUSE=false
	14	+IMG.BASE_FILE=20170529_103146A.jpg
	15	+IMG.SOURCE_FOLDER=testdata/cameradata/separate
	16	+GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
	17	+IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output