import java.util.GregorianCalendar;\r
import java.util.Map;\r
import java.util.TimeZone;\r
-import java.util.TreeMap;\r
import java.util.logging.LogManager;\r
import java.util.logging.Logger;\r
\r
* ・精確な時刻との時差を入力することで、撮影日時を補正します。\r
* ・画像ファイルの更新日付リストをCSV形式のファイルとして出力する。\r
* ・・結果は、取り込み元のGPXファイルとは別に、元ファイル名にアンダーバー「_」を付加した.ファイルに出力します。\r
+ * \r
+ * exp) $ java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]\r
+ * exp) > java -cp .;AdjustTime.jar;commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]\r
*\r
* @param argv\r
+ * argv[0] = INIファイルのパス名\r
+ * \r
* argv[-] = dummy\r
* argv[0] = 画像ファイルが格納されているディレクトリ --> imgDir\r
* argv[1] = 時刻補正の基準とする画像ファイル --> baseFile\r
*/\r
public static void main(String[] argv) throws Exception\r
{\r
- Date jptime;\r
+ Date imgtime;\r
\r
+ String paramFilePath = ((argv.length < 1) ? AppParameters.FILE_PATH : argv[0]);\r
+ System.out.println("Param File = '"+ paramFilePath +"'");\r
ImportPicture obj = new ImportPicture();\r
- obj.ex = null;\r
-\r
- if (argv.length > 0) {\r
- obj.imgDir = new File(argv[0]);\r
- }\r
+ obj.params = new AppParameters(paramFilePath);\r
\r
- if (argv.length < 4) {\r
- System.out.println("!!! Illigal command call. !!!");\r
- System.out.println("> java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar <targetDir> <time base image> <time> {EXIF/not} (gpx)");\r
- System.out.println("> java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar. IMG_01234.JPG 2012-06-15T12:52:22 EXIF");\r
- System.out.println("> java -cp .:AdjustTime.jar . IMG_01234.JPG 2012-06-15T12:52:22 not");\r
- System.out.println();\r
- return;\r
- }\r
-\r
- obj.params = new AppParameters();\r
+ obj.ex = null;\r
+ // argv[0] --> AppParameters.IMG_SOURCE_FOLDER に置き換え\r
+ obj.imgDir = new File(obj.params.getProperty(AppParameters.IMG_SOURCE_FOLDER));\r
\r
// 基準時刻(ファイル更新日時 | EXIF撮影日時)\r
obj.exifBase = (obj.params.getProperty(AppParameters.GPX_BASETIME).equals("EXIF_TIME") ? true : false);\r
\r
// 基準時刻ファイルの「更新日時」を使って時刻合わせを行う。\r
- File baseFile = new File(obj.imgDir, argv[1]);\r
+ // argv[1] --> AppParameters.IMG_BASE_FILE に置き換え\r
+ File baseFile = new File(obj.imgDir, obj.params.getProperty(AppParameters.IMG_BASE_FILE));\r
if (obj.exifBase) {\r
ImageMetadata meta = Imaging.getMetadata(baseFile);\r
JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;\r
}\r
String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];\r
long lastModifyTime = (new SimpleDateFormat("yyyy:MM:dd HH:mm:ss")).parse(dateTimeOriginal).getTime();\r
- jptime = new Date(lastModifyTime);\r
+ imgtime = new Date(lastModifyTime);\r
}\r
else {\r
- jptime = new Date(baseFile.lastModified());\r
- }\r
-\r
- String timeStr = argv[2];\r
- try {\r
- dfjp.setTimeZone(TimeZone.getTimeZone("JST"));\r
- Date t = dfjp.parse(timeStr);\r
- obj.delta = t.getTime() - jptime.getTime();\r
- }\r
- catch (ParseException e) {\r
- System.out.println("'"+ timeStr +"' の書式が違います("+ TIME_FORMAT_STRING +")");\r
- return;\r
+ imgtime = new Date(baseFile.lastModified());\r
}\r
\r
// 出力ファイル\r
- obj.outDir = new File(argv[3]);\r
+ // argv[3] --> AppParameters.IMG_OUTPUT に置き換え\r
+ obj.outDir = new File(obj.params.getProperty(AppParameters.IMG_OUTPUT_FOLDER));\r
\r
// その他のパラメータを読み取る\r
String paramStr = obj.params.getProperty(AppParameters.GPX_GPXSPLIT);\r
\r
paramStr = obj.params.getProperty(AppParameters.GPX_NO_FIRST_NODE);\r
if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {\r
- obj.param_GpxNoFirstNode = true;\r
+ ImportPicture.param_GpxNoFirstNode = true;\r
}\r
\r
paramStr = obj.params.getProperty(AppParameters.GPX_REUSE);\r
System.out.println(" - param: gpxDir = '"+ (obj.gpxDir == null ? "" : obj.gpxDir.getAbsolutePath()) +"'");\r
System.out.println(" - param: number of gpxFiles = '"+ obj.gpxFiles.size() +"'");\r
System.out.println(" - param: "+ AppParameters.GPX_GPXSPLIT +"="+ obj.param_GpxSplit);\r
- System.out.println(" - param: "+ AppParameters.GPX_NO_FIRST_NODE +"="+ obj.param_GpxNoFirstNode); \r
+ System.out.println(" - param: "+ AppParameters.GPX_NO_FIRST_NODE +"="+ ImportPicture.param_GpxNoFirstNode); \r
System.out.println(" - param: "+ AppParameters.GPX_REUSE +"="+ obj.param_GpxReuse);\r
+ System.out.println(" - param: "+ AppParameters.IMG_TIME +"="+ obj.params.getProperty(AppParameters.IMG_TIME) );\r
System.out.println(" - param: "+ AppParameters.IMG_BASE_FILE +"="+ obj.params.getProperty(AppParameters.IMG_BASE_FILE) );\r
System.out.println(" - param: "+ AppParameters.GPX_BASETIME +"="+ obj.params.getProperty(AppParameters.GPX_BASETIME) );\r
System.out.println(" - param: "+ AppParameters.IMG_OUTPUT +"="+ obj.params.getProperty(AppParameters.IMG_OUTPUT)); \r
System.out.println(" - param: "+ AppParameters.GPX_OUTPUT_WPT +"="+ obj.param_GpxOutputWpt);\r
System.out.println(" - param: "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ Complementation.param_GpxOverwriteMagvar);\r
System.out.println(" - param: "+ AppParameters.GPX_OUTPUT_SPEED +"="+ Complementation.param_GpxOutputSpeed);\r
+\r
+ String timeStr = obj.params.getProperty(AppParameters.IMG_TIME);\r
+ try {\r
+ //dfjp.setTimeZone(TimeZone.getTimeZone("JST"));\r
+ Date t = dfuk.parse(timeStr);\r
+ obj.delta = t.getTime() - imgtime.getTime();\r
+ }\r
+ catch (ParseException e) {\r
+ System.out.println("'"+ timeStr +"' の書式が違います("+ TIME_FORMAT_STRING +")");\r
+ return;\r
+ }\r
+\r
obj.start();\r
try {\r
obj.join();\r
public ArrayList<File> gpxFiles = new ArrayList<>();\r
public AppParameters params;\r
public boolean param_GpxSplit = false;\r
- public boolean param_GpxNoFirstNode = false;\r
+ public static boolean param_GpxNoFirstNode = false;\r
public boolean param_GpxReuse = false;\r
public boolean param_GpxOutputWpt = true;\r
public boolean param_ImgOutputAll = false;\r
void procGPXfile(File gpxFile) throws ParserConfigurationException, SAXException, IOException, ParseException, ImageReadException, ImageWriteException, TransformerException {\r
DocumentBuilderFactory factory;\r
DocumentBuilder builder;\r
- Node gpx;\r
\r
String fileName = gpxFile.getName();\r
String iStr = fileName.substring(0, fileName.length() - 4);\r
factory.setIgnoringComments(true);\r
factory.setValidating(true);\r
\r
+ // GPXファイルをパースする\r
+ ElementMapTRKSEG mapTRKSEG = new ElementMapTRKSEG();\r
+ document = mapTRKSEG.parse(gpxFile);\r
+ \r
+ // パースされた mapTRKSEG の中身を出力する\r
+ mapTRKSEG.printinfo();\r
+ \r
// GPX file --> Node root\r
- DOMImplementation domImpl = builder.getDOMImplementation();\r
- document = domImpl.createDocument("", "gpx", null);\r
-\r
- /*\r
- * <gpx>\r
- * <trk>\r
- * <trkseg>\r
- * <trkpt lat="35.32123832" lon="139.56965631">\r
- * <ele>47.20000076293945</ele>\r
- * <time>2012-06-15T03:00:29Z</time>\r
- * <hdop>0.5</hdop>\r
- * </trkpt>\r
- * </trkseg>\r
- * </trk>\r
- * </gpx>\r
- */\r
- TreeMap<Long,ElementMapTRKPT> mapTRKSEG = new TreeMap<Long, ElementMapTRKPT>();\r
- Element trk = null;\r
- gpx = builder.parse(gpxFile).getFirstChild();\r
- document = gpx.getOwnerDocument();\r
- NodeList nodes = gpx.getChildNodes();\r
- for (int i=0; i < nodes.getLength(); i++) {\r
- Node node2 = nodes.item(i);\r
- if (node2.getNodeName().equals("trk")) {\r
- trk = (Element) node2;\r
- \r
- NodeList nodes1 = trk.getChildNodes();\r
- for (int i1=0; i1 < nodes1.getLength(); i1++) {\r
- Node nodeTRKSEG = nodes1.item(i1);\r
- if (nodeTRKSEG.getNodeName().equals("trkseg")) {\r
- NodeList nodes2 = nodeTRKSEG.getChildNodes();\r
- \r
- ElementMapTRKPT mapTRKPT = new ElementMapTRKPT();\r
- Date trksegStartTime = new Date(); // 対象とする開始時刻(現在時刻)\r
- for (int i2=0; i2 < nodes2.getLength(); i2++) {\r
- Node nodeTRKPT = nodes2.item(i2);\r
- if (nodeTRKPT.getNodeName().equals("trkpt")) {\r
- if (param_GpxNoFirstNode && (i2 == 0)) {\r
- continue;\r
- }\r
- Date time = mapTRKPT.put(getCopy(document, nodeTRKPT));\r
- if (trksegStartTime.compareTo(time) < 0) {\r
- trksegStartTime = time;\r
- }\r
- }\r
- }\r
+ Node gpx = builder.parse(gpxFile).getFirstChild();\r
\r
- mapTRKSEG.put(trksegStartTime.getTime(), mapTRKPT);\r
- }\r
- }\r
- }\r
- }\r
- \r
- // mapTRKSEGに時間順に格納された<trkseg>を順次ひとつづつ処理する\r
+ // imgDir内の画像ファイルを処理する\r
System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");\r
- System.out.println("| name | UpdateTime | GPStime | Latitude | Longitude | ele |magvar| km/h |");\r
+ System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |");\r
System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");\r
proc(imgDir, delta, mapTRKSEG, exif, gpx);\r
System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");\r
* @throws ImageReadException \r
* @throws ImageWriteException \r
*/\r
- boolean proc(File dir, long delta, TreeMap<Long,ElementMapTRKPT> mapTRKSEG, boolean exifWrite, Node gpx) throws ParseException, ImageReadException, IOException, ImageWriteException {\r
+ boolean proc(File dir, long delta, ElementMapTRKSEG mapTRKSEG, boolean exifWrite, Node gpx) throws ParseException, ImageReadException, IOException, ImageWriteException {\r
DecimalFormat yearFormatter = new DecimalFormat("0000");\r
DecimalFormat monthFormatter = new DecimalFormat("00");\r
DecimalFormat dayFormatter = new DecimalFormat("00");\r
long lastModifyTime = (new SimpleDateFormat("yyyy:MM:dd HH:mm:ss")).parse(dateTimeOriginal).getTime();\r
itime = new Date(lastModifyTime);\r
}\r
- System.out.print(String.format("%20s ", dfjp.format(itime)));\r
+ System.out.print(String.format("%20s|", dfuk.format(itime)));\r
\r
// uktime <-- 画像撮影時刻に対応するGPX時刻(補正日時)\r
Date uktime = new Date(itime.getTime() + delta);\r
- System.out.print(String.format("%20s|", dfjp.format(uktime)));\r
+ System.out.print(String.format("%20s|", dfuk.format(uktime)));\r
\r
// 時刻uktimeにおける<magver>をtrkptに追加する\r
String eleStr = "-";\r
Element trkptE = null;\r
TagTrkpt trkptT = null;\r
\r
- for (Map.Entry<Long,ElementMapTRKPT> map : mapTRKSEG.entrySet()) {\r
+ for (Map.Entry<Date,ElementMapTRKPT> map : mapTRKSEG.entrySet()) {\r
ElementMapTRKPT mapTRKPT = map.getValue();\r
trkptE = mapTRKPT.getValue(uktime);\r
if (trkptE != null) {\r
}\r
}\r
if (trkptE == null) {\r
- System.out.println(String.format("%20s ", "Out of GPX logging time."));\r
+ System.out.println(String.format("%-52s|", " Out of GPX logging time."));\r
if (!this.param_ImgOutputAll) {\r
continue;\r
}\r
* 2012-06-10T05:09:46Z (日本時間の'2012-06-10T14:09:46')\r
*/\r
public static final String TIME_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss";\r
- public static SimpleDateFormat dfjp = new SimpleDateFormat(TIME_FORMAT_STRING);\r
+ public static SimpleDateFormat dfjp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");\r
public static SimpleDateFormat dfuk = new SimpleDateFormat(TIME_FORMAT_STRING +"'Z'");\r
\r
/**\r