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

Remove widget proxy to Clear3DGCode, call directly on model

Browse source
This commit is contained in:
John Lewin 2017-06-24 10:45:02 -07:00
parent 8b3bc325cd
commit 1339f7573f
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -112,7 +112,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
CreateAndAddChildren();
ActiveSliceSettings.SettingChanged.RegisterEvent(CheckSettingChanged, ref unregisterEvents);
ApplicationController.Instance.AdvancedControlsPanelReloading.RegisterEvent((s, e) => gcodeViewWidget?.Clear3DGCode(), ref unregisterEvents);
// TODO: Why do we clear GCode on AdvancedControlsPanelReloading - assume some slice settings should invalidate. If so, code should be more specific and bound to slice settings changed
ApplicationController.Instance.AdvancedControlsPanelReloading.RegisterEvent((s, e) => printer.BedPlate.GCodeRenderer?.Clear3DGCode(), ref unregisterEvents);
}
private GCodeFile loadedGCode => printer.BedPlate.LoadedGCode;
@ -154,7 +156,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
else if (stringEvent.Data == "extruder_offset")
{
gcodeViewWidget.Clear3DGCode();
printer.BedPlate.GCodeRenderer.Clear3DGCode();
}
}
}

16
PartPreviewWindow/ViewGcodeWidget.cs
View file

@ -133,9 +133,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.progressReporter = progressReporter;
this.gridSizeMm = gridSizeMm;
this.gridCenterMm = gridCenterMm;
LocalBounds = new RectangleDouble(0, 0, 100, 100);
//DoubleBuffer = true;
AnchorAll();
this.LocalBounds = new RectangleDouble(0, 0, 100, 100);
this.AnchorAll();
}
private void SetInitalLayer()
@ -173,16 +173,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
internal void Clear3DGCode()
{
var renderer = printer.BedPlate.GCodeRenderer;
if (renderer != null)
{
renderer.Clear3DGCode();
this.Invalidate();
}
}
private PathStorage grid = new PathStorage();
static RGBA_Bytes gridColor = new RGBA_Bytes(190, 190, 190, 255);