From f342b3606fbad58f41d37546f694bdc1604fd7fe Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sat, 9 Jun 2018 09:26:37 -0700 Subject: [PATCH] Remove View3DWidget from IPropertyGridModifier - Issue MatterHackers/MCCentral#3565 Consider IObject3D couplings to MatterControl assembly --- DesignTools/Interfaces/IPropertyGridModifier.cs | 1 - DesignTools/PublicPropertyEditor.cs | 15 +++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/DesignTools/Interfaces/IPropertyGridModifier.cs b/DesignTools/Interfaces/IPropertyGridModifier.cs index 026d948fe..1e5156d7d 100644 --- a/DesignTools/Interfaces/IPropertyGridModifier.cs +++ b/DesignTools/Interfaces/IPropertyGridModifier.cs @@ -37,7 +37,6 @@ namespace MatterHackers.MatterControl.DesignTools public class PPEContext { public IObject3D item { get; set; } - public View3DWidget view3DWidget { get; set; } public Dictionary editRows { get; private set; } = new Dictionary(); public GuiWidget GetEditRow(string propertyName) diff --git a/DesignTools/PublicPropertyEditor.cs b/DesignTools/PublicPropertyEditor.cs index a4c60824c..bbe0234a6 100644 --- a/DesignTools/PublicPropertyEditor.cs +++ b/DesignTools/PublicPropertyEditor.cs @@ -107,12 +107,6 @@ namespace MatterHackers.MatterControl.DesignTools public GuiWidget Create(IObject3D item, View3DWidget view3DWidget, ThemeConfig theme) { - var context = new PPEContext() - { - view3DWidget = view3DWidget, - item = item - }; - var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom) { HAnchor = HAnchor.Stretch @@ -127,9 +121,14 @@ namespace MatterHackers.MatterControl.DesignTools }; } - if (context.item != null) + if (item != null) { - // CreateEditor(context, view3DWidget, mainContainer, theme); + var context = new PPEContext() + { + item = item + }; + + // CreateEditor var undoBuffer = view3DWidget.sceneContext.Scene.UndoBuffer; AddWebPageLinkIfRequired(context, mainContainer, theme);