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

12
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -1129,7 +1129,7 @@ namespace MatterHackers.MatterControl
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { path }));
scene.SelectedItem = null;
scene.SelectedItem = path;
path.Invalidate(new InvalidateArgs(path, InvalidateType.Properties));
path.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
@ -1245,7 +1245,7 @@ namespace MatterHackers.MatterControl
scene.SelectedItem = null;
scene.SelectedItem = component;
// Invalidate image to kick off rebuild of ImageConverter stack
imageObject.Invalidate(new InvalidateArgs(imageObject, InvalidateType.Image));
imageObject.Invalidate(InvalidateType.Image);
return Task.CompletedTask;
},
@ -1369,7 +1369,7 @@ namespace MatterHackers.MatterControl
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { extrude }));
scene.SelectedItem = null;
scene.SelectedItem = extrude;
extrude.Invalidate(new InvalidateArgs(extrude, InvalidateType.Properties));
extrude.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
@ -1397,7 +1397,7 @@ namespace MatterHackers.MatterControl
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { smoothPath }));
scene.SelectedItem = null;
scene.SelectedItem = smoothPath;
smoothPath.Invalidate(new InvalidateArgs(smoothPath, InvalidateType.Properties));
smoothPath.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
@ -1425,7 +1425,7 @@ namespace MatterHackers.MatterControl
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { inflatePath }));
scene.SelectedItem = null;
scene.SelectedItem = inflatePath;
inflatePath.Invalidate(new InvalidateArgs(inflatePath, InvalidateType.Properties));
inflatePath.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
@ -1451,7 +1451,7 @@ namespace MatterHackers.MatterControl
};
newChild.Matrix = Matrix4X4.Identity;
baseMesh.Children.Add(newChild);
baseMesh.Invalidate(new InvalidateArgs(baseMesh, InvalidateType.Properties));
baseMesh.Invalidate(InvalidateType.Properties);
scene.UndoBuffer.AddAndDo(
new ReplaceCommand(

4
MatterControlLib/DesignTools/Braille/BrailleCardObject3D.cs
View file

@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.DesignTools
Height = BaseHeight
};
textObject.Invalidate(new InvalidateArgs(textObject, InvalidateType.Properties));
textObject.Invalidate(InvalidateType.Properties);
IObject3D letterObject = new RotateObject3D(textObject, MathHelper.Tau / 4);
letterObject = new AlignObject3D(letterObject, FaceAlign.Bottom | FaceAlign.Front, brailleLetter, FaceAlign.Top | FaceAlign.Front, 0, 0, 3.5);
letterObject = new SetCenterObject3D(letterObject, brailleLetter.GetCenter(), true, false, false);
@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
}
}

2
MatterControlLib/DesignTools/Braille/BrailleObject3D.cs
View file

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

2
MatterControlLib/DesignTools/LithophaneObject3D.cs
View file

@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl.Plugins.Lithophane
// Apply offset
this.Matrix *= Matrix4X4.CreateTranslation(-this.ImageOffset);
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});

2
MatterControlLib/DesignTools/Obsolete/CombineObject3D.cs
View file

@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
rebuildLocks.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});
}

4
MatterControlLib/DesignTools/Obsolete/CurveObject3D.cs
View file

@ -274,10 +274,10 @@ namespace MatterHackers.MatterControl.DesignTools
Matrix = currentMatrix;
}
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
if (propertyUpdated)
{
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
}
}

6
MatterControlLib/DesignTools/Obsolete/FitToBoundsObject3D.cs
View file

@ -101,7 +101,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
list.AddRange(ScaleItem.Children);
});
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public override void Remove(UndoBuffer undoBuffer)
@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
});
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public override void OnInvalidate(InvalidateArgs invalidateType)
@ -180,7 +180,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
base.Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Invalidate(InvalidateType.Matrix);
}
public override AxisAlignedBoundingBox GetAxisAlignedBoundingBox(Matrix4X4 matrix)

2
MatterControlLib/DesignTools/Obsolete/IntersectionObject3D.cs
View file

@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
rebuildLocks.Dispose();
base.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});

2
MatterControlLib/DesignTools/Obsolete/MirrorObject3D.cs
View file

@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools
this.Matrix = oldMatrix;
}
base.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
}

2
MatterControlLib/DesignTools/Obsolete/PinchObject3D.cs
View file

@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.DesignTools
Matrix = currentMatrix;
}
base.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
}
}

10
MatterControlLib/DesignTools/Obsolete/RotateObject3D.cs
View file

@ -97,12 +97,12 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Invalidate(InvalidateType.Matrix);
return Task.CompletedTask;
}
public override void OnInvalidate(InvalidateArgs invalidateType)
public override async void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Children)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
@ -110,14 +110,12 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
&& invalidateType.Source != this
&& !RebuildLocked)
{
Rebuild();
invalidateType = new InvalidateArgs(this, InvalidateType.Matrix);
await Rebuild();
}
else if (invalidateType.InvalidateType.HasFlag(InvalidateType.Properties)
&& invalidateType.Source == this)
{
Rebuild();
invalidateType = new InvalidateArgs(this, InvalidateType.Matrix);
await Rebuild();
}
base.OnInvalidate(invalidateType);

4
MatterControlLib/DesignTools/Operations/AlignObject3D.cs
View file

@ -443,7 +443,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}));
}
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Invalidate(InvalidateType.Matrix);
return Task.CompletedTask;
}
@ -466,7 +466,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
base.Remove(undoBuffer);
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public void UpdateControls(PublicPropertyChange change)

2
MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs
View file

@ -100,7 +100,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
});
SourceContainer.Visible = false;
rebuildLock.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});
}

2
MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
View file

@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
SourceContainer.Visible = false;
rebuildLock.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});
}

2
MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs
View file

@ -127,7 +127,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
});
SourceContainer.Visible = false;
rebuildLock.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});
}

2
MatterControlLib/DesignTools/Operations/CurveObject3D_2.cs
View file

@ -182,7 +182,7 @@ namespace MatterHackers.MatterControl.DesignTools
this.Translate(new Vector3(rotationOffset));
SourceContainer.Visible = false;
rebuildLocks.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});
}

6
MatterControlLib/DesignTools/Operations/FitToBoundsObject3D_2.cs
View file

@ -84,6 +84,10 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
fitToBounds.boundsSize.Y = aabb.YSize;
fitToBounds.boundsSize.Z = aabb.ZSize;
fitToBounds.Rebuild();
var newAabbb = fitToBounds.GetAxisAlignedBoundingBox();
fitToBounds.Translate(aabb.Center - newAabbb.Center);
PlatingHelper.PlaceMeshAtHeight(fitToBounds, aabb.MinXYZ.Z);
}
return fitToBounds;
@ -187,7 +191,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Invalidate(InvalidateType.Matrix);
return Task.CompletedTask;
}

10
MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D.cs
View file

@ -308,22 +308,20 @@ namespace MatterHackers.MatterControl.DesignTools
public override async void OnInvalidate(InvalidateArgs invalidateType)
{
this.DebugDepth("Invalidate");
if (invalidateType.InvalidateType.HasFlag(InvalidateType.Image)
&& invalidateType.Source != this
&& !RebuildLocked)
{
await Rebuild();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Path));
}
else if (invalidateType.InvalidateType.HasFlag(InvalidateType.Properties)
&& invalidateType.Source == this)
{
UpdateHistogramDisplay();
await Rebuild();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Path));
}
base.OnInvalidate(invalidateType);
}
private Color GetRGBA(byte[] buffer, int offset)
@ -384,11 +382,11 @@ namespace MatterHackers.MatterControl.DesignTools
if (propertyUpdated)
{
UpdateHistogramDisplay();
Invalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
rebuildLock.Dispose();
Invalidate(new InvalidateArgs(this, InvalidateType.Path));
Invalidate(InvalidateType.Path);
return Task.CompletedTask;
});
}

6
MatterControlLib/DesignTools/Operations/Image/LinearExtrudeObject3D.cs
View file

@ -80,7 +80,7 @@ namespace MatterHackers.MatterControl.DesignTools
undoBuffer.AddAndDo(new ReplaceCommand(new[] { this }, new[] { meshOnlyItem }));
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public LinearExtrudeObject3D()
@ -90,8 +90,6 @@ namespace MatterHackers.MatterControl.DesignTools
public override async void OnInvalidate(InvalidateArgs eventArgs)
{
this.DebugDepth("Invalidate");
if ((eventArgs.InvalidateType.HasFlag(InvalidateType.Path)
|| eventArgs.InvalidateType.HasFlag(InvalidateType.Children))
&& eventArgs.Source != this
@ -129,7 +127,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
rebuildLock.Dispose();
Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
Invalidate(InvalidateType.Mesh);
return Task.CompletedTask;
});
}

2
MatterControlLib/DesignTools/Operations/MirrorObject3D_2.cs
View file

@ -106,7 +106,7 @@ namespace MatterHackers.MatterControl.DesignTools
this.Matrix = oldMatrix;
SourceContainer.Visible = false;
rebuildLock.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});
}

6
MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs
View file

@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public override async void OnInvalidate(InvalidateArgs invalidateType)
@ -188,7 +188,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public void RemoveAllButSource()
@ -239,7 +239,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
// and select this
scene.SelectedItem = this;
this.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
this.Invalidate(InvalidateType.Children);
}
}

2
MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs
View file

@ -85,7 +85,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
InsetPath();
}
Invalidate(new InvalidateArgs(this, InvalidateType.Path));
Invalidate(InvalidateType.Path);
}
private void InsetPath()

4
MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs
View file

@ -59,8 +59,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public override async void OnInvalidate(InvalidateArgs invalidateType)
{
this.DebugDepth("Invalidate");
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Children)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Path))
@ -93,7 +91,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
DoSmoothing((long)(SmoothDistance * 1000), Iterations);
rebuildLock.Dispose();
Invalidate(new InvalidateArgs(this, InvalidateType.Path));
Invalidate(InvalidateType.Path);
return Task.CompletedTask;
});
}

2
MatterControlLib/DesignTools/Operations/RotateObject3D_2.cs
View file

@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
TransformItem.Matrix = RotationMatrix;
}
Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Invalidate(InvalidateType.Matrix);
return Task.CompletedTask;
}

4
MatterControlLib/DesignTools/Operations/ScaleObject3D.cs
View file

@ -213,7 +213,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
TransformItem.Matrix *= Matrix4X4.CreateTranslation(ScaleAbout);
}
Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Invalidate(InvalidateType.Matrix);
return Task.CompletedTask;
}
@ -259,7 +259,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
else if(change.Changed == nameof(UsePercentage))
{
// make sure we update the controls on screen to reflect the different data type
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
else if (change.Changed == nameof(MaitainProportions))
{

4
MatterControlLib/DesignTools/Operations/TransformWrapperObject3D.cs
View file

@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
list.AddRange(TransformItem.Children);
});
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public override void Remove(UndoBuffer undoBuffer)
@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
});
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public virtual void WrapItem(IObject3D item, UndoBuffer undoBuffer = null)

2
MatterControlLib/DesignTools/Operations/TranslateObject3D.cs
View file

@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
TransformItem.Matrix = Matrix4X4.CreateTranslation(Translation);
}
Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
Invalidate(InvalidateType.Matrix);
return Task.CompletedTask;
}
}

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

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

@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.Library
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Text".Localize(),
() => TextObject3D.Create())
() => TextObject3D.Create().Result)
{ DateCreated = new System.DateTime(index++) },
#if DEBUG
new GeneratorItem(

2
MatterControlLib/Library/Widgets/InsertionGroupObject3D.cs
View file

@ -147,7 +147,7 @@ namespace MatterHackers.MatterControl.Library
this.Children.Remove(placeholderItem);
this.Collapse();
this.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
this.Invalidate(InvalidateType.Children);
}));
}

4
MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs
View file

@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.DesignTools
thumbnailWidget.Image = SetImage(theme, imageObject);
column.Invalidate();
imageObject.Invalidate(new InvalidateArgs(imageObject, InvalidateType.Image));
imageObject.Invalidate(InvalidateType.Image);
};
pasteMenu.Enabled = Clipboard.Instance.ContainsImage;
@ -172,7 +172,7 @@ namespace MatterHackers.MatterControl.DesignTools
thumbnailWidget.Image = SetImage(theme, imageObject);
column.Invalidate();
imageObject.Invalidate(new InvalidateArgs(imageObject, InvalidateType.Image));
imageObject.Invalidate(InvalidateType.Image);
});
});
};

8
MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
View file

@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
/// <summary>
@ -199,7 +199,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
}
public void ResetMeshWrapperMeshes(Object3DPropertyFlags flags, CancellationToken cancellationToken)
@ -266,7 +266,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
}
Invalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
public void WrapItems(List<IObject3D> items)
@ -290,7 +290,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
this.MakeNameNonColliding();
}
Invalidate(new InvalidateArgs(this, InvalidateType.Properties));
Invalidate(InvalidateType.Properties);
}
private void AddMeshWrapperToAllChildren()

2
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs
View file

@ -173,7 +173,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
rebuildLocks.Dispose();
base.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});

2
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs
View file

@ -171,7 +171,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
}
rebuildLocks.Dispose();
base.Invalidate(new InvalidateArgs(this, InvalidateType.Children));
Invalidate(InvalidateType.Children);
return Task.CompletedTask;
});

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 41050ad01f14621325efb3b56541f6e1a3c80deb
Subproject commit 631a08ac4c78535921ea648c3e1ced1a1ba28572