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

Refoctoring

Browse source
This commit is contained in:
Lars Brubaker 2017-06-26 15:42:42 -07:00
parent cd8a7ffa86
commit a92bafd2df
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ControlElements/MHTextEditWidget.cs
View file

@ -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;
}
}

4
PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs
View file

@ -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;

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 39c92e01eee0f5334618e54e617ceb3d44d75054
Subproject commit 3c540a5217c62c79769764037978f3d430ad0697