X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=importPicture%2Fsrc%2Fosm%2Fjp%2Fgpx%2Fmatchtime%2Fgui%2FAdjustTime.java;h=b22ee1644496870967d9943da2369cfc47d6d9eb;hb=87953c1f1830921c0fcb349588accffe7698ab8f;hp=c6e22c32166a680f0c51ba419e501baf419ea772;hpb=edfa8b74ea99510c3a32532a7f433d4969c9a354;p=importpicture%2Fimportpicture.git

diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
index c6e22c3..b22ee16 100644
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
+++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
@@ -25,8 +25,8 @@ import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
 public class AdjustTime extends JFrame
 {
     public static final String PROGRAM_NAME = "AdjustTime for JOSM";
-    public static final String PROGRAM_VARSION = "3.0";
-    public static final String PROGRAM_UPDATE = "2016/10/04";
+    public static final String PROGRAM_VARSION = "3.1";
+    public static final String PROGRAM_UPDATE = "2017/05/15";
 	
     // Used for addNotify check.
     boolean fComponentsAdjusted = false;
@@ -49,6 +49,7 @@ public class AdjustTime extends JFrame
     ParameterPanelImageFile arg2_baseTimeImg;
     ParameterPanel arg3_basetiome;
     JCheckBox outputIMG;	// IMGの変換 する／しない
+    JCheckBox outputIMG_all;	// 'out of GPX time'でもIMGの変換をする　{ON | OFF}
     JCheckBox exifON;		// EXIF 書き出しモード ／ !(EXIFの書き換えはしない)
     JCheckBox gpxOutputWpt;	// GPXに<WPT>を書き出す
     JCheckBox gpxOverwriteMagvar;	// ソースGPXの<MAGVAR>を無視する
@@ -119,6 +120,9 @@ public class AdjustTime extends JFrame
             else if (object == outputIMG) {
             	outputIMG_Action(event);
             }
+            else if (object == outputIMG_all) {
+            	outputIMGall_Action(event);
+            }
             else if (object == exifON) {
             	exifON_Action(event);
             }
@@ -281,6 +285,9 @@ public class AdjustTime extends JFrame
         outputIMG = new JCheckBox("IMGの変換をする", Boolean.parseBoolean(params.getProperty(AppParameters.IMG_OUTPUT)));
         tmpPanel5.add(outputIMG);
 
+        outputIMG_all = new JCheckBox("GPXファイル時間外のファイルもコピーする", Boolean.parseBoolean(params.getProperty(AppParameters.IMG_OUTPUT_ALL)));
+        tmpPanel5.add(outputIMG_all);
+
         arg5_outputFolder = new ParameterPanelFolder("出力フォルダ: ", params.getProperty(AppParameters.IMG_OUTPUT_FOLDER));
         tmpPanel5.add(arg5_outputFolder);
 
@@ -338,6 +345,7 @@ public class AdjustTime extends JFrame
         arg2_baseTimeImg.argField.addActionListener(lSymAction);
         arg2_baseTimeImg.openButton.addActionListener(lSymAction);
         doButton.addActionListener(lSymAction);
+        outputIMG_all.addActionListener(lSymAction);
         exifON.addActionListener(lSymAction);
         gpxOutputSpeed.addActionListener(lSymAction);
         noFirstNode.addActionListener(lSymAction);
@@ -552,6 +560,9 @@ public class AdjustTime extends JFrame
 		arg5_outputFolder.setEnabled(outputIMG.isEnabled());
     }
 
+    void outputIMGall_Action (ActionEvent event) {
+    }
+
     /**
      * checkbox[EXIF書き出し]を変更した場合のアクション
      * @param event
@@ -604,6 +615,7 @@ public class AdjustTime extends JFrame
         this.params.setProperty(AppParameters.IMG_TIME, arg3_basetiome.getText());
         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_ALL, String.valueOf(exifON.isSelected()));
         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()));