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

Showing the time to the end of the print

Browse source 
Made the ratio complete be based on time
This commit is contained in:
LarsBrubaker 2019-05-12 21:00:37 -07:00 • committed by Lars Brubaker
parent fd4756708b
commit 002570d381
5 changed files with 95 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MatterControl.Printing/GCode/GCodeMemoryFile.cs
View file

@ -449,9 +449,10 @@ namespace MatterControl.Printing
public override double PercentComplete(int instructionIndex)
{
if (gCodeCommandQueue.Count > 0)
if (gCodeCommandQueue.Count > 0
&& instructionIndex < gCodeCommandQueue.Count)
{
return Math.Min(99.9, (double)instructionIndex / (double)gCodeCommandQueue.Count * 100);
return Math.Min(99.9, (gCodeCommandQueue[0].SecondsToEndFromHere - gCodeCommandQueue[instructionIndex].SecondsToEndFromHere) / gCodeCommandQueue[0].SecondsToEndFromHere * 100);
}
return 100;
@ -490,11 +491,14 @@ namespace MatterControl.Printing
endIndex = lastPrintLine;
}
int deltaFromStart = Math.Max(0, instructionIndex - startIndex);
var length = endIndex - startIndex;
if (length > 0)
if (instructionIndex < gCodeCommandQueue.Count)
{
return deltaFromStart / (double)length;
var deltaFromStart = Math.Max(0, gCodeCommandQueue[startIndex].SecondsToEndFromHere - gCodeCommandQueue[instructionIndex].SecondsToEndFromHere);
var length = gCodeCommandQueue[startIndex].SecondsToEndFromHere - gCodeCommandQueue[endIndex].SecondsToEndFromHere;
if (length > 0)
{
return deltaFromStart / length;
}
}
}