「ソースGPXのMAGVARを無視する」

diff --git a/importPicture/src/osm/jp/gpx/AppParameters.java b/importPicture/src/osm/jp/gpx/AppParameters.java
index 084329d..728b4be 100644 (file)
--- a/importPicture/src/osm/jp/gpx/AppParameters.java
+++ b/importPicture/src/osm/jp/gpx/AppParameters.java
@@ -47,6 +47,9 @@ public class AppParameters extends Properties {
        // 出力GPX: <SPEED>を上書き出力する {ON | OFF}
        public static String GPX_OUTPUT_SPEED = "GPX.OUTPUT_SPEED";
        
+       // 出力GPX: ソースGPXの<MAGVER>を無視する {ON | OFF}
+       public static String GPX_OVERWRITE_MAGVAR = "GPX.OVERWRITE_MAGVAR";
+       
        // 出力GPX: マーカー<wpt>を出力する {ON | OFF}
        public static String GPX_OUTPUT_WPT = "GPX.OUTPUT_WPT";
        
@@ -147,13 +150,21 @@ public class AppParameters extends Properties {
                }
                
                //------------------------------------------------
+               // GPX出力: ソースGPXの<MAGVAR>を無視する {ON | OFF}
+               valueStr = this.getProperty(GPX_OVERWRITE_MAGVAR);
+               if (valueStr == null) {
+                       update = true;
+                       this.setProperty(GPX_OVERWRITE_MAGVAR, String.valueOf(false));
+               }
+               
+               //------------------------------------------------
                // GPX出力: <SPEED>を上書き出力する {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 (file)
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -182,6 +182,11 @@ public class ImportPicture extends Thread {
                obj.param_GpxOutputWpt = true;\r
        }\r
        \r
+       paramStr = obj.params.getProperty(AppParameters.GPX_OVERWRITE_MAGVAR);\r
+       if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {\r
+               obj.param_GpxOverwriteMagvar = true;\r
+       }\r
+\r
        paramStr = obj.params.getProperty(AppParameters.GPX_OUTPUT_SPEED);\r
        if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {\r
                obj.param_GpxOutputSpeed = true;\r
@@ -232,6 +237,7 @@ public class ImportPicture extends Thread {
         System.out.println(" - param： "+ AppParameters.IMG_OUTPUT +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT));     \r
         System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_EXIF +"= '"+ String.valueOf(obj.exif) +"'");\r
         System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_WPT +"="+ obj.param_GpxOutputWpt);\r
+        System.out.println(" - param： "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ obj.param_GpxOverwriteMagvar);\r
         System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_SPEED +"="+ obj.param_GpxOutputSpeed);\r
         obj.start();\r
         try {\r
@@ -251,6 +257,7 @@ public class ImportPicture extends Thread {
        public boolean param_GpxNoFirstNode = false;\r
        public boolean param_GpxReuse = false;\r
        public boolean param_GpxOutputSpeed = false;\r
+       public boolean param_GpxOverwriteMagvar = false;\r
        public boolean param_GpxOutputWpt = true;\r
        \r
     @Override\r
@@ -681,7 +688,7 @@ public class ImportPicture extends Thread {
      * @param jptime   画像ファイルの撮影日時 ミリ秒（日本時間）\r
      * @throws ParseException\r
      */\r
-    public static Element trkpt(TreeMap<Long,Element> map, Date jptime) throws ParseException {\r
+    public Element trkpt(TreeMap<Long,Element> map, Date jptime) throws ParseException {\r
         Double R = 20000000 / Math.PI;\r
         long sa = 2L * 3600000L;\r
         long jpt = jptime.getTime();\r
@@ -708,7 +715,7 @@ public class ImportPicture extends Thread {
                         break;\r
                     }\r
                 }\r
-                if (magvar == null) {\r
+                if ((magvar == null) || param_GpxOverwriteMagvar) {\r
                     if (mae != null) {\r
                         Double maeLAT = null;\r
                         Double maeLON = null;\r

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 (file)
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java
+++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java
@@ -55,7 +55,7 @@ public class AboutDialog extends Dialog
         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 (file)
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
+++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
@@ -51,6 +51,7 @@ public class AdjustTime extends JFrame
     JCheckBox outputIMG;       // IMGの変換 する／しない
     JCheckBox exifON;          // EXIF 書き出しモード ／ !(EXIFの書き換えはしない)
     JCheckBox gpxOutputWpt;    // GPXに<WPT>を書き出す
+    JCheckBox gpxOverwriteMagvar;      // ソースGPXの<MAGVAR>を無視する
     JCheckBox gpxOutputSpeed;  // GPXに<SPEED>を書き出す
     ParameterPanelFolder arg5_outputFolder;       // EXIF 書き出しフォルダ
     ParameterPanelFolder arg4_gpxFolder;       // GPXファイル・フォルダ
@@ -290,6 +291,10 @@ public class AdjustTime extends JFrame
         gpxOutputWpt.setEnabled(true);
         tmpPanel5.add(gpxOutputWpt);
         
+        gpxOverwriteMagvar = new JCheckBox("ソースGPXの<MAGVAR>を無視する", Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OVERWRITE_MAGVAR)));
+        gpxOverwriteMagvar.setEnabled(true);
+        tmpPanel5.add(gpxOverwriteMagvar);
+        
         gpxOutputSpeed = new JCheckBox("出力GPXに<SPEED>を書き出す", Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_SPEED)));
         gpxOutputSpeed.setEnabled(false);
         tmpPanel5.add(gpxOutputSpeed);
@@ -600,6 +605,7 @@ public class AdjustTime extends JFrame
         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 {