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

Improve GCode/Model view toggling

Browse source 
- Switch models to Wireframe while in GCode view
- Conditionally render layers data on visibility of GCode widget
- Short term: Clear Scene selection on entering GCode view
- Use consistent formatting for GCodeRenderInfo constructor
This commit is contained in:
John Lewin 2017-06-26 09:45:31 -07:00
parent c17b06d3d0
commit b7c457309e
6 changed files with 46 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -354,21 +354,26 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void TrackballTumbleWidget_DrawGlContent(object sender, EventArgs e)
{
if (loadedGCode == null || printer.BedPlate.GCodeRenderer == null)
if (loadedGCode == null || printer.BedPlate.GCodeRenderer == null || !this.Visible)
{
return;
}
GCodeRenderer.ExtrusionColor = ActiveTheme.Instance.PrimaryAccentColor;
GCodeRenderInfo renderInfo = new GCodeRenderInfo(0,
var renderInfo = new GCodeRenderInfo(
0,
Math.Min(gcode2DWidget.ActiveLayerIndex + 1, loadedGCode.NumChangesInZ),
gcode2DWidget.TotalTransform,
1,
GetRenderType(),
gcode2DWidget.FeatureToStartOnRatio0To1,
gcode2DWidget.FeatureToEndOnRatio0To1,
new Vector2[] { ActiveSliceSettings.Instance.Helpers.ExtruderOffset(0), ActiveSliceSettings.Instance.Helpers.ExtruderOffset(1) },
new Vector2[]
{
ActiveSliceSettings.Instance.Helpers.ExtruderOffset(0),
ActiveSliceSettings.Instance.Helpers.ExtruderOffset(1)
},
MeshViewerWidget.GetMaterialColor);
printer.BedPlate.GCodeRenderer.Render3D(renderInfo);