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

Revise naming

Browse source
This commit is contained in:
John Lewin 2019-03-07 18:06:01 -08:00
parent 7ae2b6f87c
commit 850c4cf5b6
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/DesignTools/Interfaces/ISelectableChildContainer.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -27,16 +27,12 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.DataConverters3D;
namespace MatterHackers.MatterControl.DesignTools
{
public interface ISelectableChildContainer
{
SelectedChildren SelectedChildren
{
get;
}
SelectedChildren SelectedChildren { get; }
}
}

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

@ -433,7 +433,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
private Dictionary<IObject3D, TreeNode> keyValues = new Dictionary<IObject3D, TreeNode>();
private Dictionary<IObject3D, TreeNode> treeNodesByObject = new Dictionary<IObject3D, TreeNode>();
private void RebuildTree()
{
@ -443,7 +443,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Top level selection only - rebuild tree
treeNodeContainer.CloseAllChildren();
keyValues.Clear();
treeNodesByObject.Clear();
foreach (var child in sceneContext.Scene.Children)
{
@ -452,7 +452,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
continue;
}
var rootNode = Object3DTreeBuilder.BuildTree(child, keyValues, theme);
var rootNode = Object3DTreeBuilder.BuildTree(child, treeNodesByObject, theme);
treeNodeContainer.AddChild(rootNode);
rootNode.TreeView = treeView;
}
@ -460,7 +460,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Ensure selectedItem is selected
var selectedItem = sceneContext.Scene.SelectedItem;
if (selectedItem != null
&& keyValues.TryGetValue(selectedItem, out TreeNode treeNode))
&& treeNodesByObject.TryGetValue(selectedItem, out TreeNode treeNode))
{
treeView.SelectedNode = treeNode;
}
@ -473,7 +473,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
bool invertIcons = ApplicationController.Instance.MenuTheme.InvertIcons;
// Build workspace actions, each having a unique ID
var actions = new []
var actions = new []
{
new NamedAction()
{
@ -1870,7 +1870,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Change tree selection to current node
if (selectedItem != null
&& keyValues.TryGetValue(selectedItem, out TreeNode treeNode))
&& treeNodesByObject.TryGetValue(selectedItem, out TreeNode treeNode))
{
treeView.SelectedNode = treeNode;
}