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

Convert ActiveSliceSettings usage from static to local references

Browse source
This commit is contained in:
John Lewin 2017-09-17 01:11:18 -07:00
parent e926b747cf
commit 294df0a588
27 changed files with 205 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

14
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -53,15 +53,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private string fileTooBigToLoad = "GCode file too big to preview ({0}).".Localize();
private BedConfig sceneContext;
private PrinterConfig printer;
private ViewControls3D viewControls3D;
public ViewGcodeBasic(BedConfig sceneContext, ViewControls3D viewControls3D)
public ViewGcodeBasic(PrinterConfig printer, BedConfig sceneContext, ViewControls3D viewControls3D)
{
this.printer = printer;
this.sceneContext = sceneContext;
this.viewControls3D = viewControls3D;
CreateAndAddChildren();
CreateAndAddChildren(printer);
ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) =>
{
@ -69,16 +71,16 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
if (stringEvent.Data == "extruder_offset")
{
sceneContext.GCodeRenderer?.Clear3DGCode();
printer.Bed.GCodeRenderer?.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) => sceneContext.GCodeRenderer?.Clear3DGCode(), ref unregisterEvents);
ApplicationController.Instance.AdvancedControlsPanelReloading.RegisterEvent((s, e) => printer.Bed.GCodeRenderer?.Clear3DGCode(), ref unregisterEvents);
}
internal void CreateAndAddChildren()
internal void CreateAndAddChildren(PrinterConfig printer)
{
CloseAllChildren();
@ -123,7 +125,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
AddChild(gradientWidget);
var gcodeDetails = new GCodeDetails(sceneContext.LoadedGCode);
var gcodeDetails = new GCodeDetails(printer, printer.Bed.LoadedGCode);
this.AddChild(new GCodeDetailsView(gcodeDetails)
{