diff --git a/Code/CSRender/CSRender/CompareTIFF.cs b/Code/CSRender/CSRender/CompareTIFF.cs index dfd231bfa290c34f89a6dabe4721f61e35785ec0..c2ef8e7d88e228df5cfa4c6e8cce506bc42e4b30 100644 --- a/Code/CSRender/CSRender/CompareTIFF.cs +++ b/Code/CSRender/CSRender/CompareTIFF.cs @@ -22,7 +22,7 @@ namespace CSRender class CompareTIFF { public static string runPureVerify(string targetDir, string referenceDir, string workPath, - string shiftPixel, string colorMargin, string removePoint, string shadingOff) + string shiftPixel, string colorMargin, string removePoint, string shadingOff, bool reportFlag, string reportName) { //実行用コンソールの呼び出し ProcessStartInfo processStartInfo = new ProcessStartInfo(); @@ -76,13 +76,16 @@ namespace CSRender processStartInfo.Arguments += "\" /shadingoff \""; processStartInfo.Arguments += shadingOff; processStartInfo.Arguments += "\""; + if (reportFlag == true) + { + processStartInfo.Arguments += " /inspReport \""; + processStartInfo.Arguments += reportName; + processStartInfo.Arguments += "\""; + } //CSRender.exeを実行 Process process = Process.Start(processStartInfo); - //ResultConsole.Text = process.StandardOutput.ReadToEnd(); - //process.OutputDataReceived += process_DataReceived; process.BeginOutputReadLine(); - //ResultConsole.ScrollToEnd(); process.WaitForExit(); process.Close(); diff --git a/Code/CSRender/CSRender/FilePathSelect.cs b/Code/CSRender/CSRender/FilePathSelect.cs index 31b0d64a2cdfaac0d52d07701f34570067265741..ba0be5d092caa9ee855c24b3661a814c93e965f9 100644 --- a/Code/CSRender/CSRender/FilePathSelect.cs +++ b/Code/CSRender/CSRender/FilePathSelect.cs @@ -62,6 +62,21 @@ namespace CSRender workBox.Text = dropFiles[0]; workBox.Focus(); workBox.Select(this.workBox.Text.Length, 0); + if (reportBox.Text == "")//検版レポートが未入力ならば作業フォルダ先に指定 + { + reportBox.Text = System.IO.Path.Combine(workBox.Text, "report"); + reportBox.Text += @"\"; + } + } + + private void ReportBox_Drop(object sender, System.Windows.DragEventArgs e) + { + var dropFiles = e.Data.GetData(System.Windows.DataFormats.FileDrop) as string[]; + if (dropFiles == null) return; + //カーソルを終端に置く + reportBox.Text = dropFiles[0] + @"\"; + reportBox.Focus(); + reportBox.Select(this.reportBox.Text.Length, 0); } //参照ボタンClickでフォルダ選択のダイアログを表示(対象フォルダ) @@ -140,6 +155,33 @@ namespace CSRender } //共通部分 workBox.Text = selectFile.FileName; + reportBox.Text = System.IO.Path.Combine(selectFile.FileName, "report") + @"\"; + } + + //参照ボタンClickでフォルダ選択のダイアログを表示(検版レポートパス) + private void ReportButton_Click(object sender, RoutedEventArgs e) + { + //ファイル選択の場合 + //var selectFile = new OpenFileDialog(); + //selectFile.Title = "ファイルを選択してください"; + //selectFile.InitialDirectory = @"C:"; + //if ((bool)selectFile.ShowDialog()) + //{ + //FileName = selectFile.FileName; + //FileSelected(this, new EventArgs()); + //} + + //フォルダ選択の場合 + var selectFile = new MSAPI::Dialogs.CommonOpenFileDialog(); + selectFile.IsFolderPicker = true; + selectFile.Title = "フォルダを選択してください"; + selectFile.InitialDirectory = @"C:"; + if (selectFile.ShowDialog() != MSAPI::Dialogs.CommonFileDialogResult.Ok) + { + return; + } + //共通部分 + reportBox.Text = selectFile.FileName + @"\"; } } } diff --git a/Code/CSRender/CSRender/MainWindow.xaml b/Code/CSRender/CSRender/MainWindow.xaml index dd5197f6ddf18ae4589869a7942dc6ebaaa2578a..18d5bd10f06a7514b30e94fe45ae04c0caf10e87 100644 --- a/Code/CSRender/CSRender/MainWindow.xaml +++ b/Code/CSRender/CSRender/MainWindow.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:CSRender" xmlns:sys="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d" - Title="CSRender" Height="450" Width="600" Background="#FFF3F4F4" MinWidth="600" MinHeight="300"> + Title="CSRender" Height="475" Width="600" Background="#FFF3F4F4" MinWidth="600" MinHeight="330"> @@ -16,7 +16,8 @@ - + + @@ -31,17 +32,20 @@