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

Cleaning up object3d invalidate calls

Browse source
This commit is contained in:
Lars Brubaker 2019-01-28 17:44:00 -08:00
parent 239c431560
commit 6305303047
49 changed files with 90 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/DesignTools/Primitives/BaseObject3D.cs
View file

@ -167,7 +167,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
}
private static Polygon GetBoundingPolygon(Polygons basePolygons)

2
MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
View file

@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.DesignTools
undoBuffer.AddAndDo(new ReplaceCommand(new[] { this }, newChildren));
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public override void Remove(UndoBuffer undoBuffer)

4
MatterControlLib/DesignTools/Primitives/ConeObject3D.cs
View file

@ -96,10 +96,10 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (changed)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}
}

4
MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs
View file

@ -173,10 +173,10 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (changed)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}

4
MatterControlLib/DesignTools/Primitives/HalfCylinderObject3D.cs
View file

@ -100,10 +100,10 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (changed)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}
}

4
MatterControlLib/DesignTools/Primitives/HalfSphereObject3D.cs
View file

@ -110,10 +110,10 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (changed)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}
}

2
MatterControlLib/DesignTools/Primitives/HalfWedgeObject3D.cs
View file

@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
}
}
}

4
MatterControlLib/DesignTools/Primitives/ImageObject3D.cs
View file

@ -101,7 +101,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
// send the invalidate on image change
this.OnInvalidate(new InvalidateArgs(this, InvalidateType.Image));
Invalidate(InvalidateType.Image);
}
return _image;
@ -118,7 +118,7 @@ namespace MatterHackers.MatterControl.DesignTools
_invert = value;
_image = null;
this.OnInvalidate(new InvalidateArgs(this, InvalidateType.Image));
Invalidate(InvalidateType.Image);
}
}
}

2
MatterControlLib/DesignTools/Primitives/PyramidObject3D.cs
View file

@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
}
}
}

4
MatterControlLib/DesignTools/Primitives/RingObject3D.cs
View file

@ -128,10 +128,10 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (changed)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}

4
MatterControlLib/DesignTools/Primitives/SphereObject3D.cs
View file

@ -130,11 +130,11 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (changed)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}

8
MatterControlLib/DesignTools/Primitives/TextObject3D.cs
View file

@ -43,6 +43,7 @@ using MatterHackers.VectorMath;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System.Threading.Tasks;
using System;
namespace MatterHackers.MatterControl.DesignTools
{
@ -54,11 +55,12 @@ namespace MatterHackers.MatterControl.DesignTools
Color = Operations.Object3DExtensions.PrimitiveColors["Text"];
}
public static TextObject3D Create()
public static async Task<TextObject3D> Create()
{
var item = new TextObject3D();
item.Invalidate(new InvalidateArgs(null, InvalidateType.Children));
await item.Rebuild();
return item;
}
@ -153,7 +155,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
rebuildLock.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});
}

2
MatterControlLib/DesignTools/Primitives/TextPathObject3D.cs
View file

@ -144,7 +144,7 @@ namespace MatterHackers.MatterControl.DesignTools
base.Mesh = null;
}
this.Invalidate(new InvalidateArgs(this, InvalidateType.Path));
Invalidate(InvalidateType.Path);
}
public override Mesh Mesh

4
MatterControlLib/DesignTools/Primitives/TorusObject3D.cs
View file

@ -128,10 +128,10 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (changed)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}

2
MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs
View file

@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
}
}
}