nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3280 from larsbrubaker/design_tools

Browse source 
Made async load sequence do all its work on a backgroud thread
This commit is contained in:
Lars Brubaker 2018-05-04 16:39:07 -07:00 • committed by GitHub
commit 2b20afd1f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
ApplicationView/ApplicationController.cs
View file

@ -56,6 +56,7 @@ namespace MatterHackers.MatterControl
using Agg.Image;
using CustomWidgets;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.VertexSource;
using MatterHackers.DataConverters3D;
using MatterHackers.DataConverters3D.UndoCommands;
using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling;
@ -595,6 +596,27 @@ namespace MatterHackers.MatterControl
}
public ImageSequence GetProcessingSequence(Color color)
{
int size = (int)Math.Round(80 * GuiWidget.DeviceScale);
double radius = size / 8.0;
var workingAnimation = new ImageSequence();
var frameCount = 30.0;
var strokeWidth = 4 * GuiWidget.DeviceScale;
for(int i=0; i < frameCount; i++)
{
var frame = new ImageBuffer(size, size);
var graphics = frame.NewGraphics2D();
graphics.Render(new Stroke(new Arc(frame.Width / 2, frame.Height / 2,
size / 4 - strokeWidth / 2, size / 4 - strokeWidth / 2,
MathHelper.Tau / frameCount * i,
MathHelper.Tau / 4 + MathHelper.Tau / frameCount * i), strokeWidth), color);
workingAnimation.AddImage(frame);
}
return workingAnimation;
}
static int applicationInstanceCount = 0;
public static int ApplicationInstanceCount
{
@ -1475,13 +1497,22 @@ namespace MatterHackers.MatterControl
{
try // if we get a bad result we can get a target invocation exception. In that case just don't show anything
{
// scale the loaded image to the size of the target image
byte[] raw = e.Result;
Stream stream = new MemoryStream(raw);
ImageBuffer unScaledImage = new ImageBuffer(10, 10);
AggContext.StaticData.LoadImageSequenceData(stream, imageSequenceToLoadInto);
Task.Run(() =>
{
// scale the loaded image to the size of the target image
byte[] raw = e.Result;
Stream stream = new MemoryStream(raw);
imageSequenceToLoadInto.Invalidate();
var asyncImageSequence = new ImageSequence();
AggContext.StaticData.LoadImageSequenceData(stream, asyncImageSequence);
UiThread.RunOnIdle(() =>
{
imageSequenceToLoadInto.Copy(asyncImageSequence);
imageSequenceToLoadInto.Invalidate();
});
});
}
catch
{

4
SetupWizard/DesignSpaceHelp.cs
View file

@ -349,7 +349,7 @@ namespace MatterHackers.MatterControl
{
var sequence = new ImageSequence()
{
FramePerSecond = 3,
FramesPerSecond = 3,
};
sequence.AddImage(new ImageBuffer(1, 1));
@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl
{
title.Text = guide.Title;
description.Text = guide.Description;
imageSequenceWidget.ImageSequence = AggContext.StaticData.LoadSequence(Path.Combine("Icons", "provider_loading.gif"));
imageSequenceWidget.ImageSequence = ApplicationController.Instance.GetProcessingSequence(Color.Black);
ApplicationController.Instance.DownloadToImageSequenceAsync(imageSequenceWidget.ImageSequence, guide.AnimationUri);
};

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit f19919b29f82e37f788267f458fdcc5e08309642
Subproject commit d3a38bc2b23964d7c30468a603ea28b230df4a4c