From 645464d687178d697aa261eb36f8a40fa8a11418 Mon Sep 17 00:00:00 2001
From: tsuji <ak.tsuji@screen.co.jp>
Date: Fri, 4 Feb 2022 15:03:35 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=82=92=E5=BE=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/CSRender/CSRender/App.config             |  2 +-
 Code/CSRender/CSRender/MainWindow.xaml        | 66 +++++++++----------
 .../CSRender/Properties/Settings.Designer.cs  |  2 +-
 .../CSRender/Properties/Settings.settings     |  2 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Code/CSRender/CSRender/App.config b/Code/CSRender/CSRender/App.config
index e8e3df8..5dfaba2 100644
--- a/Code/CSRender/CSRender/App.config
+++ b/Code/CSRender/CSRender/App.config
@@ -14,7 +14,7 @@
                 <value>75</value>
             </setting>
             <setting name="formatSetting" serializeAs="String">
-                <value />
+                <value>TIFF</value>
             </setting>
             <setting name="shiftPixelSetting" serializeAs="String">
                 <value>2</value>
diff --git a/Code/CSRender/CSRender/MainWindow.xaml b/Code/CSRender/CSRender/MainWindow.xaml
index 3d7a7d8..dc93b0f 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml
+++ b/Code/CSRender/CSRender/MainWindow.xaml
@@ -11,7 +11,7 @@
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="135"/>
+            <ColumnDefinition Width="136"/>
             <ColumnDefinition Width="195*"/>
             <ColumnDefinition Width="178*"/>
             <ColumnDefinition Width="85*"/>
@@ -30,29 +30,29 @@
             <RowDefinition Height="30"/>
             <RowDefinition Height="3*"/>
         </Grid.RowDefinitions>
-        <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">
+        <Label Content="対象フォルダ　   　：" Margin="8,0,0,2.333" VerticalAlignment="Bottom" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.RowSpan="2" Height="28"/>
+        <Label Content="リファレンスフォルダ   ：" Margin="5,26.667,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="1" Height="29" Grid.RowSpan="2"/>
+        <Label Content="作業フォルダ       　：" Margin="7,27.667,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="2" Height="29" Grid.RowSpan="3"/>
+        <Label Content="レポート出力フォルダ：" Margin="7,27.667,183.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="3" Height="29" Grid.RowSpan="3" Grid.ColumnSpan="2"/>
+        <Label Content="画像出力設定値   ：" Margin="7,27.667,1,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="4" Height="29" Grid.RowSpan="3"/>
+        <Label Content="検版設定値　      ：" Margin="9,27.667,181.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="6" Height="29" Grid.RowSpan="3" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="targetBox" Grid.Column="1" Margin="9,2.667,8.667,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="9,2.667,8.667,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="9,2.667,8.667,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="9,2.667,8.667,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.333,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.333,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.333,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.333,4.667,0,0" VerticalAlignment="Top" Width="65" Grid.Row="4" Height="20" Click="ReportButton_Click"/>
+        <Label Content="解像度(9 - 300)：" Margin="1,0.667,63.667,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.333,0.667,62.667,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="123,4.667,0,2.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="2" HorizontalAlignment="Left" Margin="102,4.667,0,5.333" Grid.Row="5"  Width="80" Grid.RowSpan="3" Grid.ColumnSpan="2" >
+        <StackPanel  Grid.Column="2" HorizontalAlignment="Left" Margin="102.333,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,8 +62,8 @@
                 </ComboBox.Background>
             </ComboBox>
         </StackPanel>
-        <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"/>
+        <Label Content="出力形式：" Margin="41,0,11,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="1,27.667,91.667,0" VerticalAlignment="Top" RenderTransformOrigin="0.544,1.949" FontSize="14" Grid.Row="5" Height="29" IsEnabled="{Binding PageRange_SelectionChanged}" Grid.RowSpan="3" Grid.Column="1"/>
         <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>
@@ -74,31 +74,31 @@
                 </ComboBox.Background>
             </ComboBox>
         </StackPanel>
-        <TextBox x:Name="pageBox" Grid.Column="1" Height="23" Margin="81.333,3.667,44.333,0" Grid.Row="6" 
+        <TextBox x:Name="pageBox" Grid.Column="1" Height="23" Margin="80,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.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"/>
+        <TextBox x:Name="ResultConsole" Margin="44,6.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="52,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="143,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">
+        <Label Content="位置ズレ許容量(0 - 2)：" Margin="1,0.667,29.667,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="153,4.667,0,2.333" Width="32" Background="WhiteSmoke">
 
             <WindowsFormsHost Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="32"  Background="Orange">
                 <wfc:NumericUpDown x:Name="PositionBox" x:FieldModifier="public" Maximum="2" Minimum="0" Value="2" ReadOnly="False" Width="32" Margin="10,10,0,0" BorderStyle="FixedSingle"/>
             </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"/>
-        <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">
+        <Label Content="諧調差許容量(0 - 255)：" Margin="11.333,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.333,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.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">
+        <Label Content="微小差異許容量(0 - 8)：" Margin="1,0.667,16.667,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="153,4.667,0,2.333" Width="32" Background="WhiteSmoke">
 
 
             <WindowsFormsHost Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="32"  Background="Orange">
@@ -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"/>
-        <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">
+        <Label Content="視覚的あいまい量(0 - 7)：" Margin="11.333,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.333,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/Properties/Settings.Designer.cs b/Code/CSRender/CSRender/Properties/Settings.Designer.cs
index f713c43..ed7f4b5 100644
--- a/Code/CSRender/CSRender/Properties/Settings.Designer.cs
+++ b/Code/CSRender/CSRender/Properties/Settings.Designer.cs
@@ -37,7 +37,7 @@ namespace CSRender.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("TIFF")]
         public string formatSetting {
             get {
                 return ((string)(this["formatSetting"]));
diff --git a/Code/CSRender/CSRender/Properties/Settings.settings b/Code/CSRender/CSRender/Properties/Settings.settings
index d9439ab..5b2aa8e 100644
--- a/Code/CSRender/CSRender/Properties/Settings.settings
+++ b/Code/CSRender/CSRender/Properties/Settings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">75</Value>
     </Setting>
     <Setting Name="formatSetting" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">TIFF</Value>
     </Setting>
     <Setting Name="shiftPixelSetting" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">2</Value>
-- 
2.22.0