From 2dfe25c9ee0b31b1382736fdc1eb5f5cf4a07de2 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 28 Jun 2017 19:01:21 -0700 Subject: [PATCH] Use auto properties --- .../GCodeRenderer/GCodeRenderInfo.cs | 42 +++++++------------ .../GCodeRenderer/GCodeRenderer.cs | 2 +- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderInfo.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderInfo.cs index 387ba9271..f8546087d 100644 --- a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderInfo.cs +++ b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderInfo.cs @@ -51,33 +51,19 @@ namespace MatterHackers.GCodeVisualizer public Func GetMaterialColor { get; } - public int startLayerIndex; + public int StartLayerIndex { get; set; } - public int StartLayerIndex { get { return startLayerIndex; } } + public int EndLayerIndex { get; } - private int endLayerIndex; + public Affine Transform { get; } - public int EndLayerIndex { get { return endLayerIndex; } } + public double LayerScale { get; } - private Affine transform; + public RenderType CurrentRenderType { get; } - public Affine Transform { get { return transform; } } + public double FeatureToStartOnRatio0To1 { get; } - private double layerScale; - - public double LayerScale { get { return layerScale; } } - - private RenderType currentRenderType; - - public RenderType CurrentRenderType { get { return currentRenderType; } } - - private double featureToStartOnRatio0To1; - - public double FeatureToStartOnRatio0To1 { get { return featureToStartOnRatio0To1; } } - - private double featureToEndOnRatio0To1; - - public double FeatureToEndOnRatio0To1 { get { return featureToEndOnRatio0To1; } } + public double FeatureToEndOnRatio0To1 { get; } public GCodeRenderInfo() { @@ -90,13 +76,13 @@ namespace MatterHackers.GCodeVisualizer Func getMaterialColor) { this.GetMaterialColor = getMaterialColor; - this.startLayerIndex = startLayerIndex; - this.endLayerIndex = endLayerIndex; - this.transform = transform; - this.layerScale = layerScale; - this.currentRenderType = renderType; - this.featureToStartOnRatio0To1 = featureToStartOnRatio0To1; - this.featureToEndOnRatio0To1 = featureToEndOnRatio0To1; + this.StartLayerIndex = startLayerIndex; + this.EndLayerIndex = endLayerIndex; + this.Transform = transform; + this.LayerScale = layerScale; + this.CurrentRenderType = renderType; + this.FeatureToStartOnRatio0To1 = featureToStartOnRatio0To1; + this.FeatureToEndOnRatio0To1 = featureToEndOnRatio0To1; this.extruderOffsets = extruderOffsets; } } diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs index 8bafd1714..822d0056b 100644 --- a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs +++ b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs @@ -314,7 +314,7 @@ namespace MatterHackers.GCodeVisualizer } else // don't render any of the layers below this and in fact remove them from memory if possible { - renderInfo.startLayerIndex = i + 1; + renderInfo.StartLayerIndex = i + 1; cleanUnusedLayers = true; break; }