• R/O
  • HTTP
  • SSH
  • HTTPS

importpicture: Commit


Commit MetaInfo

Revisiónfaf081cbee65a9a26152a9f0949cad85aa4547d1 (tree)
Tiempo2017-06-27 22:46:38
Autorhayashi <hayashi.yuu@gmai...>
Commiterhayashi

Log Message

green: ImportPictureTest

Cambiar Resumen

Diferencia incremental

--- 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 {
473473 }
474474 }
475475 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|", "", "", ""));
477478 if (!this.param_ImgOutputAll) {
478479 continue;
479480 }
--- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java
+++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
@@ -418,7 +418,7 @@ public class ImportPictureTest {
418418 "testdata/separate.tar.gz",
419419 "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
420420 "testdata/cameradata/separate.gpx",
421- "testdata/AdjustTime.M3a.separate.ini",
421+ "testdata/AdjustTime.M2a.separate.ini",
422422 new Expecter[] {
423423 // GPX file
424424 new Expecter("separate/separate_.gpx", true),
@@ -454,7 +454,7 @@ public class ImportPictureTest {
454454 "testdata/separate.tar.gz",
455455 "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
456456 "testdata/cameradata/separate.gpx",
457- "testdata/AdjustTime.M3b.separate.ini",
457+ "testdata/AdjustTime.M2b.separate.ini",
458458 new Expecter[] {
459459 // GPX file
460460 new Expecter("separate/separate_.gpx", true),
@@ -490,7 +490,7 @@ public class ImportPictureTest {
490490 "testdata/separate.tar.gz",
491491 "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
492492 "testdata/cameradata/separate.gpx",
493- "testdata/AdjustTime.M3c.separate.ini",
493+ "testdata/AdjustTime.M2c.separate.ini",
494494 new Expecter[] {
495495 // GPX file
496496 new Expecter("separate/separate_.gpx", true),
@@ -526,7 +526,7 @@ public class ImportPictureTest {
526526 "testdata/separate.tar.gz",
527527 "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
528528 "testdata/cameradata/separate.gpx",
529- "testdata/AdjustTime.M3d.separate.ini",
529+ "testdata/AdjustTime.M2d.separate.ini",
530530 new Expecter[] {
531531 // GPX file
532532 new Expecter("separate/separate_.gpx", true),
@@ -541,8 +541,8 @@ public class ImportPictureTest {
541541 new Expecter("separate/20170529_102405A.jpg", true),
542542
543543 // 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),
546546
547547 // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
548548 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
33 GPX.BASETIME=FILE_UPDATE
44 IMG.OUTPUT_EXIF=true
5-GPX.OUTPUT_SPEED=false
65 GPX.OUTPUT_WPT=false
7-IMG.OUTPUT_ALL=false
6+GPX.OUTPUT_SPEED=true
7+IMG.OUTPUT_ALL=true
88 GPX.noFirstNode=true
99 IMG.OUTPUT=true
1010 GPX.gpxSplit=true
11+IMG.TIME=2017-05-29T01\:31\:46Z
12+GPX.OVERWRITE_MAGVAR=true
1113 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
Show on old repository browser