From ffc81bc378e9fb0e9a91ade9628287e10f6a2b1d Mon Sep 17 00:00:00 2001 From: Tichau Date: Thu, 11 Feb 2016 18:52:32 +0100 Subject: [PATCH] Add progress update in ImageMagick conversions. --- .../ConversionJobs/ConversionJob_ImageMagick.cs | 10 +++++++++- Application/FileConverter/FileConverter.csproj | 8 ++------ Application/FileConverter/packages.config | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs index 2b00259..5aeb30d 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs @@ -36,6 +36,7 @@ namespace FileConverter.ConversionJobs using (MagickImage image = new MagickImage(this.InputFilePath)) { + image.Progress += this.Image_Progress; Debug.Log("Load image {0} succeed.", this.InputFilePath); float scaleFactor = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale); @@ -85,11 +86,18 @@ namespace FileConverter.ConversionJobs default: this.ConversionFailed(string.Format("Unsupported output format {0}.", this.ConversionPreset.OutputType)); + image.Progress -= this.Image_Progress; return; } - + image.Write(this.OutputFilePath); + image.Progress -= this.Image_Progress; } } + + private void Image_Progress(object sender, ProgressEventArgs eventArgs) + { + this.Progress = (float)eventArgs.Progress.ToDouble() / 100f; + } } } diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index 1bcdda8..d24f7ec 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -46,12 +46,8 @@ - - ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0022\lib\net40-client\Magick.NET-AnyCPU.dll - True - - - ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0022\lib\net40-client\Magick.NET.Core.dll + + ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0101\lib\net40-client\Magick.NET-Q16-AnyCPU.dll True diff --git a/Application/FileConverter/packages.config b/Application/FileConverter/packages.config index a69981a..a3bcfb3 100644 --- a/Application/FileConverter/packages.config +++ b/Application/FileConverter/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file