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

Improving rebuild lock

Browse source
This commit is contained in:
Lars Brubaker 2019-01-07 17:42:00 -08:00
parent 4c6db60ec6
commit 88dd2395a1
5 changed files with 121 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,51 +82,53 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public virtual void WrapItem(IObject3D item, UndoBuffer undoBuffer = null)
{
var locks = item.RebuilLockAll();
if(item.Parent != null)
using (item.RebuilLockAll())
{
locks.Add(item.Parent.RebuildLock());
}
if (item is SelectionGroupObject3D)
{
throw new Exception("The selection should have been cleared before you wrap this item");
}
while(item.Parent is ModifiedMeshObject3D)
{
item = item.Parent;
}
// if the items we are replacing ar already in a list
if (item.Parent != null)
{
var replaceItems = new List<IObject3D> { item };
IObject3D itemClone = item.Clone();
var firstChild = new Object3D();
this.Children.Add(firstChild);
firstChild.Children.Add(itemClone);
var replace = new ReplaceCommand(replaceItems, new List<IObject3D> { this });
if (undoBuffer != null)
RebuildLock parentLock = null;
if (item.Parent != null)
{
undoBuffer.AddAndDo(replace);
parentLock = item.Parent.RebuildLock();
}
else
{
replace.Do();
}
}
else // just add them
{
var firstChild = new Object3D();
firstChild.Children.Add(item);
this.Children.Add(firstChild);
}
locks.ResumeAll();
if (item is SelectionGroupObject3D)
{
throw new Exception("The selection should have been cleared before you wrap this item");
}
while (item.Parent is ModifiedMeshObject3D)
{
item = item.Parent;
}
// if the items we are replacing ar already in a list
if (item.Parent != null)
{
var replaceItems = new List<IObject3D> { item };
IObject3D itemClone = item.Clone();
var firstChild = new Object3D();
this.Children.Add(firstChild);
firstChild.Children.Add(itemClone);
var replace = new ReplaceCommand(replaceItems, new List<IObject3D> { this });
if (undoBuffer != null)
{
undoBuffer.AddAndDo(replace);
}
else
{
replace.Do();
}
}
else // just add them
{
var firstChild = new Object3D();
firstChild.Children.Add(item);
this.Children.Add(firstChild);
}
parentLock?.Dispose();
}
}
public override void Flatten(UndoBuffer undoBuffer)