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

Decouple MatterControl components from PrinterConnection

Browse source 
- Move relevant aspects to ApplicationController
This commit is contained in:
John Lewin 2017-06-16 18:04:47 -07:00
parent d07173285c
commit 8afc92ae33
21 changed files with 297 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ActionBar/TouchScreenPrintStatusRow.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.ActionBar
AddChildElements();
PrinterConnection.Instance.ActivePrintItemChanged.RegisterEvent((s, e) =>
ApplicationController.Instance.ActivePrintItemChanged.RegisterEvent((s, e) =>
{
UpdatePrintItemName();
UpdatePrintStatus();
@ -80,7 +80,7 @@ namespace MatterHackers.MatterControl.ActionBar
UpdatePrintStatus();
}, ref unregisterEvents);
PrinterConnection.Instance.ActivePrintItemChanged.RegisterEvent(onActivePrintItemChanged, ref unregisterEvents);
ApplicationController.Instance.ActivePrintItemChanged.RegisterEvent(onActivePrintItemChanged, ref unregisterEvents);
onActivePrintItemChanged(null, null);
}
@ -245,7 +245,7 @@ namespace MatterHackers.MatterControl.ActionBar
activePrintPreviewImage.ItemWrapper.SlicingOutputMessage -= PrintItem_SlicingOutputMessage;
}
activePrintPreviewImage.ItemWrapper = PrinterConnection.Instance.ActivePrintItem;
activePrintPreviewImage.ItemWrapper = ApplicationController.Instance.ActivePrintItem;
// then hook up our new part
if (activePrintPreviewImage.ItemWrapper != null)
@ -291,9 +291,9 @@ namespace MatterHackers.MatterControl.ActionBar
private void UpdatePrintItemName()
{
if (PrinterConnection.Instance.ActivePrintItem != null)
if (ApplicationController.Instance.ActivePrintItem != null)
{
this.activePrintName.Text = PrinterConnection.Instance.ActivePrintItem.GetFriendlyName();
this.activePrintName.Text = ApplicationController.Instance.ActivePrintItem.GetFriendlyName();
}
else
{
@ -303,7 +303,7 @@ namespace MatterHackers.MatterControl.ActionBar
private void UpdatePrintStatus()
{
if (PrinterConnection.Instance.ActivePrintItem != null)
if (ApplicationController.Instance.ActivePrintItem != null)
{
int totalSecondsInPrint = PrinterConnection.Instance.TotalSecondsInPrint;