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

Improving travel retractions rendering

Browse source
This commit is contained in:
Lars Brubaker 2021-09-10 17:51:46 -07:00
parent 54fdca9a07
commit 83e083fcd6
4 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
View file

@ -55,6 +55,7 @@ namespace MatterHackers.GCodeVisualizer
public static double ExtruderWidth { get; set; } = .4;
public static Color TravelColor = Color.Green;
public static Color RetractionColor = Color.FireEngineRed;
internal class Layer
{
@ -149,6 +150,9 @@ namespace MatterHackers.GCodeVisualizer
}
else
{
var extrusionAmount = currentInstruction.EPosition - previousInstruction.EPosition;
var filamentDiameterMm = gCodeFileToDraw.GetFilamentDiameter();
if (gCodeFileToDraw.IsExtruding(instructionIndex))
{
double layerThickness = gCodeFileToDraw.GetLayerHeight(layerToCreate);
@ -161,21 +165,32 @@ namespace MatterHackers.GCodeVisualizer
currentInstruction.Position,
currentInstruction.ToolIndex,
currentInstruction.FeedRate,
currentInstruction.EPosition - previousInstruction.EPosition,
gCodeFileToDraw.GetFilamentDiameter(),
extrusionAmount,
filamentDiameterMm,
layerThickness,
extrusionColor,
this.Gray));
}
else
{
if (extrusionAmount < 0)
{
double moveLength = (currentInstruction.Position - previousInstruction.Position).Length;
double filamentRadius = filamentDiameterMm / 2;
double areaSquareMm = (filamentRadius * filamentRadius) * Math.PI;
var extrusionVolumeMm3 = (float)(areaSquareMm * extrusionAmount);
var area = extrusionVolumeMm3 / moveLength;
}
renderFeaturesForLayer.Add(
new RenderFeatureTravel(
instructionIndex,
previousInstruction.Position,
currentInstruction.Position,
currentInstruction.ToolIndex,
currentInstruction.FeedRate));
currentInstruction.FeedRate,
extrusionAmount < 0));
}
}
}