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

Turned the 3d view render options into radio buttons.

Browse source 
Made the 2D gcode view able to show speed and extrusion simulation.
Made the 3D gcode view able to turn off speed and extrusion simulation.
This commit is contained in:
larsbrubaker 2014-08-18 11:02:00 -07:00
parent 66e0fb3b4d
commit f202a3336f
3 changed files with 97 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

36
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -251,6 +251,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
renderType |= RenderType.Retractions;
}
if (gcodeViewWidget.RenderSpeeds)
{
renderType |= RenderType.SpeedColors;
}
if (gcodeViewWidget.SimulateExtrusion)
{
renderType |= RenderType.SimulateExtrusion;
}
GCodeRenderer.ExtrusionColor = ActiveTheme.Instance.PrimaryAccentColor;
gcodeViewWidget.gCodeRenderer.Render3D(0, Math.Min(gcodeViewWidget.ActiveLayerIndex + 1, gcodeViewWidget.LoadedGCode.NumChangesInZ), gcodeViewWidget.TotalTransform, 1, renderType,
@ -445,7 +453,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in a show grid check box
{
CheckBox showGrid = new CheckBox(LocalizedString.Get("Show Grid"), textColor: ActiveTheme.Instance.PrimaryTextColor);
CheckBox showGrid = new CheckBox(LocalizedString.Get("Grid"), textColor: ActiveTheme.Instance.PrimaryTextColor);
showGrid.Checked = gcodeViewWidget.RenderGrid;
meshViewerWidget.RenderBed = showGrid.Checked;
showGrid.CheckedStateChanged += (sender, e) =>
@ -458,7 +466,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in a show moves checkbox
{
CheckBox showMoves = new CheckBox(LocalizedString.Get("Show Moves"), textColor: ActiveTheme.Instance.PrimaryTextColor);
CheckBox showMoves = new CheckBox(LocalizedString.Get("Moves"), textColor: ActiveTheme.Instance.PrimaryTextColor);
showMoves.Checked = gcodeViewWidget.RenderMoves;
showMoves.CheckedStateChanged += (sender, e) =>
{
@ -469,7 +477,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in a show Retractions checkbox
{
CheckBox showRetractions = new CheckBox(LocalizedString.Get("Show Retractions"), textColor: ActiveTheme.Instance.PrimaryTextColor);
CheckBox showRetractions = new CheckBox(LocalizedString.Get("Retractions"), textColor: ActiveTheme.Instance.PrimaryTextColor);
showRetractions.Checked = gcodeViewWidget.RenderRetractions;
showRetractions.CheckedStateChanged += (sender, e) =>
{
@ -478,6 +486,28 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
layerInfoContainer.AddChild(showRetractions);
}
// put in a show speed checkbox
{
CheckBox showSpeeds = new CheckBox(LocalizedString.Get("Speeds"), textColor: ActiveTheme.Instance.PrimaryTextColor);
showSpeeds.Checked = gcodeViewWidget.RenderSpeeds;
showSpeeds.CheckedStateChanged += (sender, e) =>
{
gcodeViewWidget.RenderSpeeds = showSpeeds.Checked;
};
layerInfoContainer.AddChild(showSpeeds);
}
// put in a simulate extrusion checkbox
{
CheckBox simulateExtrusion = new CheckBox(LocalizedString.Get("Amount"), textColor: ActiveTheme.Instance.PrimaryTextColor);
simulateExtrusion.Checked = gcodeViewWidget.SimulateExtrusion;
simulateExtrusion.CheckedStateChanged += (sender, e) =>
{
gcodeViewWidget.SimulateExtrusion = simulateExtrusion.Checked;
};
layerInfoContainer.AddChild(simulateExtrusion);
}
// put in a show 3D view checkbox
{
viewControlsToggle.twoDimensionButton.CheckedStateChanged += (sender, e) =>