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

Switch to indicating highlight, allow feature to determine highlight

Browse source
This commit is contained in:
John Lewin 2019-02-22 07:41:14 -08:00
parent 1e965fc2e7
commit 2832f1f912
5 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureExtrusion.cs
View file

@ -108,7 +108,7 @@ namespace MatterHackers.GCodeVisualizer
}
}
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo, Color overrideColor = default(Color))
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo, bool highlightFeature = false)
{
if (renderInfo.CurrentRenderType.HasFlag(RenderType.Extrusions))
{
@ -116,9 +116,9 @@ namespace MatterHackers.GCodeVisualizer
Color extrusionColor = Color.Black;
if (overrideColor != default(Color))
if (highlightFeature)
{
extrusionColor = overrideColor;
extrusionColor = RenderFeatureBase.HighlightColor;
}
else if (renderInfo.CurrentRenderType.HasFlag(RenderType.SpeedColors))
{
@ -147,7 +147,14 @@ namespace MatterHackers.GCodeVisualizer
var endPoint = new Vector2(end.X, end.Y);
renderInfo.Transform.transform(ref endPoint);
graphics2DGl.DrawAALineRounded(startPoint, endPoint, extrusionLineWidths / 2, extrusionColor);
var eWidth = extrusionLineWidths / 2;
graphics2DGl.DrawAALineRounded(startPoint, endPoint, eWidth, extrusionColor);
if (highlightFeature)
{
Render3DStartEndMarkers(graphics2DGl, eWidth / 2, startPoint, endPoint);
}
}
else
{