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

Make View3DWidget.Scene private

Browse source
This commit is contained in:
John Lewin 2017-09-16 01:11:44 -07:00
parent 158bb31cb7
commit af38676244
22 changed files with 195 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TextCreator/Braille/BrailleEditor.cs
View file

@ -37,6 +37,7 @@ using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MeshVisualizer;
using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
@ -57,7 +58,9 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
public GuiWidget Create(IObject3D item, View3DWidget parentView3D, ThemeConfig theme)
{
injectedItem = parentView3D.Scene?.SelectedItem as TextObject;
var scene = parentView3D.InteractionLayer.Scene;
injectedItem = scene?.SelectedItem as TextObject;
brailleGenerator = new BrailleGenerator();
this.view3DWidget = parentView3D;
@ -152,7 +155,8 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
injectedItem.Text);
});
view3DWidget.Scene.ModifyChildren(children =>
var scene = view3DWidget.InteractionLayer.Scene;
scene.ModifyChildren(children =>
{
// Find the injected item
var item = children.Find(child => child == injectedItem);
@ -171,7 +175,9 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
private void RebuildBase()
{
if (view3DWidget.Scene.HasChildren() && injectedItem != null)
var scene = view3DWidget.InteractionLayer.Scene;
if (scene.HasChildren() && injectedItem != null)
{
var newBaseplate = brailleGenerator.CreateBaseplate(injectedItem);
if(newBaseplate == null)
@ -180,7 +186,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
}
// Remove the old base and create and add a new one
view3DWidget.Scene.ModifyChildren(children =>
scene.ModifyChildren(children =>
{
children.RemoveAll(child => child is BraileBasePlate);
children.Add(newBaseplate);