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

Add support for color overrides

Browse source
This commit is contained in:
John Lewin 2019-02-22 07:11:27 -08:00
parent 4f7d46aa13
commit 1e965fc2e7
4 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureBase.cs
View file

@ -36,7 +36,7 @@ namespace MatterHackers.GCodeVisualizer
{
protected int extruderIndex;
public abstract void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo);
public abstract void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo, Color overrideColor = default(Color));
public abstract void CreateRender3DData(VectorPOD<ColorVertexData> colorVertexData, VectorPOD<int> indexData, GCodeRenderInfo renderInfo);

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

@ -108,7 +108,7 @@ namespace MatterHackers.GCodeVisualizer
}
}
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo)
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo, Color overrideColor = default(Color))
{
if (renderInfo.CurrentRenderType.HasFlag(RenderType.Extrusions))
{
@ -116,7 +116,11 @@ namespace MatterHackers.GCodeVisualizer
Color extrusionColor = Color.Black;
if (renderInfo.CurrentRenderType.HasFlag(RenderType.SpeedColors))
if (overrideColor != default(Color))
{
extrusionColor = overrideColor;
}
else if (renderInfo.CurrentRenderType.HasFlag(RenderType.SpeedColors))
{
extrusionColor = color;
}

35
MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureRetract.cs
View file

@ -1,10 +1,5 @@
using MatterHackers.Agg;
using MatterHackers.Agg.VertexSource;
using MatterHackers.RenderOpenGl;
using MatterHackers.VectorMath;
/*
Copyright (c) 2014, Lars Brubaker
/*
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -33,6 +28,10 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using MatterHackers.Agg;
using MatterHackers.Agg.VertexSource;
using MatterHackers.RenderOpenGl;
using MatterHackers.VectorMath;
namespace MatterHackers.GCodeVisualizer
{
@ -66,7 +65,7 @@ namespace MatterHackers.GCodeVisualizer
{
if ((renderInfo.CurrentRenderType & RenderType.Retractions) == RenderType.Retractions)
{
Vector3 position = new Vector3(this.position);
var position = new Vector3(this.position);
// retract and unretract are the extruder color
Color color = renderInfo.GetMaterialColor(extruderIndex);
@ -95,31 +94,37 @@ namespace MatterHackers.GCodeVisualizer
}
}
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo)
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo, Color overrideColor = default(Color))
{
if ((renderInfo.CurrentRenderType & RenderType.Retractions) == RenderType.Retractions)
{
double radius = Radius(renderInfo.LayerScale);
Vector2 position = new Vector2(this.position.X, this.position.Y);
var position = new Vector2(this.position.X, this.position.Y);
renderInfo.Transform.transform(ref position);
Color retractionColor = new Color(Color.Red, 200);
if (extrusionAmount > 0)
var retractionColor = new Color(Color.Red, 200);
if (overrideColor != default(Color))
{
retractionColor = overrideColor;
}
else if (extrusionAmount > 0)
{
// unretraction
retractionColor = new Color(Color.Blue, 200);
}
// render the part using opengl
if (graphics2D is Graphics2DOpenGL graphics2DGl)
{
// render using opengl
graphics2DGl.DrawAACircle(position, radius, retractionColor);
}
else
{
Ellipse extrusion = new Ellipse(position, radius);
graphics2D.Render(extrusion, retractionColor);
// render using agg
graphics2D.Render(
new Ellipse(position, radius),
retractionColor);
}
}
}

7
MatterControl.OpenGL/GCodeRenderer/RenderFeatures/RenderFeatureTravel.cs
View file

@ -62,13 +62,18 @@ namespace MatterHackers.GCodeVisualizer
}
}
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo)
public override void Render(Graphics2D graphics2D, GCodeRenderInfo renderInfo, Color overrideColor = default(Color))
{
if ((renderInfo.CurrentRenderType & RenderType.Moves) == RenderType.Moves)
{
double movementLineWidth = 0.35 * renderInfo.LayerScale;
var movementColor = new Color(10, 190, 15);
if (overrideColor != default(Color))
{
movementColor = overrideColor;
}
if (graphics2D is Graphics2DOpenGL graphics2DGl)
{
// render using opengl