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

Added rotate object to overflow menu on IObject3Ds

Browse source 
Advance array has better defaults
All Arrays set color better
Fit to Bounds has name
Selection set better on adding to internal tree view items
Operation source visible set corectly
This commit is contained in:
Lars Brubaker 2018-06-26 15:54:05 -07:00
parent c01a090961
commit 12a64dd37e
8 changed files with 162 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
DesignTools/Operations/Object3DExtensions.cs
View file

@ -33,6 +33,7 @@ using System.Diagnostics;
using System.Linq;
using ClipperLib;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.VertexSource;
using MatterHackers.DataConverters2D;
using MatterHackers.DataConverters3D;
@ -248,12 +249,18 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
itemsToReplace,
new List<IObject3D> { newParent }));
scene.SelectedItem = newParent;
SelectModifiedItem(selectedItem, newParent, scene);
}
}
public static void WrapWith(this IObject3D originalItem, IObject3D wrapper, InteractiveScene scene)
{
// make sure we walk to the top of a mesh wrapper stack before we wrap the item (all mesh wrappers should be under the add)
while(originalItem.Parent is ModifiedMeshObject3D modifiedMesh)
{
originalItem = modifiedMesh;
}
using (originalItem.RebuildLock())
{
originalItem.Parent.Children.Modify(list =>
@ -268,10 +275,26 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
list.Add(wrapper);
});
if (scene != null)
SelectModifiedItem(originalItem, wrapper, scene);
}
}
private static void SelectModifiedItem(IObject3D originalItem, IObject3D wrapper, InteractiveScene scene)
{
if (scene != null)
{
var topParent = wrapper.Parents<IObject3D>().LastOrDefault((i) => i.Parent != null);
UiThread.RunOnIdle(() =>
{
scene.SelectedItem = wrapper;
}
var sceneSelection = topParent != null ? topParent : wrapper;
scene.SelectedItem = sceneSelection;
if (sceneSelection != originalItem)
{
// select the sub item in the tree view
//scene.SelectedItem = originalItem;
}
});
}
}