From 353e3f1f95717edeb1ec2c809236772ec7d0979e Mon Sep 17 00:00:00 2001
From: tsuji <ak.tsuji@screen.co.jp>
Date: Wed, 1 Dec 2021 11:55:21 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=81=AE=E5=87=BA=E5=8A=9B?=
 =?UTF-8?q?=E3=81=8C=E5=87=A6=E7=90=86=E3=81=AE=E7=B5=8C=E9=81=8E=E3=81=AB?=
 =?UTF-8?q?=E5=BF=9C=E3=81=98=E3=81=A6=E8=A1=8C=E3=82=8F=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=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    |  2 +-
 Code/CSRender/CSRender/MainWindow.xaml.cs | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Code/CSRender/CSRender/MainWindow.xaml b/Code/CSRender/CSRender/MainWindow.xaml
index bb79319..dd5197f 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml
+++ b/Code/CSRender/CSRender/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d"
         Title="CSRender" Height="450" Width="600" Background="#FFF3F4F4" MinWidth="600" MinHeight="300">
-
+    
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="135"/>
diff --git a/Code/CSRender/CSRender/MainWindow.xaml.cs b/Code/CSRender/CSRender/MainWindow.xaml.cs
index 74fa871..3838a17 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml.cs
+++ b/Code/CSRender/CSRender/MainWindow.xaml.cs
@@ -17,6 +17,7 @@ using System.Text.RegularExpressions;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Windows.Threading;
 
 namespace CSRender
 {
@@ -152,6 +153,7 @@ namespace CSRender
             //TIFF画像の生成
             ResultConsole.Text += "<TIFF変換開始>\r\n";
             ResultConsole.Text += "　対象ファイルをTIFF画像に変換中\r\n";
+            DoEvents();
 
             //必要に応じてページ引数を指定
             bool pageFlag = false;
@@ -175,6 +177,7 @@ namespace CSRender
                 OutputTIFF.runCSRender(ResolutionBox.Text, "TIFF", pageFlag, selectedPage, targetBox.Text, targetTIFFPath);
             
             ResultConsole.Text += "　リファレンスファイルをTIFF画像に変換中\r\n";
+            DoEvents();
 
             //リファレンスフォルダ
             string referenceTIFFPath = System.IO.Path.Combine(workBox.Text, "work", "referenceTIFF");
@@ -189,6 +192,7 @@ namespace CSRender
                 OutputTIFF.runCSRender(ResolutionBox.Text, "TIFF", pageFlag, selectedPage, referenceBox.Text, referenceTIFFPath);
 
             ResultConsole.Text += "<TIFF変換完了>\r\n\r\n";
+            DoEvents();
 
             //PureVerifyの実行
             //string workDir = CompareTIFF.runPureVerify(targetBox.Text, referenceBox.Text, workBox.Text);
@@ -229,6 +233,7 @@ namespace CSRender
                 {
                     ResultConsole.Text += tranceString + "\r\n";
                     ResultConsole.ScrollToEnd();
+                    DoEvents();
                 }
             }
             logString.Close();
@@ -242,6 +247,7 @@ namespace CSRender
             ResultConsole.Text += "<変換開始>\r\n";
             ResultConsole.Text += "　PDFを" + FileSelect.Text + "に変換します\r\n";
             ResultConsole.Text += "\r\n";
+            DoEvents();
 
             //必要に応じてページ引数を指定
             bool pageFlag = false;
@@ -288,6 +294,19 @@ namespace CSRender
             Properties.Settings.Default.formatSetting = FileSelect.Text;
             Properties.Settings.Default.Save();
         }
-        
+
+        private void DoEvents()
+        {
+            DispatcherFrame frame = new DispatcherFrame();
+            var callback = new DispatcherOperationCallback(ExitFrames);
+            Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Background, callback, frame);
+            Dispatcher.PushFrame(frame);
+        }
+
+        private object ExitFrames(object obj)
+        {
+            ((DispatcherFrame)obj).Continue = false;
+            return null;
+        }
     }
 }
-- 
2.22.0