Commit 353e3f1f authored by tsuji's avatar tsuji

ログの出力が処理の経過に応じて行われるように修正

parent ae9a614a
......@@ -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"/>
......
......@@ -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;
}
}
}
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