From aa75088955a5a46354e955c88e7a5e7e26e566ec Mon Sep 17 00:00:00 2001
From: tsuji <ak.tsuji@screen.co.jp>
Date: Thu, 3 Feb 2022 17:25:08 +0900
Subject: [PATCH] =?UTF-8?q?GUI=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E9=85=8D=E7=BD=AE=E3=83=BB=E8=A1=A8=E8=A8=98=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/CSRender/CSRender/MainWindow.xaml    | 78 +++++++++++------------
 Code/CSRender/CSRender/MainWindow.xaml.cs |  2 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Code/CSRender/CSRender/MainWindow.xaml b/Code/CSRender/CSRender/MainWindow.xaml
index 7a40e7f..3d7a7d8 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml
+++ b/Code/CSRender/CSRender/MainWindow.xaml
@@ -13,11 +13,11 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="135"/>
             <ColumnDefinition Width="195*"/>
-            <ColumnDefinition Width="165*"/>
-            <ColumnDefinition Width="98*"/>
+            <ColumnDefinition Width="178*"/>
+            <ColumnDefinition Width="85*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="10*"/>
+            <RowDefinition Height="11*"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="28"/>
@@ -26,33 +26,33 @@
             <RowDefinition Height="28"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="28"/>
-            <RowDefinition Height="155*"/>
-            <RowDefinition Height="23"/>
-            <RowDefinition Height="10*"/>
+            <RowDefinition Height="177*"/>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="3*"/>
         </Grid.RowDefinitions>
-        <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.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.333,2.667,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="3" Height="29" Grid.RowSpan="3"/>
-        <Label Content="TIFFパラメーター 　：" Margin="9,27.333,3.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="4" Height="29" Grid.RowSpan="3"/>
-        <Label Content="検版パラメーター   ：" Margin="12,27.333,0.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="6" Height="29" Grid.RowSpan="3"/>
-        <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" BorderBrush="#FF595959"/>
-        <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" BorderBrush="#FF595959"/>
-        <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" BorderBrush="#FF595959"/>
-        <TextBox x:Name="reportBox" Grid.Column="1" Margin="10.333,2.333,9.333,0" FontSize="14" Grid.Row="4" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="ReportBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2" BorderBrush="#FF595959"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <Button x:Name="reportButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="6.667,4.333,0,0" VerticalAlignment="Top" Width="75" Grid.Row="4" Height="20" Click="ReportButton_Click"/>
-        <Label Content="解像度(9 - 300)：" Margin="0.333,0.333,64,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" 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="6" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
-        <StackPanel Grid.Column="1" Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="124.333,6.333,0,0.667" Width="47" Background="WhiteSmoke">
+        <Label Content="対象フォルダ　 　：" Margin="10,0,2.667,2.333" VerticalAlignment="Bottom" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.RowSpan="2" Height="28"/>
+        <Label Content="リファレンスフォルダ：" Margin="10,26.667,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,2.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="2" Height="29" Grid.RowSpan="3"/>
+        <Label Content="レポート出力フォルダ：" Margin="2,27.667,2.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="3" Height="29" Grid.RowSpan="3"/>
+        <Label Content="画像出力設定値 ：" Margin="9,27.667,4.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="4" Height="29" Grid.RowSpan="3"/>
+        <Label Content="検版設定値　    ：" Margin="11,27.667,1.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="6" Height="29" Grid.RowSpan="3"/>
+        <TextBox x:Name="targetBox" Grid.Column="1" Margin="10.333,2.667,9,0" FontSize="14" Grid.Row="1" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="TargetBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2" BorderBrush="#FF595959"/>
+        <TextBox x:Name="referenceBox" Grid.Column="1" Margin="10.333,2.667,9,0" FontSize="14" Grid.Row="2" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="RefBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2" BorderBrush="#FF595959"/>
+        <TextBox x:Name="workBox" Grid.Column="1" Margin="10.333,2.667,9,0" FontSize="14" Grid.Row="3" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="WorkBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2" BorderBrush="#FF595959"/>
+        <TextBox x:Name="reportBox" Grid.Column="1" Margin="10.333,2.667,9,0" FontSize="14" Grid.Row="4" Height="24" VerticalAlignment="Top" AllowDrop="True" Drop="ReportBox_Drop" DragOver="textBox_PreviewDragOver" Grid.ColumnSpan="2" BorderBrush="#FF595959"/>
+        <Button x:Name="targetButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="5,4.667,0,0" VerticalAlignment="Top" Width="65" Grid.Row="1" Height="20" Click="TagetButton_Click"/>
+        <Button x:Name="referenceButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="5,4.667,0,0" VerticalAlignment="Top" Width="65" Grid.Row="2" Height="20" Click="ReferenceButton_Click"/>
+        <Button x:Name="workButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="5,4.667,0,0" VerticalAlignment="Top" Width="65" Grid.Row="3" Height="20" Click="WorkButton_Click"/>
+        <Button x:Name="reportButton" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="5,4.667,0,0" VerticalAlignment="Top" Width="65" Grid.Row="4" Height="20" Click="ReportButton_Click"/>
+        <Label Content="解像度(9 - 300)：" Margin="0.333,0.667,64,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
+        <Label Content="検査範囲：" Margin="11,0.667,63,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" Grid.RowSpan="2" Grid.Column="2"/>
+        <StackPanel Grid.Column="1" Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="124.333,6.667,0,0.333" Width="47" Background="WhiteSmoke">
             <WindowsFormsHost Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="47"  Background="Orange">
                 <wfc:NumericUpDown x:Name="ResolutionBox" x:FieldModifier="public" Maximum="300" Minimum="1" Value="72" ReadOnly="False" Width="47" Margin="10,10,0,0" BorderStyle="FixedSingle"/>
             </WindowsFormsHost>
 
         </StackPanel>
-        <StackPanel  Grid.Column="1" HorizontalAlignment="Left" Margin="91.333,4.333,0,5.667" Grid.Row="6"  Width="80" Grid.RowSpan="3" >
+        <StackPanel  Grid.Column="2" HorizontalAlignment="Left" Margin="102,4.667,0,5.333" Grid.Row="5"  Width="80" Grid.RowSpan="3" Grid.ColumnSpan="2" >
             <ComboBox x:Name="PageRange" SelectedValuePath="Id" DisplayMemberPath="Item" Height="21" SelectedValue="1" SelectionChanged="PageRange_SelectionChanged" Width="80" BorderBrush="#FF3A3A3A">
                 <ComboBox.Background>
                     <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
@@ -62,9 +62,9 @@
                 </ComboBox.Background>
             </ComboBox>
         </StackPanel>
-        <Label Content="出力形式：" Margin="10,0.667,71.333,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" Grid.RowSpan="2" Grid.Column="2"/>
-        <Label x:Name="pageLabel" Content="指定ページ：" Margin="10,0.667,72.333,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="6" Height="29" Grid.Column="2" IsEnabled="{Binding PageRange_SelectionChanged}" Grid.RowSpan="2"/>
-        <StackPanel  Grid.Column="2" HorizontalAlignment="Left" Margin="95,5.667,0,18.333" Grid.Row="5"  Width="71" Grid.RowSpan="2" Grid.ColumnSpan="2" >
+        <Label Content="出力形式：" Margin="41,0,9.667,1.667" VerticalAlignment="Bottom" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="9" Height="29" Grid.RowSpan="2"/>
+        <Label x:Name="pageLabel" Content="指定ページ：" Margin="133,27.667,101,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" IsEnabled="{Binding PageRange_SelectionChanged}" Grid.RowSpan="3" Grid.ColumnSpan="2"/>
+        <StackPanel HorizontalAlignment="Left" Margin="119,2.333,0,0.333" Grid.Row="10"  Width="71" Grid.RowSpan="2" Grid.ColumnSpan="2" >
             <ComboBox x:Name="FileSelect" SelectedValuePath="Id" DisplayMemberPath="Item" Height="21" SelectedValue="1" Margin="0,0,9.667,0" BorderBrush="#FF3A3A3A" >
                 <ComboBox.Background>
                     <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
@@ -74,14 +74,14 @@
                 </ComboBox.Background>
             </ComboBox>
         </StackPanel>
-        <TextBox x:Name="pageBox" Grid.Column="2" Height="23" Margin="95,3.667,44.333,0" Grid.Row="6" 
-                 TextWrapping="Wrap" Text="1,2,4-6" VerticalAlignment="Top" FontSize="14" IsEnabled="{Binding PageRange_SelectionChanged}" Grid.ColumnSpan="2"
+        <TextBox x:Name="pageBox" Grid.Column="1" Height="23" Margin="81.333,3.667,44.333,0" Grid.Row="6" 
+                 TextWrapping="Wrap" Text="1,2,4-6" VerticalAlignment="Top" FontSize="14" IsEnabled="{Binding PageRange_SelectionChanged}" Grid.ColumnSpan="3"
                  InputMethod.IsInputMethodSuspended="True" PreviewKeyDown="PageBox_PreviewKeyDown" PreviewTextInput="PageBox_PreviewTextInput" LostFocus="PageBox_LostFocus" CommandManager.PreviewExecuted="PageBox_PreviewExecuted" BorderBrush="#FF595959"/>
-        <TextBox x:Name="ResultConsole" Margin="44,9.333,44.333,9.667" Grid.Row="9" Grid.ColumnSpan="4" VerticalScrollBarVisibility="Auto" FontSize="14" IsReadOnly="True" HorizontalScrollBarVisibility="Auto" BorderBrush="#FF595959"/>
-        <Button x:Name="TIFFButton" Content="TIFF出力" HorizontalAlignment="Left" Height="22" Margin="45,1.333,0,0" Grid.Row="10" VerticalAlignment="Top" Width="82" Grid.RowSpan="2" Click="TIFFButtonClick"/>
-        <Button x:Name="CompareButton" Content="比較" HorizontalAlignment="Left" Height="22" Margin="13.333,1.333,0,0" Grid.Row="10" 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="10" 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="7" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
+        <TextBox x:Name="ResultConsole" Margin="44,9.667,44.333,8.667" Grid.Row="9" Grid.ColumnSpan="4" VerticalScrollBarVisibility="Auto" FontSize="14" IsReadOnly="True" HorizontalScrollBarVisibility="Auto" BorderBrush="#FF595959"/>
+        <Button x:Name="TIFFButton" Content="画像出力" HorizontalAlignment="Left" Height="22" Margin="53.333,2.333,0,0" Grid.Row="10" VerticalAlignment="Top" Width="82" Click="TIFFButtonClick" Grid.Column="1"/>
+        <Button x:Name="CompareButton" Content="比較" HorizontalAlignment="Left" Height="22" Margin="144.333,2.333,0,0" Grid.Row="10" VerticalAlignment="Top" Width="82" Grid.Column="1" Click="CompareButtonClick" Grid.ColumnSpan="2"/>
+        <Button x:Name="closeButton" Content="Close" Height="22" Margin="0,2.333,45.333,0" Grid.Row="10" VerticalAlignment="Top" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Width="77" Click="CloseButton_Click"/>
+        <Label Content="位置ズレ許容量(0 - 2)：" Margin="0.333,0.667,30,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,4.667,0,2.333" Width="32" Background="WhiteSmoke">
 
             <WindowsFormsHost Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="32"  Background="Orange">
@@ -89,15 +89,15 @@
             </WindowsFormsHost>
 
         </StackPanel>
-        <Label Content="諧調差許容量(0 - 255)：" Margin="11,0.667,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" HorizontalAlignment="Left" Margin="172,4.333,0,2.667" Width="43" Background="WhiteSmoke" Grid.ColumnSpan="2">
+        <Label Content="諧調差許容量(0 - 255)：" Margin="11,0.667,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"/>
+        <StackPanel Grid.Column="2" Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Left" Margin="172,4.667,0,2.333" Width="43" Background="WhiteSmoke" Grid.ColumnSpan="2">
 
             <WindowsFormsHost Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="43"  Background="Orange">
                 <wfc:NumericUpDown x:Name="GradationBox" x:FieldModifier="public" Maximum="255" Minimum="0" Value="60" ReadOnly="False" Width="43" Margin="10,10,0,0" BorderStyle="FixedSingle"/>
             </WindowsFormsHost>
 
         </StackPanel>
-        <Label Content="微小差異許容量(0 - 8)：" Margin="0.333,0.333,17,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="8" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
+        <Label Content="微小差異許容量(0 - 8)：" Margin="0.333,0.667,17,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="8" Height="29" Grid.RowSpan="2" Grid.Column="1"/>
         <StackPanel Grid.Column="1" Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Left" Margin="154.333,4.667,0,2.333" Width="32" Background="WhiteSmoke">
 
 
@@ -106,8 +106,8 @@
             </WindowsFormsHost>
 
         </StackPanel>
-        <Label Content="視覚的あいまい量(0 - 7)：" Margin="11,0.667,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="8" Height="29" Grid.RowSpan="2" Grid.Column="2" HorizontalAlignment="Left" Width="163" Grid.ColumnSpan="2"/>
-        <StackPanel Grid.Column="2" Grid.Row="8" Orientation="Horizontal" Margin="172,5.333,0,1.667" Background="WhiteSmoke" HorizontalAlignment="Left" Width="43" Grid.ColumnSpan="2">
+        <Label Content="視覚的あいまい量(0 - 7)：" Margin="11,0.667,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="8" Height="29" Grid.RowSpan="2" Grid.Column="2" HorizontalAlignment="Left" Width="163"/>
+        <StackPanel Grid.Column="2" Grid.Row="8" Orientation="Horizontal" Margin="172,5.667,0,1.333" Background="WhiteSmoke" HorizontalAlignment="Left" Width="43" Grid.ColumnSpan="2">
 
 
             <WindowsFormsHost Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="43"  Background="Orange">
diff --git a/Code/CSRender/CSRender/MainWindow.xaml.cs b/Code/CSRender/CSRender/MainWindow.xaml.cs
index 0cddac7..32652b2 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml.cs
+++ b/Code/CSRender/CSRender/MainWindow.xaml.cs
@@ -485,7 +485,7 @@ namespace CSRender
 
             //.txtファイルに記述する内容
             string writeText = "**RESULT_RIP_TIME: \"" + allRipTime + "\"\r\n";
-            writeText += "**ENV_VERSION: \"CSRender Ver 1.1.0\"\r\n";
+            writeText += "**ENV_VERSION: \"CSRender Ver 0.3.0\"\r\n";
             writeText += "**ENV_RIPVERIFY_PATH: \"" + appPath + "\"\r\n";
             writeText += "**ENV_RIP_PROCESSING: \"PDFium\"\r\n";
             writeText += "**ENV_IMAGE_RESO: \"" + ResolutionBox.Text + "\"\r\n";
-- 
2.22.0