X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=importPicture%2Fsrc%2Fosm%2Fjp%2Fgpx%2Fmatchtime%2Fgui%2FAdjustTime.java;h=06c8ef8dfcebb901d11a534fdf7ff479d8fba88e;hb=cf7ac0db2a3870c164cf7150bb2cab076d26e643;hp=afc5257e062398accf4130a23e9f9a59412ab69b;hpb=8d058dbbe75c9cca5951963e872e96a3fad7f258;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 afc5257..06c8ef8 100644 --- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java +++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java @@ -130,32 +130,56 @@ public class AdjustTime extends JFrame backButton = new JButton("戻る"); container.add(backButton, BorderLayout.WEST); - cards = new JPanel[4]; - for (int i=0; i < 4; i++) { + cards = new JPanel[5]; + for (int i=0; i < 5; i++) { cards[i] = new JPanel(); cardPanel.add(cards[i], String.valueOf(i)); } cardPanelNo = 0; //--------------------------------------------------------------------- - // パラメータ設定パネル + // 1.[対象フォルダ]設定パネル int cardNo = 0; cards[cardNo].setLayout(new BorderLayout()); + JLabel label1 = new JLabel(); + label1.setText("

位置情報を付加したい画像ファイルが格納されているフォルダを選択してください。

"); + cards[cardNo].add(label1, BorderLayout.NORTH); + argsPanel = new JPanel(); argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.Y_AXIS)); arg1Panel_1 = new ParameterPanelFolder("対象フォルダ: ", "."); argsPanel.add(arg1Panel_1); + cards[cardNo].add(argsPanel, BorderLayout.CENTER); + + //--------------------------------------------------------------------- + // 2.[基準時刻画像]設定パネル + cardNo++; + cards[cardNo].setLayout(new BorderLayout()); + JLabel label2 = new JLabel(); + label2.setText("

正確な撮影時刻が判明できる画像を選んでください。

"); + cards[cardNo].add(label2, BorderLayout.NORTH); + + argsPanel = new JPanel(); + argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.Y_AXIS)); arg1Panel_2 = new ParameterPanelImageFile("基準時刻画像: ", "", arg1Panel_1); argsPanel.add(arg1Panel_2); - cards[cardNo].add(argsPanel, BorderLayout.NORTH); + cards[cardNo].add(argsPanel, BorderLayout.CENTER); //--------------------------------------------------------------------- - // 基準時刻画像表示 + // 3.基準時刻の入力画面 cardNo++; cards[cardNo].setLayout(new BorderLayout()); + argsPanel = new JPanel(); + argsPanel.setLayout(new GridLayout(2, 1)); + + JLabel label3 = new JLabel(); + label3.setText("

正確な撮影時刻を入力してください。

"); + argsPanel.add(label3); arg1Panel_3 = new ParameterPanelTime("　　基準時刻: ", ImportPicture.TIME_FORMAT_STRING); - cards[cardNo].add(arg1Panel_3, BorderLayout.NORTH); + argsPanel.add(arg1Panel_3); + cards[cardNo].add(argsPanel, BorderLayout.NORTH); + // 参考画像 imageLabel = new JLabel(); imageSPane = new JScrollPane(imageLabel); cards[cardNo].add(imageSPane, BorderLayout.CENTER); @@ -172,24 +196,26 @@ public class AdjustTime extends JFrame cards[cardNo].add(buttonPanel, BorderLayout.SOUTH); //--------------------------------------------------------------------- - // GPXファイル設定画面 + // 4.GPXファイル設定画面 cardNo++; cards[cardNo].setLayout(new BorderLayout()); - //JPanel tmpPanel = new JPanel(); - //tmpPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.Y_AXIS)); + JPanel tmpPanel4 = new JPanel(); + tmpPanel4.setLayout(new BoxLayout(tmpPanel4, BoxLayout.Y_AXIS)); File gpxDir = new File("."); arg1Panel_5 = new ParameterPanelFolder("GPXフォルダ: ", gpxDir.getAbsolutePath()); - cards[cardNo].add(arg1Panel_5, BorderLayout.NORTH); + tmpPanel4.add(arg1Panel_5); + cards[cardNo].add(tmpPanel4, BorderLayout.CENTER); //--------------------------------------------------------------------- - // EXIF更新設定画面 + // 5.EXIF更新設定画面 cardNo++; cards[cardNo].setLayout(new BorderLayout()); - //JPanel tmpPanel = new JPanel(); - //tmpPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.Y_AXIS)); + JPanel tmpPanel5 = new JPanel(); + tmpPanel5.setLayout(new BoxLayout(tmpPanel5, BoxLayout.Y_AXIS)); String[] combodata = {"更新しない", "更新する"}; arg1Panel_4 = new ParameterPanelSelecter("EXIF変更: ", combodata); - cards[cardNo].add(arg1Panel_4, BorderLayout.CENTER); + tmpPanel5.add(arg1Panel_4); + cards[cardNo].add(tmpPanel5, BorderLayout.CENTER); //--------------------------------------------------------------------- // INIT_MENUS