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

Changing to await able create methods

Browse source 
issue: MatterHackers/MCCentral#4966
async Rebuild calls must be awaited in Create methods
This commit is contained in:
Lars Brubaker 2019-03-04 14:00:52 -08:00
parent 457e31ef10
commit a055192700
18 changed files with 88 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

22
MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs
View file

@ -54,19 +54,19 @@ namespace MatterHackers.MatterControl.Library
{
new GeneratorItem(
() => "Cube".Localize(),
() => Task.FromResult<IObject3D>(CubeObject3D.Create()))
async () => await CubeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Pyramid".Localize(),
() => Task.FromResult<IObject3D>(PyramidObject3D.Create()))
async () => await PyramidObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Wedge".Localize(),
() => Task.FromResult<IObject3D>(WedgeObject3D.Create()))
async () => await WedgeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Half Wedge".Localize(),
() => Task.FromResult<IObject3D>(HalfWedgeObject3D.Create()))
async () => await HalfWedgeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Text".Localize(),
@ -75,12 +75,12 @@ namespace MatterHackers.MatterControl.Library
#if DEBUG
new GeneratorItem(
() => "Text".Localize(),
() => Task.FromResult<IObject3D>(TextPathObject3D.Create()))
async () => await TextPathObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
#endif
new GeneratorItem(
() => "Cylinder".Localize(),
() => Task.FromResult<IObject3D>(CylinderObject3D.Create()))
async () => await CylinderObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Cone".Localize(),
@ -88,23 +88,23 @@ namespace MatterHackers.MatterControl.Library
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Half Cylinder".Localize(),
() => Task.FromResult<IObject3D>(HalfCylinderObject3D.Create()))
async () => await HalfCylinderObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Torus".Localize(),
() => Task.FromResult<IObject3D>(TorusObject3D.Create()))
async () => await TorusObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Ring".Localize(),
() => Task.FromResult<IObject3D>(RingObject3D.Create()))
async () => await RingObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Sphere".Localize(),
() => Task.FromResult<IObject3D>(SphereObject3D.Create()))
async () => await SphereObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Half Sphere".Localize(),
() => Task.FromResult<IObject3D>(HalfSphereObject3D.Create()))
async () => await HalfSphereObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Image Converter".Localize(),