From 4bfcf88cb91025f7eb6bc6d03a12d408697b4043 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 12 Feb 2018 07:16:17 -0800 Subject: [PATCH] Remove single use overload, callers must specify CancellationToken --- ApplicationView/PrinterModels.cs | 2 +- DesignTools/Primitives/PyramidObject3D.cs | 2 +- DesignTools/TestParts/CardHolder.cs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ApplicationView/PrinterModels.cs b/ApplicationView/PrinterModels.cs index 402cea8d0..b504f6bd1 100644 --- a/ApplicationView/PrinterModels.cs +++ b/ApplicationView/PrinterModels.cs @@ -144,7 +144,7 @@ namespace MatterHackers.MatterControl // Save the scene to disk await ApplicationController.Instance.Tasks.Execute(this.SaveChanges); - // Serialize to in memory stream-- + // Serialize to in memory stream var memoryStream = new MemoryStream(); this.Scene.Save(memoryStream); diff --git a/DesignTools/Primitives/PyramidObject3D.cs b/DesignTools/Primitives/PyramidObject3D.cs index fb0f68971..f95ecebde 100644 --- a/DesignTools/Primitives/PyramidObject3D.cs +++ b/DesignTools/Primitives/PyramidObject3D.cs @@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.DesignTools var mesh = VertexSourceToMesh.Revolve(path, 4); mesh.Transform(Matrix4X4.CreateRotationZ(MathHelper.DegreesToRadians(45)) * Matrix4X4.CreateScale(Width / 2, Depth / 2, 1)); Mesh = mesh; - + if (aabb.ZSize > 0) { // If the part was already created and at a height, maintain the height. diff --git a/DesignTools/TestParts/CardHolder.cs b/DesignTools/TestParts/CardHolder.cs index 3bbb79095..b8b82393a 100644 --- a/DesignTools/TestParts/CardHolder.cs +++ b/DesignTools/TestParts/CardHolder.cs @@ -29,6 +29,7 @@ either expressed or implied, of the FreeBSD Project. using System; using System.ComponentModel; +using System.Threading; using MatterHackers.Agg.Font; using MatterHackers.DataConverters3D; using MatterHackers.MatterControl.DesignTools.Operations; @@ -50,7 +51,7 @@ namespace MatterHackers.MatterControl.DesignTools public void Rebuild() { - IObject3D plainCardHolder = Object3D.Load("C:/Temp/CardHolder.stl"); + IObject3D plainCardHolder = Object3D.Load("C:/Temp/CardHolder.stl", CancellationToken.None); //TypeFace typeFace = TypeFace.LoadSVG("Viking_n.svg");