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

Remove InteractiveScene from TreeView

Browse source
This commit is contained in:
John Lewin 2018-10-26 16:56:23 -07:00
parent a3ecdf0f07
commit 243adb9964
2 changed files with 60 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControlLib/Library/Providers/GraphConfig.cs
View file

@ -32,7 +32,6 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.Platform;
using MatterHackers.DataConverters3D;
namespace MatterHackers.MatterControl.Library
@ -58,8 +57,6 @@ namespace MatterHackers.MatterControl.Library
public GraphConfig(ApplicationController applicationController)
{
this.applicationController = applicationController;
applicationController.Thumbnails.OperationIcons.Add(typeof(InteractiveScene), () => AggContext.StaticData.LoadIcon("cube.png", 16, 16, ApplicationController.Instance.Theme.InvertIcons));
}
public void RegisterOperation(Type type, Type resultType, string title, Func<IObject3D, InteractiveScene, Task> operation, Func<IObject3D, bool> isEnabled = null, Func<IObject3D, bool> isVisible = null, Func<ThemeConfig, ImageBuffer> iconCollector = null)

71
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -176,7 +176,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// add the tree view
treeView = new TreeView(theme)
{
Margin = new BorderDouble(left: theme.DefaultContainerPadding, top: theme.DefaultContainerPadding),
Margin = new BorderDouble(left: theme.DefaultContainerPadding + 12),
};
treeView.AfterSelect += (s, e) =>
{
@ -222,6 +222,16 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
};
treeView.ScrollArea.HAnchor = HAnchor.Stretch;
treeNodeContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Margin = new BorderDouble(12, 3)
};
treeView.AddChild(treeNodeContainer);
var historyAndProperties = new Splitter()
{
Orientation = Orientation.Horizontal,
@ -234,7 +244,39 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
modelViewSidePanel.AddChild(historyAndProperties);
historyAndProperties.Panel1.AddChild(treeView);
var titleAndTreeView = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch
};
titleAndTreeView.AddChild(workspaceName = new InlineStringEdit(sceneContext.Scene.Name ?? "", theme, "WorkspaceName")
{
Border = new BorderDouble(top: 1),
BorderColor = theme.SplitterBackground
});
titleAndTreeView.AddChild(treeView);
workspaceName.ActionArea.AddChild(
new IconButton(AggContext.StaticData.LoadIcon("fa-angle-right_12.png", theme.InvertIcons), theme)
{
Enabled = false
},
indexInChildrenList: 0);
// Remove left margin
workspaceName.ActionArea.Children<TextWidget>().First().Margin = 0;
// Resize buttons
foreach (var iconButton in workspaceName.Descendants<IconButton>())
{
iconButton.Height = 26;
iconButton.Width = 26;
}
workspaceName.Margin = workspaceName.Margin.Clone(bottom: 0);
historyAndProperties.Panel1.AddChild(titleAndTreeView);
historyAndProperties.DistanceChanged += (s, e) =>
{
@ -339,20 +381,25 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void RebuildTree()
{
workspaceName.Text = sceneContext.Scene.Name ?? "";
// Top level selection only - rebuild tree
treeView.ScrollArea.CloseAllChildren();
treeNodeContainer.CloseAllChildren();
keyValues.Clear();
var rootNode = Object3DTreeBuilder.BuildTree(this.Scene, keyValues, theme);
treeView.AddChild(rootNode);
rootNode.TreeView = treeView;
if (this.Parent != null)
foreach (var child in sceneContext.Scene.Children)
{
assigningTreeNode = true;
treeView.SelectedNode = rootNode;
assigningTreeNode = false;
var rootNode = Object3DTreeBuilder.BuildTree(child, keyValues, theme);
treeNodeContainer.AddChild(rootNode);
rootNode.TreeView = treeView;
if (this.Parent != null)
{
assigningTreeNode = true;
treeView.SelectedNode = rootNode;
assigningTreeNode = false;
}
}
}
@ -1820,6 +1867,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public MeshViewerWidget meshViewerWidget;
private bool assigningTreeNode;
private FlowLayoutWidget treeNodeContainer;
private InlineStringEdit workspaceName;
public InteractiveScene Scene => sceneContext.Scene;