Skip to content

K
KenPanCS
Commit 938a4ded authored by tsuji's avatar tsuji
Browse files
Options

Update CSRender 

・検版パラメータをUIで調整できるように修正
parent 9b4210c1
Show whitespace changes
Inline Side-by-side
Showing with 271 additions and 57 deletions
Code/CSRender/CSRender/CSRender.csproj
View file @ 938a4ded
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<Compile Include="CompareTIFF.cs" /> <Compile Include="CompareTIFF.cs" />
<Compile Include="CustomMsgBox.cs" /> <Compile Include="CustomMsgBox.cs" />
<Compile Include="OurputTIFF.cs" /> <Compile Include="OurputTIFF.cs" />
<Compile Include="ComboBox.cs" /> <Compile Include="PageComboBox.cs" />
<Compile Include="FilePathSelect.cs" /> <Compile Include="FilePathSelect.cs" />
<Compile Include="MainWindow.xaml.cs"> <Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon> <DependentUpon>MainWindow.xaml</DependentUpon>
......
Code/CSRender/CSRender/CompareTIFF.cs
View file @ 938a4ded
...@@ -21,7 +21,8 @@ namespace CSRender ...@@ -21,7 +21,8 @@ namespace CSRender
{ {
class CompareTIFF 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(); ProcessStartInfo processStartInfo = new ProcessStartInfo();
...@@ -62,7 +63,18 @@ namespace CSRender ...@@ -62,7 +63,18 @@ namespace CSRender
//検版結果OKとなったファイルリストをPDFレポートの最後に記載（0:記載しない、1:記載する） //検版結果OKとなったファイルリストをPDFレポートの最後に記載（0:記載しない、1:記載する）
processStartInfo.Arguments += " /show \"1\""; processStartInfo.Arguments += " /show \"1\"";
//検版品質ファイルの選択（0:弱、1:中、2:強、3:カスタム） //検版品質ファイルの選択（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を実行 //CSRender.exeを実行
Process process = Process.Start(processStartInfo); Process process = Process.Start(processStartInfo);
......
Code/CSRender/CSRender/MainWindow.xaml
View file @ 938a4ded
...@@ -6,12 +6,13 @@ ...@@ -6,12 +6,13 @@
xmlns:local="clr-namespace:CSRender" xmlns:local="clr-namespace:CSRender"
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d" 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">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="138"/> <ColumnDefinition Width="135"/>
<ColumnDefinition Width="357*"/> <ColumnDefinition Width="185*"/>
<ColumnDefinition Width="175*"/>
<ColumnDefinition Width="98*"/> <ColumnDefinition Width="98*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
...@@ -20,23 +21,27 @@ ...@@ -20,23 +21,27 @@
<RowDefinition Height="28"/> <RowDefinition Height="28"/>
<RowDefinition Height="28"/> <RowDefinition Height="28"/>
<RowDefinition Height="28"/> <RowDefinition Height="28"/>
<RowDefinition Height="33"/> <RowDefinition Height="28"/>
<RowDefinition Height="229*"/> <RowDefinition Height="28"/>
<RowDefinition Height="28"/>
<RowDefinition Height="155*"/>
<RowDefinition Height="23"/> <RowDefinition Height="23"/>
<RowDefinition Height="10*"/> <RowDefinition Height="10*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Content="対象フォルダ　 　：" Margin="10,0,3,2.333" VerticalAlignment="Bottom" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.RowSpan="2" Height="28"/> <Label Content="対象フォルダ　 　：" Margin="10,0,2.667,2.667" VerticalAlignment="Bottom" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.RowSpan="2" Height="28"/>
<Label Content="リファレンスフォルダ：" Margin="10,26.667,3,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="1" Height="29" Grid.RowSpan="2"/> <Label Content="リファレンスフォルダ：" Margin="10,26.333,2.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="1" Height="29" Grid.RowSpan="2"/>
<Label Content="作業フォルダ　 　：" Margin="10,27.667,3,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="2" Height="29" Grid.RowSpan="3"/> <Label Content="作業フォルダ　 　：" Margin="10,27.333,2.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="2" Height="29" Grid.RowSpan="3"/>
<TextBox x:Name="targetBox" Grid.Column="1" Margin="10,2.667,9.333,0" FontSize="14" Grid.Row="1" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="TargetBox_Drop" DragOver="textBox_PreviewDragOver"/> <Label Content="TIFFパラメーター 　：" Margin="9,27.333,3.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="3" Height="29" Grid.RowSpan="3"/>
<TextBox x:Name="referenceBox" Grid.Column="1" Margin="10,2.667,9.333,0" FontSize="14" Grid.Row="2" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="RefBox_Drop" DragOver="textBox_PreviewDragOver"/> <Label Content="検版パラメーター ：" Margin="12,27.333,0.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" Grid.RowSpan="3"/>
<TextBox x:Name="workBox" Grid.Column="1" Margin="10,2.667,9.333,0" FontSize="14" Grid.Row="3" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="WorkBox_Drop" DragOver="textBox_PreviewDragOver"/> <TextBox x:Name="targetBox" Grid.Column="1" Margin="10.333,2.333,9.333,0" FontSize="14" Grid.Row="1" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="TargetBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2"/>
<Button x:Name="targetButton" Content="参照" Grid.Column="2" HorizontalAlignment="Left" Margin="6.667,4.667,0,0" VerticalAlignment="Top" Width="75" Grid.Row="1" Height="20" Click="TagetButton_Click"/> <TextBox x:Name="referenceBox" Grid.Column="1" Margin="10.333,2.333,9.333,0" FontSize="14" Grid.Row="2" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="RefBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2"/>
<Button x:Name="referenceButton" Content="参照" Grid.Column="2" HorizontalAlignment="Left" Margin="6.667,4.667,0,0" VerticalAlignment="Top" Width="75" Grid.Row="2" Height="20" Click="ReferenceButton_Click"/> <TextBox x:Name="workBox" Grid.Column="1" Margin="10.333,2.333,9.333,0" FontSize="14" Grid.Row="3" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="WorkBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2"/>
<Button x:Name="workButton" Content="参照" Grid.Column="2" HorizontalAlignment="Left" Margin="6.667,4.667,0,0" VerticalAlignment="Top" Width="75" Grid.Row="3" Height="20" Click="WorkButton_Click"/> <Button x:Name="targetButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="6.667,4.333,0,0" VerticalAlignment="Top" Width="75" Grid.Row="1" Height="20" Click="TagetButton_Click"/>
<Label Content="解像度(9 - 300)：" Margin="17,0.667,3,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="4" Height="29" Grid.RowSpan="2"/> <Button x:Name="referenceButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="6.667,4.333,0,0" VerticalAlignment="Top" Width="75" Grid.Row="2" Height="20" Click="ReferenceButton_Click"/>
<Label Content="検査範囲：" Margin="55,1.667,7,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29"/> <Button x:Name="workButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="6.667,4.333,0,0" VerticalAlignment="Top" Width="75" Grid.Row="3" Height="20" Click="WorkButton_Click"/>
<StackPanel Grid.Column="1" Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="13,6.667,0,0.333" Grid.RowSpan="1" Width="47" Background="Black"> <Label Content="解像度(9 - 300)：" Margin="0.333,0.333,64,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="4" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
<Label Content="検査範囲：" Margin="0.333,1.333,91,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
<StackPanel Grid.Column="1" Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="124.333,6.333,0,0.667" Width="47" Background="Black">
<TextBox x:Name="ResolutionBox" Width="30" HorizontalContentAlignment="Right" <TextBox x:Name="ResolutionBox" Width="30" HorizontalContentAlignment="Right"
Text="{Binding Value, ElementName=NumericScroll1}" VerticalContentAlignment="Center" FontSize="14"/> Text="{Binding Value, ElementName=NumericScroll1}" VerticalContentAlignment="Center" FontSize="14"/>
<ScrollBar x:Name="NumericScroll1" Value="72" SmallChange="1" LargeChange="1" Maximum="300" Minimum="1" RenderTransformOrigin="0.5,0.5" Cursor="Arrow" Background="#FF3E3E3E" BorderBrush="#FF060606" Foreground="#FF030303" > <ScrollBar x:Name="NumericScroll1" Value="72" SmallChange="1" LargeChange="1" Maximum="300" Minimum="1" RenderTransformOrigin="0.5,0.5" Cursor="Arrow" Background="#FF3E3E3E" BorderBrush="#FF060606" Foreground="#FF030303" >
...@@ -47,8 +52,8 @@ ...@@ -47,8 +52,8 @@
</ScrollBar.RenderTransform> </ScrollBar.RenderTransform>
</ScrollBar> </ScrollBar>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="10,4.667,0,4.667" Grid.Row="5" Width="75" > <StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="91.333,4.333,0,5.667" Grid.Row="5" Width="80" Grid.RowSpan="3" >
<ComboBox x:Name="PageRange" SelectedValuePath="Id" DisplayMemberPath="Item" Height="21" SelectedValue="1" SelectionChanged="PageRange_SelectionChanged"> <ComboBox x:Name="PageRange" SelectedValuePath="Id" DisplayMemberPath="Item" Height="21" SelectedValue="1" SelectionChanged="PageRange_SelectionChanged" Width="80">
<ComboBox.Background> <ComboBox.Background>
<LinearGradientBrush EndPoint="0,1" StartPoint="0,0"> <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#FFF0F0F0" Offset="0"/> <GradientStop Color="#FFF0F0F0" Offset="0"/>
...@@ -57,10 +62,10 @@ ...@@ -57,10 +62,10 @@
</ComboBox.Background> </ComboBox.Background>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<Label Content="出力形式：" Margin="107,0.667,168.333,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="4" Height="29" Grid.RowSpan="2" Grid.Column="1"/> <Label Content="出力形式：" Margin="12,0.333,78.333,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="4" Height="29" Grid.RowSpan="2" Grid.Column="2"/>
<Label x:Name="pageLabel" Content="指定ページ：" Margin="103,1.667,170.333,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" Grid.Column="1" IsEnabled="{Binding PageRange_SelectionChanged}"/> <Label x:Name="pageLabel" Content="指定ページ：" Margin="12,1.333,76.333,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" Grid.Column="2" IsEnabled="{Binding PageRange_SelectionChanged}" Grid.RowSpan="2"/>
<StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="192,5.667,0,31.667" Grid.Row="4" Width="75" Grid.RowSpan="2" > <StackPanel Grid.Column="2" HorizontalAlignment="Left" Margin="91,5.333,0,18.667" Grid.Row="4" Width="75" Grid.RowSpan="2" >
<ComboBox x:Name="FileSelect" SelectedValuePath="Id" DisplayMemberPath="Item" Height="21" SelectedValue="1" > <ComboBox x:Name="FileSelect" SelectedValuePath="Id" DisplayMemberPath="Item" Height="21" SelectedValue="1" Margin="4,0,-4.333,0" >
<ComboBox.Background> <ComboBox.Background>
<LinearGradientBrush EndPoint="0,1" StartPoint="0,0"> <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#FFF0F0F0" Offset="0"/> <GradientStop Color="#FFF0F0F0" Offset="0"/>
...@@ -69,13 +74,60 @@ ...@@ -69,13 +74,60 @@
</ComboBox.Background> </ComboBox.Background>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<TextBox x:Name="pageBox" Grid.Column="1" Height="23" Margin="192,3.667,11.333,0" Grid.Row="5" <TextBox x:Name="pageBox" Grid.Column="2" Height="23" Margin="95,3.333,45.333,0" Grid.Row="5"
TextWrapping="Wrap" Text="1,2,4-6" VerticalAlignment="Top" FontSize="14" IsEnabled="{Binding PageRange_SelectionChanged}"/> TextWrapping="Wrap" Text="1,2,4-6" VerticalAlignment="Top" FontSize="14" IsEnabled="{Binding PageRange_SelectionChanged}" Grid.ColumnSpan="2"
<TextBox x:Name="ResultConsole" Margin="55,10.333,55.333,10" Grid.Row="6" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Auto" FontSize="14" IsReadOnly="True" HorizontalScrollBarVisibility="Auto"/> InputMethod.IsInputMethodSuspended="True" PreviewKeyDown="PageBox_PreviewKeyDown" PreviewTextInput="PageBox_PreviewTextInput" LostFocus="PageBox_LostFocus" CommandManager.PreviewExecuted="PageBox_PreviewExecuted"/>
<Button x:Name="TIFFButton" Content="TIFF出力" HorizontalAlignment="Left" Height="22" Margin="54,1,0,0" Grid.Row="7" VerticalAlignment="Top" Width="82" Grid.RowSpan="2" Click="TIFFButtonClick"/> <TextBox x:Name="ResultConsole" Margin="44,9.333,44.333,9.667" Grid.Row="8" Grid.ColumnSpan="4" VerticalScrollBarVisibility="Auto" FontSize="14" IsReadOnly="True" HorizontalScrollBarVisibility="Auto"/>
<Button x:Name="CompareButton" Content="比較" HorizontalAlignment="Left" Height="22" Margin="13,1,0,0" Grid.Row="7" VerticalAlignment="Top" Width="82" Grid.Column="1" Grid.RowSpan="2" Click="CompareButtonClick"/> <Button x:Name="TIFFButton" Content="TIFF出力" HorizontalAlignment="Left" Height="22" Margin="45,1.333,0,0" Grid.Row="9" VerticalAlignment="Top" Width="82" Grid.RowSpan="2" Click="TIFFButtonClick"/>
<Button x:Name="closeButton" Content="Close" Height="22" Margin="0,1,55.333,0" Grid.Row="7" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="2" HorizontalAlignment="Right" Width="77" Click="CloseButton_Click"/> <Button x:Name="CompareButton" Content="比較" HorizontalAlignment="Left" Height="22" Margin="13.333,1.333,0,0" Grid.Row="9" VerticalAlignment="Top" Width="82" Grid.Column="1" Grid.RowSpan="2" Click="CompareButtonClick"/>
<Button x:Name="closeButton" Content="Close" Height="22" Margin="0,1.333,45.333,0" Grid.Row="9" VerticalAlignment="Top" Grid.Column="2" Grid.ColumnSpan="2" Grid.RowSpan="2" HorizontalAlignment="Right" Width="77" Click="CloseButton_Click"/>
<Label Content="位置ズレ許容量(0 - 2)：" Margin="0.333,0.333,30,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="6" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
<StackPanel Grid.Column="1" Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Left" Margin="154.333,3.333,0,3.667" Width="33" Background="Black" Grid.ColumnSpan="2">
<TextBox x:Name="PositionBox" Width="16" HorizontalContentAlignment="Center"
Text="{Binding Value, ElementName=PosiScroll1}" VerticalContentAlignment="Center" FontSize="14"/>
<ScrollBar x:Name="PosiScroll1" Value="2" SmallChange="1" LargeChange="1" Maximum="2" Minimum="0" RenderTransformOrigin="0.5,0.5" Cursor="Arrow" Background="#FF3E3E3E" BorderBrush="#FF060606" Foreground="#FF030303" >
<ScrollBar.RenderTransform>
<TransformGroup>
<RotateTransform Angle="180"/>
</TransformGroup>
</ScrollBar.RenderTransform>
</ScrollBar>
</StackPanel>
<Label Content="諧調差許容量(0 - 255)：" Margin="13,0.333,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="6" Height="29" Grid.RowSpan="2" Grid.Column="2" HorizontalAlignment="Left" Width="163" Grid.ColumnSpan="2"/>
<StackPanel Grid.Column="2" Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Left" Margin="175,4.333,0,2.667" Width="50" Background="Black" Grid.ColumnSpan="2">
<TextBox x:Name="GradationBox" Width="33" HorizontalContentAlignment="Right"
Text="{Binding Value, ElementName=GradScroll}" VerticalContentAlignment="Center" FontSize="14" Margin="0,0,0,0.333"/>
<ScrollBar x:Name="GradScroll" Value="60" SmallChange="1" LargeChange="1" Maximum="255" Minimum="0" RenderTransformOrigin="0.5,0.5" Cursor="Arrow" Background="#FF3E3E3E" BorderBrush="#FF060606" Foreground="#FF030303" >
<ScrollBar.RenderTransform>
<TransformGroup>
<RotateTransform Angle="180"/>
</TransformGroup>
</ScrollBar.RenderTransform>
</ScrollBar>
</StackPanel>
<Label Content="微小差異許容量(0 - 8)：" Margin="0.333,0.333,17,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="7" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
<StackPanel Grid.Column="1" Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Left" Margin="154.333,3.333,0,3.667" Width="33" Background="Black" Grid.ColumnSpan="2">
<TextBox x:Name="SmallDiffBox" Width="16" HorizontalContentAlignment="Center"
Text="{Binding Value, ElementName=SmallDiffScroll}" VerticalContentAlignment="Center" FontSize="14"/>
<ScrollBar x:Name="SmallDiffScroll" Value="8" SmallChange="1" LargeChange="1" Maximum="8" Minimum="0" RenderTransformOrigin="0.5,0.5" Cursor="Arrow" Background="#FF3E3E3E" BorderBrush="#FF060606" Foreground="#FF030303" >
<ScrollBar.RenderTransform>
<TransformGroup>
<RotateTransform Angle="180"/>
</TransformGroup>
</ScrollBar.RenderTransform>
</ScrollBar>
</StackPanel>
<Label Content="視覚的あいまい量(0 - 7)：" Margin="13,0.333,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="7" Height="29" Grid.RowSpan="2" Grid.Column="2" HorizontalAlignment="Left" Width="163" Grid.ColumnSpan="2"/>
<StackPanel Grid.Column="2" Grid.Row="7" Orientation="Horizontal" Margin="175,5.333,0,1.667" Background="Black" HorizontalAlignment="Left" Width="50" Grid.ColumnSpan="2">
<TextBox x:Name="VisualBox" Width="33" HorizontalContentAlignment="Right"
Text="{Binding Value, ElementName=VisualScroll}" VerticalContentAlignment="Center" FontSize="14"/>
<ScrollBar x:Name="VisualScroll" Value="5" SmallChange="1" LargeChange="1" Maximum="7" Minimum="0" RenderTransformOrigin="0.5,0.5" Cursor="Arrow" Background="#FF3E3E3E" BorderBrush="#FF060606" Foreground="#FF030303" >
<ScrollBar.RenderTransform>
<TransformGroup>
<RotateTransform Angle="180"/>
</TransformGroup>
</ScrollBar.RenderTransform>
</ScrollBar>
</StackPanel>
</Grid> </Grid>
</Window> </Window>
Code/CSRender/CSRender/MainWindow.xaml.cs
View file @ 938a4ded
...@@ -40,6 +40,37 @@ namespace CSRender ...@@ -40,6 +40,37 @@ namespace CSRender
ResolutionBox.TextChanged += NumericTextBox_NumChanged; ResolutionBox.TextChanged += NumericTextBox_NumChanged;
NumericScroll1.MouseWheel += NumericScroll1_MouseWheel; 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 = "全ページ"})); PagePattern.Add((new ComboBoxSet { Id = 1, Item = "全ページ"}));
...@@ -98,6 +129,12 @@ namespace CSRender ...@@ -98,6 +129,12 @@ namespace CSRender
return; return;
} }
//検版パラメータの取得
string shiftPixel = PositionBox.Text;
string colorMargin = GradationBox.Text;
string removePoint = SmallDiffBox.Text;
string shadingOff = VisualBox.Text;
//TIFF画像の生成 //TIFF画像の生成
ResultConsole.Text += "<TIFF変換開始>\r\n"; ResultConsole.Text += "<TIFF変換開始>\r\n";
ResultConsole.Text += "　対象ファイルをTIFF画像に変換中\r\n"; ResultConsole.Text += "　対象ファイルをTIFF画像に変換中\r\n";
...@@ -139,7 +176,8 @@ namespace CSRender ...@@ -139,7 +176,8 @@ namespace CSRender
//PureVerifyの実行 //PureVerifyの実行
//string workDir = CompareTIFF.runPureVerify(targetBox.Text, referenceBox.Text, workBox.Text); //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")); outputLog(System.IO.Path.Combine(workDir, "report"));
......
Code/CSRender/CSRender/NumericUpDown.cs
View file @ 938a4ded
...@@ -21,67 +21,179 @@ namespace CSRender ...@@ -21,67 +21,179 @@ namespace CSRender
{ {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// 解像度のUpDownメニュー昨日の記述 // 解像度のUpDownメニュー機能の記述
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
//TextBoxフォーカス時にテキスト全選択 //TextBoxフォーカス時にテキスト全選択
private void NumericTextBox_GotFocusSelectAll(object sender, RoutedEventArgs e) private void NumericTextBox_GotFocusSelectAll(object sender, RoutedEventArgs e)
{ {
TextBox box = (TextBox)sender; TextBox ResolutionBox = (TextBox)sender;
//box.SelectAll(); //box.SelectAll();
this.Dispatcher.InvokeAsync(() => { Task.Delay(10); box.SelectAll(); }); this.Dispatcher.InvokeAsync(() => { Task.Delay(10); ResolutionBox.SelectAll(); });
} }
//正規表現で数値以外は削除using System.Text.RegularExpressions; //正規表現で数値以外は削除using System.Text.RegularExpressions;
private void NumericTextBox_TextChanged(object sender, TextChangedEventArgs e) private void NumericTextBox_TextChanged(object sender, TextChangedEventArgs e)
{ {
TextBox box = (TextBox)sender; TextBox ResolutionBox = (TextBox)sender;
double d; 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) private void NumericTextBox_NumChanged(object sender, TextChangedEventArgs e)
{ {
TextBox box = (TextBox)sender; TextBox ResolutionBox = (TextBox)sender;
if (box.Text == "") if (ResolutionBox.Text == "")
{ {
box.Text = "72"; ResolutionBox.Text = "72";
} }
NumericScroll1.Value = Int32.Parse(box.Text); NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
} }
//TextBox上でマウスホイールを回転させた時にスクロールバーの値を上下させる //TextBox上でマウスホイールを回転させた時にスクロールバーの値を上下させる
private void NumericTextBox_MouseWheel(object sender, MouseWheelEventArgs e) private void NumericTextBox_MouseWheel(object sender, MouseWheelEventArgs e)
{ {
TextBox textBox = (TextBox)sender; TextBox ResolutionBox = (TextBox)sender;
Binding binding = BindingOperations.GetBinding(textBox, TextBox.TextProperty); Binding binding = BindingOperations.GetBinding(ResolutionBox, TextBox.TextProperty);
ScrollBar scrollBar = (ScrollBar)this.FindName(binding.ElementName);//名前から取得 ScrollBar NumericScroll1 = (ScrollBar)this.FindName(binding.ElementName);//名前から取得
scrollBar.Value = Int32.Parse(textBox.Text); NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
if (e.Delta > 0) if (e.Delta > 0)
{ {
scrollBar.Value++; NumericScroll1.Value++;
} }
else else
{ {
scrollBar.Value--; NumericScroll1.Value--;
} }
} }
//ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
private void NumericScroll1_MouseWheel(object sender, MouseWheelEventArgs e) private void NumericScroll1_MouseWheel(object sender, MouseWheelEventArgs e)
{ {
ScrollBar sb = (ScrollBar)sender; ScrollBar NumericScroll1 = (ScrollBar)sender;
sb.Value = Int32.Parse(ResolutionBox.Text); NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
if (e.Delta > 0) if (e.Delta > 0)
{ {
sb.Value++; NumericScroll1.Value++;
} }
else 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--;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment