diff --git a/importPicture/.classpath b/importPicture/.classpath index 3a059cd..775996d 100644 --- a/importPicture/.classpath +++ b/importPicture/.classpath @@ -2,6 +2,6 @@ - + diff --git a/importPicture/src/osm/jp/gpx/AppParameters.java b/importPicture/src/osm/jp/gpx/AppParameters.java index c2fc36b..ee7f98e 100644 --- a/importPicture/src/osm/jp/gpx/AppParameters.java +++ b/importPicture/src/osm/jp/gpx/AppParameters.java @@ -41,6 +41,10 @@ // 出力IMG: IMG出力をする {ON | OFF} public static String IMG_OUTPUT = "IMG.OUTPUT"; + // 出力IMG: 'out of time'も IMG出力の対象とする {ON | OFF} + //   この場合は、対象IMGフォルダ内のすべてのIMGファイルが出力フォルダに出力される + public static String IMG_OUTPUT_ALL = "IMG.OUTPUT_ALL"; + // 出力IMG: EXIFを変換する public static String IMG_OUTPUT_EXIF = "IMG.OUTPUT_EXIF"; @@ -119,6 +123,15 @@ this.setProperty(IMG_OUTPUT, String.valueOf(valueStr)); //------------------------------------------------ + // 出力IMG: 'out of time'も IMG出力の対象とする + valueStr = this.getProperty(IMG_OUTPUT_ALL); + if (valueStr == null) { + update = true; + valueStr = String.valueOf(false); + } + this.setProperty(IMG_OUTPUT_ALL, String.valueOf(valueStr)); + + //------------------------------------------------ // IMG出力: EXIFを変換する valueStr = this.getProperty(IMG_OUTPUT_EXIF); if (valueStr == null) { diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java index 46dd1c7..0fb6179 100644 --- a/importPicture/src/osm/jp/gpx/ImportPicture.java +++ b/importPicture/src/osm/jp/gpx/ImportPicture.java @@ -177,6 +177,11 @@ obj.param_GpxReuse = true; } + paramStr = obj.params.getProperty(AppParameters.IMG_OUTPUT_ALL); + if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) { + obj.param_GpxOutputWpt = true; + } + paramStr = obj.params.getProperty(AppParameters.GPX_OUTPUT_WPT); if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) { obj.param_GpxOutputWpt = true; @@ -243,6 +248,7 @@ System.out.println(" - param: "+ AppParameters.GPX_REUSE +"="+ obj.param_GpxReuse); System.out.println(" - param: "+ AppParameters.GPX_BASETIME +"="+ obj.params.getProperty(AppParameters.GPX_BASETIME) ); System.out.println(" - param: "+ AppParameters.IMG_OUTPUT +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT)); + System.out.println(" - param: "+ AppParameters.IMG_OUTPUT_ALL +"="+ obj.param_ImgOutputAll); System.out.println(" - param: "+ AppParameters.IMG_OUTPUT_EXIF +"= "+ String.valueOf(obj.exif)); System.out.println(" - param: "+ AppParameters.GPX_SOURCE_FOLDER +"="+ obj.param_GpxSourceFolder); System.out.println(" - param: "+ AppParameters.GPX_OUTPUT_WPT +"="+ obj.param_GpxOutputWpt); @@ -268,6 +274,7 @@ //public boolean Complementation.param_GpxOutputSpeed = false; //public boolean Complementation.param_GpxOverwriteMagvar = false; public boolean param_GpxOutputWpt = true; + public boolean param_ImgOutputAll = false; public String param_GpxSourceFolder = "."; public static final long DIFF_MAE_TIME = 3000L; // before 3 secound