From 850c4cf5b6fdff9e4bc64612369ea601ea46e8cd Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 7 Mar 2019 18:06:01 -0800 Subject: [PATCH] Revise naming --- .../Interfaces/ISelectableChildContainer.cs | 8 ++------ .../PartPreviewWindow/View3D/View3DWidget.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/MatterControlLib/DesignTools/Interfaces/ISelectableChildContainer.cs b/MatterControlLib/DesignTools/Interfaces/ISelectableChildContainer.cs index 01dd356ea..02743eb57 100644 --- a/MatterControlLib/DesignTools/Interfaces/ISelectableChildContainer.cs +++ b/MatterControlLib/DesignTools/Interfaces/ISelectableChildContainer.cs @@ -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; } } } \ No newline at end of file diff --git a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs index cc8fa14ed..e2a435920 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs @@ -433,7 +433,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - private Dictionary keyValues = new Dictionary(); + private Dictionary treeNodesByObject = new Dictionary(); 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; }