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

Set layer drawing (sync to print) from instruction index rather than time

Browse source
This commit is contained in:
LarsBrubaker 2019-05-19 20:10:28 -07:00
parent 165726064b
commit bc96467792
6 changed files with 78 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -463,7 +463,7 @@ namespace MatterControl.Printing
return 100;
}
public override double Ratio0to1IntoContainedLayer(int instructionIndex)
public override double Ratio0to1IntoContainedLayerSeconds(int instructionIndex)
{
int currentLayer = GetLayerIndex(instructionIndex);
@ -510,6 +510,50 @@ namespace MatterControl.Printing
return 1;
}
public override double Ratio0to1IntoContainedLayerInstruction(int instructionIndex)
{
int currentLayer = GetLayerIndex(instructionIndex);
if (currentLayer > -1)
{
int startIndex = IndexOfLayerStart[currentLayer];
int endIndex = LineCount - 1;
if (currentLayer < LayerCount - 1)
{
endIndex = IndexOfLayerStart[currentLayer + 1];
}
else
{
// Improved last layer percent complete - seek endIndex to 'MatterSlice Completed' line, otherwise leave at LineCount - 1
if (lastPrintLine == -1)
{
lastPrintLine = instructionIndex;
string line;
do
{
line = gCodeCommandQueue[Math.Min(gCodeCommandQueue.Count - 1, lastPrintLine)].Line;
lastPrintLine++;
}
while (line != "; MatterSlice Completed Successfully"
&& lastPrintLine < endIndex);
}
endIndex = lastPrintLine;
}
int deltaFromStart = Math.Max(0, instructionIndex - startIndex);
var length = endIndex - startIndex;
if (length > 0)
{
return deltaFromStart / (double)length;
}
}
return 1;
}
public void Save(string dest)
{
using (var file = new StreamWriter(dest))