diff --git a/Code/CSRender/CSRender/CSRender.csproj b/Code/CSRender/CSRender/CSRender.csproj
index be27c240e06b5723d19cd9b86826d8a37b170ec1..dc51068fa3019f897d3db8f066cd5ce5b9ad4200 100644
--- a/Code/CSRender/CSRender/CSRender.csproj
+++ b/Code/CSRender/CSRender/CSRender.csproj
@@ -75,7 +75,7 @@
-
+
MainWindow.xaml
diff --git a/Code/CSRender/CSRender/CompareTIFF.cs b/Code/CSRender/CSRender/CompareTIFF.cs
index 5d96870da9ee9a08dc9532c8d37b6907196b9ce0..c8cde512e48182f69f0cd5d3576c3d0204704add 100644
--- a/Code/CSRender/CSRender/CompareTIFF.cs
+++ b/Code/CSRender/CSRender/CompareTIFF.cs
@@ -21,7 +21,8 @@ namespace CSRender
{
class CompareTIFF
{
- public static string runPureVerify(string targetDir, string referenceDir, string workPath)
+ public static string runPureVerify(string targetDir, string referenceDir, string workPath,
+ string shiftPixel, string colorMargin, string removePoint, string shadingOff)
{
//実行用コンソールの呼び出し
ProcessStartInfo processStartInfo = new ProcessStartInfo();
@@ -62,7 +63,18 @@ namespace CSRender
//検版結果OKとなったファイルリストをPDFレポートの最後に記載（0:記載しない、1:記載する）
processStartInfo.Arguments += " /show \"1\"";
//検版品質ファイルの選択（0:弱、1:中、2:強、3:カスタム）
- processStartInfo.Arguments += " /quality \"2\"";
+ processStartInfo.Arguments += " /quality \"3\"";
+
+ //検版パラメータの設定
+ processStartInfo.Arguments += " /shiftpixel \"";
+ processStartInfo.Arguments += shiftPixel;
+ processStartInfo.Arguments += "\" /colormargin \"";
+ processStartInfo.Arguments += colorMargin;
+ processStartInfo.Arguments += "\" /removepoint \"";
+ processStartInfo.Arguments += removePoint;
+ processStartInfo.Arguments += "\" /shadingoff \"";
+ processStartInfo.Arguments += shadingOff;
+ processStartInfo.Arguments += "\"";
//CSRender.exeを実行
Process process = Process.Start(processStartInfo);
diff --git a/Code/CSRender/CSRender/MainWindow.xaml b/Code/CSRender/CSRender/MainWindow.xaml
index 64c4a4664b4f99f7373cddeff8370de59dd4e5aa..bb79319bd17d500c69b7c76fab75bdc81b638a58 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml
+++ b/Code/CSRender/CSRender/MainWindow.xaml
@@ -6,12 +6,13 @@
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="250">
+ Title="CSRender" Height="450" Width="600" Background="#FFF3F4F4" MinWidth="600" MinHeight="300">
-
-
+
+
+
@@ -20,23 +21,27 @@
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -47,8 +52,8 @@
-
-
+
+
@@ -57,10 +62,10 @@
-
-
-
-
+
+
+
+
@@ -69,13 +74,60 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Code/CSRender/CSRender/MainWindow.xaml.cs b/Code/CSRender/CSRender/MainWindow.xaml.cs
index deef3f6aeba1c210c28300a6dd0c0b509f46ca5a..b99c6aab7778680e6ba66cf32200796dbe411b5f 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml.cs
+++ b/Code/CSRender/CSRender/MainWindow.xaml.cs
@@ -31,7 +31,7 @@ namespace CSRender
public MainWindow()
{
InitializeComponent();
-
+
//解像度選択UpDownバーの設定
this.Title = this.ToString();
ResolutionBox.MouseWheel += NumericTextBox_MouseWheel;
@@ -39,7 +39,38 @@ namespace CSRender
ResolutionBox.TextChanged += NumericTextBox_TextChanged;
ResolutionBox.TextChanged += NumericTextBox_NumChanged;
NumericScroll1.MouseWheel += NumericScroll1_MouseWheel;
-
+
+ //位置ズレ許容量選択UpDownバーの設定
+ this.Title = this.ToString();
+ PositionBox.MouseWheel += NumericTextBox_MouseWheel;
+ PositionBox.GotFocus += NumericTextBox_GotFocusSelectAll;
+ PositionBox.TextChanged += NumericTextBox_TextChanged;
+ PositionBox.TextChanged += PosiTextBox_NumChanged;
+ PosiScroll1.MouseWheel += PosiScroll1_MouseWheel;
+
+ //諧調差許容量選択UpDownバーの設定
+ this.Title = this.ToString();
+ GradationBox.MouseWheel += NumericTextBox_MouseWheel;
+ GradationBox.GotFocus += NumericTextBox_GotFocusSelectAll;
+ GradationBox.TextChanged += NumericTextBox_TextChanged;
+ GradationBox.TextChanged += GradTextBox_NumChanged;
+ GradScroll.MouseWheel += GradScroll_MouseWheel;
+
+ //微小誤差許容量選択UpDownバーの設定
+ this.Title = this.ToString();
+ SmallDiffBox.MouseWheel += NumericTextBox_MouseWheel;
+ SmallDiffBox.GotFocus += NumericTextBox_GotFocusSelectAll;
+ SmallDiffBox.TextChanged += NumericTextBox_TextChanged;
+ SmallDiffBox.TextChanged += SmallDiffTextBox_NumChanged;
+ SmallDiffScroll.MouseWheel += SmallDiffScroll_MouseWheel;
+
+ //視覚的あいまい量選択UpDownバーの設定
+ this.Title = this.ToString();
+ VisualBox.MouseWheel += NumericTextBox_MouseWheel;
+ VisualBox.GotFocus += NumericTextBox_GotFocusSelectAll;
+ VisualBox.TextChanged += NumericTextBox_TextChanged;
+ VisualBox.TextChanged += VisualTextBox_NumChanged;
+ VisualScroll.MouseWheel += VisualScroll_MouseWheel;
//ページ入力メニューの設定
PagePattern.Add((new ComboBoxSet { Id = 1, Item = "全ページ"}));
@@ -98,6 +129,12 @@ namespace CSRender
return;
}
+ //検版パラメータの取得
+ string shiftPixel = PositionBox.Text;
+ string colorMargin = GradationBox.Text;
+ string removePoint = SmallDiffBox.Text;
+ string shadingOff = VisualBox.Text;
+
//TIFF画像の生成
ResultConsole.Text += "\r\n";
ResultConsole.Text += " 対象ファイルをTIFF画像に変換中\r\n";
@@ -139,7 +176,8 @@ namespace CSRender
//PureVerifyの実行
//string workDir = CompareTIFF.runPureVerify(targetBox.Text, referenceBox.Text, workBox.Text);
- string workDir = CompareTIFF.runPureVerify(targetTIFFPath, referenceTIFFPath, workBox.Text);
+ string workDir = CompareTIFF.runPureVerify(targetTIFFPath, referenceTIFFPath, workBox.Text
+ , shiftPixel, colorMargin, removePoint, shadingOff);
//レポートを出力
outputLog(System.IO.Path.Combine(workDir, "report"));
diff --git a/Code/CSRender/CSRender/NumericUpDown.cs b/Code/CSRender/CSRender/NumericUpDown.cs
index c44dd306f935b5435c6a11b5532e6ab927cd0191..96ed82948aa9b2f275f177f3a8b7c8e3e784daaa 100644
--- a/Code/CSRender/CSRender/NumericUpDown.cs
+++ b/Code/CSRender/CSRender/NumericUpDown.cs
@@ -21,67 +21,179 @@ namespace CSRender
{
////////////////////////////////////////////////////////////////////////////
- // 解像度のUpDownメニュー昨日の記述
+ // 解像度のUpDownメニュー機能の記述
////////////////////////////////////////////////////////////////////////////
//TextBoxフォーカス時にテキスト全選択
private void NumericTextBox_GotFocusSelectAll(object sender, RoutedEventArgs e)
{
- TextBox box = (TextBox)sender;
+ TextBox ResolutionBox = (TextBox)sender;
//box.SelectAll();
- this.Dispatcher.InvokeAsync(() => { Task.Delay(10); box.SelectAll(); });
+ this.Dispatcher.InvokeAsync(() => { Task.Delay(10); ResolutionBox.SelectAll(); });
}
//正規表現で数値以外は削除using System.Text.RegularExpressions;
private void NumericTextBox_TextChanged(object sender, TextChangedEventArgs e)
{
- TextBox box = (TextBox)sender;
+ TextBox ResolutionBox = (TextBox)sender;
double d;
- if (!double.TryParse(box.Text, out d))
+ if (!double.TryParse(ResolutionBox.Text, out d))
{
- box.Text = Regex.Replace(box.Text, "[^0-9-]", "");
+ ResolutionBox.Text = Regex.Replace(ResolutionBox.Text, "[^0-9-]", "");
}
}
//数字の下限;
private void NumericTextBox_NumChanged(object sender, TextChangedEventArgs e)
{
- TextBox box = (TextBox)sender;
- if (box.Text == "")
+ TextBox ResolutionBox = (TextBox)sender;
+ if (ResolutionBox.Text == "")
{
- box.Text = "72";
+ ResolutionBox.Text = "72";
}
- NumericScroll1.Value = Int32.Parse(box.Text);
+ NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
}
//TextBox上でマウスホイールを回転させた時にスクロールバーの値を上下させる
private void NumericTextBox_MouseWheel(object sender, MouseWheelEventArgs e)
{
- TextBox textBox = (TextBox)sender;
- Binding binding = BindingOperations.GetBinding(textBox, TextBox.TextProperty);
- ScrollBar scrollBar = (ScrollBar)this.FindName(binding.ElementName);//名前から取得
- scrollBar.Value = Int32.Parse(textBox.Text);
+ TextBox ResolutionBox = (TextBox)sender;
+ Binding binding = BindingOperations.GetBinding(ResolutionBox, TextBox.TextProperty);
+ ScrollBar NumericScroll1 = (ScrollBar)this.FindName(binding.ElementName);//名前から取得
+ NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
if (e.Delta > 0)
{
- scrollBar.Value++;
+ NumericScroll1.Value++;
}
else
{
- scrollBar.Value--;
+ NumericScroll1.Value--;
}
}
//ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
private void NumericScroll1_MouseWheel(object sender, MouseWheelEventArgs e)
{
- ScrollBar sb = (ScrollBar)sender;
- sb.Value = Int32.Parse(ResolutionBox.Text);
+ ScrollBar NumericScroll1 = (ScrollBar)sender;
+ NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
if (e.Delta > 0)
{
- sb.Value++;
+ NumericScroll1.Value++;
}
else
{
- sb.Value--;
+ NumericScroll1.Value--;
+ }
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
+ // 位置ズレ許容量のUpDownメニュー機能の記述
+ ////////////////////////////////////////////////////////////////////////////
+ //数字の下限;
+ private void PosiTextBox_NumChanged(object sender, TextChangedEventArgs e)
+ {
+ TextBox PositionBox = (TextBox)sender;
+ if (PositionBox.Text == "")
+ {
+ PositionBox.Text = "2";
+ }
+ PosiScroll1.Value = Int32.Parse(PositionBox.Text);
+ }
+ //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
+ private void PosiScroll1_MouseWheel(object sender, MouseWheelEventArgs e)
+ {
+ ScrollBar PosiScroll1 = (ScrollBar)sender;
+ PosiScroll1.Value = Int32.Parse(PositionBox.Text);
+ if (e.Delta > 0)
+ {
+ PosiScroll1.Value++;
+ }
+ else
+ {
+ PosiScroll1.Value--;
+ }
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
+ // 諧調差許容量のUpDownメニュー機能の記述
+ ////////////////////////////////////////////////////////////////////////////
+ //数字の下限;
+ private void GradTextBox_NumChanged(object sender, TextChangedEventArgs e)
+ {
+ TextBox GradationBox = (TextBox)sender;
+ if (GradationBox.Text == "")
+ {
+ GradationBox.Text = "60";
+ }
+ GradScroll.Value = Int32.Parse(GradationBox.Text);
+ }
+ //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
+ private void GradScroll_MouseWheel(object sender, MouseWheelEventArgs e)
+ {
+ ScrollBar GradScroll = (ScrollBar)sender;
+ GradScroll.Value = Int32.Parse(GradationBox.Text);
+ if (e.Delta > 0)
+ {
+ GradScroll.Value++;
+ }
+ else
+ {
+ GradScroll.Value--;
+ }
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
+ // 微小差異許容量のUpDownメニュー機能の記述
+ ////////////////////////////////////////////////////////////////////////////
+ //数字の下限;
+ private void SmallDiffTextBox_NumChanged(object sender, TextChangedEventArgs e)
+ {
+ TextBox SmallDiffBox = (TextBox)sender;
+ if (SmallDiffBox.Text == "")
+ {
+ SmallDiffBox.Text = "60";
+ }
+ SmallDiffScroll.Value = Int32.Parse(SmallDiffBox.Text);
+ }
+ //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
+ private void SmallDiffScroll_MouseWheel(object sender, MouseWheelEventArgs e)
+ {
+ ScrollBar SmallDiffScroll = (ScrollBar)sender;
+ SmallDiffScroll.Value = Int32.Parse(SmallDiffBox.Text);
+ if (e.Delta > 0)
+ {
+ SmallDiffScroll.Value++;
+ }
+ else
+ {
+ SmallDiffScroll.Value--;
+ }
+ }
+
+ ////////////////////////////////////////////////////////////////////////////
+ // 視覚的あいまい量のUpDownメニュー機能の記述
+ ////////////////////////////////////////////////////////////////////////////
+ //数字の下限;
+ private void VisualTextBox_NumChanged(object sender, TextChangedEventArgs e)
+ {
+ TextBox VisualBox = (TextBox)sender;
+ if (VisualBox.Text == "")
+ {
+ VisualBox.Text = "60";
+ }
+ VisualScroll.Value = Int32.Parse(VisualBox.Text);
+ }
+ //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
+ private void VisualScroll_MouseWheel(object sender, MouseWheelEventArgs e)
+ {
+ ScrollBar VisualScroll = (ScrollBar)sender;
+ VisualScroll.Value = Int32.Parse(VisualBox.Text);
+ if (e.Delta > 0)
+ {
+ VisualScroll.Value++;
+ }
+ else
+ {
+ VisualScroll.Value--;
}
}
}