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

Eliminate PrinterConnection.Instance

Browse source
This commit is contained in:
John Lewin 2017-09-17 21:08:16 -07:00
parent 928fed9efe
commit 76e7af0436
26 changed files with 265 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

8
History/PrintHistoryData.cs
View file

@ -80,10 +80,10 @@ namespace MatterHackers.MatterControl.PrintHistory
{
UiThread.RunOnIdle(() =>
{
if (PrinterConnection.Instance.CommunicationState == CommunicationStates.Connected)
if (ApplicationController.Instance.ActivePrinter.Connection.CommunicationState == CommunicationStates.Connected)
{
PrinterConnection.Instance.CommunicationState = CommunicationStates.PreparingToPrint;
PrinterConnection.Instance.StartPrint(lastPrintTask.PrintingGCodeFileName, lastPrintTask);
ApplicationController.Instance.ActivePrinter.Connection.CommunicationState = CommunicationStates.PreparingToPrint;
ApplicationController.Instance.ActivePrinter.Connection.StartPrint(lastPrintTask.PrintingGCodeFileName, lastPrintTask);
}
});
}
@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl.PrintHistory
if (instance == null)
{
instance = new PrintHistoryData();
PrinterConnection.Instance.ConnectionSucceeded.RegisterEvent((s, e) =>
ApplicationController.Instance.ActivePrinter.Connection.ConnectionSucceeded.RegisterEvent((s, e) =>
{
UiThread.RunOnIdle(PrintRecovery.CheckIfNeedToRecoverPrint);
}, ref unregisterEvents);