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

Made more tests pass

Browse source 
deleted unused print status row
Made printer connection only have one status message output
Made sure the ApplicationTemDataPath is right for tests
Refactoring
This commit is contained in:
Lars Brubaker 2017-08-30 10:37:44 -07:00
parent f51768d89f
commit 293fd3ff12
11 changed files with 64 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

53
PrinterCommunication/PrinterConnection.cs
View file

@ -651,7 +651,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
}
}
public string PrinterConnectionStatusVerbose
public string PrinterConnectionStatus
{
get
{
@ -679,7 +679,21 @@ namespace MatterHackers.MatterControl.PrinterCommunication
return "Preparing To Print".Localize();
case CommunicationStates.Printing:
return "Printing".Localize();
switch (DetailedPrintingState)
{
case DetailedPrintingState.HomingAxis:
return "Homing".Localize();
case DetailedPrintingState.HeatingBed:
return "Waiting for Bed to Heat to".Localize() + $" {TargetBedTemperature}°";
case DetailedPrintingState.HeatingExtruder:
return "Waiting for Extruder to Heat to".Localize() + $" {GetTargetExtruderTemperature(0)}°";
case DetailedPrintingState.Printing:
default:
return "Printing".Localize();
}
case CommunicationStates.PrintingFromSd:
return "Printing From SD Card".Localize();
@ -758,7 +772,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
}
}
public DetailedPrintingState PrintingState
public DetailedPrintingState DetailedPrintingState
{
get
{
@ -775,30 +789,6 @@ namespace MatterHackers.MatterControl.PrinterCommunication
}
}
public string PrintingStateString
{
get
{
switch (PrintingState)
{
case DetailedPrintingState.HomingAxis:
return "Homing Axis".Localize();
case DetailedPrintingState.HeatingBed:
return "Waiting for Bed to Heat to".Localize() + $" {TargetBedTemperature}°";
case DetailedPrintingState.HeatingExtruder:
return "Waiting for Extruder to Heat to".Localize() + $" {GetTargetExtruderTemperature(0)}°";
case DetailedPrintingState.Printing:
return "Currently Printing".Localize() + ":";
default:
return "";
}
}
}
public bool PrintIsActive
{
get
@ -1257,6 +1247,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
public void OnCommunicationStateChanged(EventArgs e)
{
CommunicationStateChanged.CallEvents(this, e);
PrintingStateChanged.CallEvents(this, null);
#if __ANDROID__
//Path to the printer output file
@ -2467,19 +2458,19 @@ namespace MatterHackers.MatterControl.PrinterCommunication
{
if (lineBeingSetToPrinter.StartsWith("G28"))
{
PrintingState = DetailedPrintingState.HomingAxis;
DetailedPrintingState = DetailedPrintingState.HomingAxis;
}
else if (waitForTempStream6?.HeatingBed ?? false)
{
PrintingState = DetailedPrintingState.HeatingBed;
DetailedPrintingState = DetailedPrintingState.HeatingBed;
}
else if (waitForTempStream6?.HeatingExtruder ?? false)
{
PrintingState = DetailedPrintingState.HeatingExtruder;
DetailedPrintingState = DetailedPrintingState.HeatingExtruder;
}
else
{
PrintingState = DetailedPrintingState.Printing;
DetailedPrintingState = DetailedPrintingState.Printing;
}
}