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

Remove single use overload, callers must specify CancellationToken

Browse source
This commit is contained in:
John Lewin 2018-02-12 07:16:17 -08:00
parent 39af20993d
commit 4bfcf88cb9
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ApplicationView/PrinterModels.cs
View file

@ -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);

2
DesignTools/Primitives/PyramidObject3D.cs
View file

@ -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.

3
DesignTools/TestParts/CardHolder.cs
View file

@ -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");