diff --git a/importPicture/src/osm/jp/gpx/AppParameters.java b/importPicture/src/osm/jp/gpx/AppParameters.java index 084329d..728b4be 100644 --- a/importPicture/src/osm/jp/gpx/AppParameters.java +++ b/importPicture/src/osm/jp/gpx/AppParameters.java @@ -47,6 +47,9 @@ // 出力GPX: を上書き出力する {ON | OFF} public static String GPX_OUTPUT_SPEED = "GPX.OUTPUT_SPEED"; + // 出力GPX: ソースGPXのを無視する {ON | OFF} + public static String GPX_OVERWRITE_MAGVAR = "GPX.OVERWRITE_MAGVAR"; + // 出力GPX: マーカーを出力する {ON | OFF} public static String GPX_OUTPUT_WPT = "GPX.OUTPUT_WPT"; @@ -147,13 +150,21 @@ } //------------------------------------------------ + // GPX出力: ソースGPXのを無視する {ON | OFF} + valueStr = this.getProperty(GPX_OVERWRITE_MAGVAR); + if (valueStr == null) { + update = true; + this.setProperty(GPX_OVERWRITE_MAGVAR, String.valueOf(false)); + } + + //------------------------------------------------ // GPX出力: を上書き出力する {ON | OFF} valueStr = this.getProperty(GPX_OUTPUT_SPEED); if (valueStr == null) { update = true; this.setProperty(GPX_OUTPUT_SPEED, String.valueOf(false)); } - + //------------------------------------------------ // GPX出力: 生成されたGPXファイル(ファイル名が'_.gpx'で終わるもの)も対象にする。 {ON | OFF} valueStr = this.getProperty(GPX_REUSE); diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java index 998e6de..f37aa2d 100644 --- a/importPicture/src/osm/jp/gpx/ImportPicture.java +++ b/importPicture/src/osm/jp/gpx/ImportPicture.java @@ -182,6 +182,11 @@ obj.param_GpxOutputWpt = true; } + paramStr = obj.params.getProperty(AppParameters.GPX_OVERWRITE_MAGVAR); + if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) { + obj.param_GpxOverwriteMagvar = true; + } + paramStr = obj.params.getProperty(AppParameters.GPX_OUTPUT_SPEED); if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) { obj.param_GpxOutputSpeed = true; @@ -232,6 +237,7 @@ System.out.println(" - param: "+ AppParameters.IMG_OUTPUT +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT)); System.out.println(" - param: "+ AppParameters.IMG_OUTPUT_EXIF +"= '"+ String.valueOf(obj.exif) +"'"); System.out.println(" - param: "+ AppParameters.GPX_OUTPUT_WPT +"="+ obj.param_GpxOutputWpt); + System.out.println(" - param: "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ obj.param_GpxOverwriteMagvar); System.out.println(" - param: "+ AppParameters.GPX_OUTPUT_SPEED +"="+ obj.param_GpxOutputSpeed); obj.start(); try { @@ -251,6 +257,7 @@ public boolean param_GpxNoFirstNode = false; public boolean param_GpxReuse = false; public boolean param_GpxOutputSpeed = false; + public boolean param_GpxOverwriteMagvar = false; public boolean param_GpxOutputWpt = true; @Override @@ -681,7 +688,7 @@ * @param jptime 画像ファイルの撮影日時 ミリ秒(日本時間) * @throws ParseException */ - public static Element trkpt(TreeMap map, Date jptime) throws ParseException { + public Element trkpt(TreeMap map, Date jptime) throws ParseException { Double R = 20000000 / Math.PI; long sa = 2L * 3600000L; long jpt = jptime.getTime(); @@ -708,7 +715,7 @@ break; } } - if (magvar == null) { + if ((magvar == null) || param_GpxOverwriteMagvar) { if (mae != null) { Double maeLAT = null; Double maeLON = null; diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java index 69d2147..8e82bc4 100644 --- a/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java +++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java @@ -55,7 +55,7 @@ okButton.setLabel("OK"); okButton.setBounds(145,65,66,27); add(okButton); - label2 = new java.awt.Label("Copyright(C) 2014 yuuhayashi \n The MIT License (MIT).",Label.RIGHT); + label2 = new java.awt.Label("Copyright(C) 2014,2016, yuuhayashi \n The MIT License (MIT).",Label.RIGHT); label2.setBounds(10,40,340,20); add(label2); setTitle("About... "+ AdjustTime.PROGRAM_NAME); diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java index f6fd25c..9d57055 100644 --- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java +++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java @@ -51,6 +51,7 @@ JCheckBox outputIMG; // IMGの変換 する/しない JCheckBox exifON; // EXIF 書き出しモード / !(EXIFの書き換えはしない) JCheckBox gpxOutputWpt; // GPXにを書き出す + JCheckBox gpxOverwriteMagvar; // ソースGPXのを無視する JCheckBox gpxOutputSpeed; // GPXにを書き出す ParameterPanelFolder arg5_outputFolder; // EXIF 書き出しフォルダ ParameterPanelFolder arg4_gpxFolder; // GPXファイル・フォルダ @@ -290,6 +291,10 @@ gpxOutputWpt.setEnabled(true); tmpPanel5.add(gpxOutputWpt); + gpxOverwriteMagvar = new JCheckBox("ソースGPXのを無視する", Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OVERWRITE_MAGVAR))); + gpxOverwriteMagvar.setEnabled(true); + tmpPanel5.add(gpxOverwriteMagvar); + gpxOutputSpeed = new JCheckBox("出力GPXにを書き出す", Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_SPEED))); gpxOutputSpeed.setEnabled(false); tmpPanel5.add(gpxOutputSpeed); @@ -600,6 +605,7 @@ this.params.setProperty(AppParameters.IMG_OUTPUT, String.valueOf(outputIMG.isSelected())); this.params.setProperty(AppParameters.IMG_OUTPUT_FOLDER, arg5_outputFolder.getText()); this.params.setProperty(AppParameters.IMG_OUTPUT_EXIF, String.valueOf(exifON.isSelected())); + this.params.setProperty(AppParameters.GPX_OVERWRITE_MAGVAR, String.valueOf(gpxOverwriteMagvar.isSelected())); this.params.setProperty(AppParameters.GPX_OUTPUT_SPEED, String.valueOf(gpxOutputSpeed.isSelected())); this.params.setProperty(AppParameters.GPX_OUTPUT_WPT, String.valueOf(gpxOutputWpt.isSelected())); try {