From a92bafd2df6f1e8c5cc590a003d2eae62cbcdba8 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 26 Jun 2017 15:42:42 -0700 Subject: [PATCH] Refoctoring --- ControlElements/MHTextEditWidget.cs | 19 ++++++++++--------- .../View3D/Gui3D/HeightValueDisplay.cs | 4 ++-- Submodules/agg-sharp | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ControlElements/MHTextEditWidget.cs b/ControlElements/MHTextEditWidget.cs index a3f5e4821..76ba557ec 100644 --- a/ControlElements/MHTextEditWidget.cs +++ b/ControlElements/MHTextEditWidget.cs @@ -128,11 +128,12 @@ namespace MatterHackers.MatterControl public class MHNumberEdit : GuiWidget { - private NumberEdit actuallNumberEdit; + public NumberEdit ActuallNumberEdit { get; private set; } - public NumberEdit ActuallNumberEdit + public double Value { - get { return actuallNumberEdit; } + get { return ActuallNumberEdit.Value; } + set { ActuallNumberEdit.Value = value; } } public MHNumberEdit(double startingValue, @@ -145,10 +146,10 @@ namespace MatterHackers.MatterControl int tabIndex = 0) { Padding = new BorderDouble(3); - actuallNumberEdit = new NumberEdit(startingValue, x, y, pointSize, pixelWidth, pixelHeight, + ActuallNumberEdit = new NumberEdit(startingValue, x, y, pointSize, pixelWidth, pixelHeight, allowNegatives, allowDecimals, minValue, maxValue, increment, tabIndex); - actuallNumberEdit.VAnchor = Agg.UI.VAnchor.ParentBottom; - AddChild(actuallNumberEdit); + ActuallNumberEdit.VAnchor = Agg.UI.VAnchor.ParentBottom; + AddChild(ActuallNumberEdit); BackgroundColor = RGBA_Bytes.White; HAnchor = HAnchor.FitToChildren; VAnchor = VAnchor.FitToChildren; @@ -162,7 +163,7 @@ namespace MatterHackers.MatterControl } set { - actuallNumberEdit.TabIndex = value; + ActuallNumberEdit.TabIndex = value; } } @@ -179,11 +180,11 @@ namespace MatterHackers.MatterControl { get { - return actuallNumberEdit.Text; + return ActuallNumberEdit.Text; } set { - actuallNumberEdit.Text = value; + ActuallNumberEdit.Text = value; } } diff --git a/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs b/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs index 5736d7d10..a57eb3775 100644 --- a/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs +++ b/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs @@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { private static readonly int HorizontalLineLength = 30; private View3DWidget view3DWidget; - ValueDisplayInfo heightValueDisplayInfo = new ValueDisplayInfo(); + //ValueDisplayInfo heightValueDisplayInfo = new ValueDisplayInfo("{0:0.0}mm"); public HeightValueDisplay(View3DWidget view3DWidget) { @@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow screenPosition = testScreenPosition + new Vector2(HorizontalLineLength, 0); } } - heightValueDisplayInfo.DisplaySizeInfo(drawEvent.graphics2D, midLinePos, selectedBounds.minXYZ.z); + //heightValueDisplayInfo.DisplaySizeInfo(drawEvent.graphics2D, midLinePos, selectedBounds.minXYZ.z); OriginRelativeParent = screenPosition; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 39c92e01e..3c540a521 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 39c92e01eee0f5334618e54e617ceb3d44d75054 +Subproject commit 3c540a5217c62c79769764037978f3d430ad0697