This commit is contained in:
John Lewin 2018-07-12 22:49:39 -07:00
parent a466f8f708
commit 685541523b
46 changed files with 84 additions and 88 deletions

View file

@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.DesignTools
public double Diameter { get; set; } = double.MinValue;
[Range(0, 100, ErrorMessage = "Value for {0} must be between {1} and {2}.")]
[Description("Where to starte the bend as a percent of the width of the part")]
[Description("Where to start the bend as a percent of the width of the part")]
public double StartPercent { get; set; } = 50;
[DisplayName("Bend Up")]
@ -154,7 +154,7 @@ namespace MatterHackers.MatterControl.DesignTools
var matrix = originalMatrix;
if (!BendCcw)
{
// rotate around so it wil bend correctly
// rotate around so it will bend correctly
matrix *= Matrix4X4.CreateTranslation(0, -aabb.maxXYZ.Y, 0);
matrix *= Matrix4X4.CreateRotationX(MathHelper.Tau / 2);
matrix *= Matrix4X4.CreateTranslation(0, aabb.maxXYZ.Y - aabb.YSize, 0);
@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl.DesignTools
curvedMesh.Vertices[i].Position = Vector3.Transform(worldWithBend, matrix.Inverted);
}
// the vertices need to be resorted as they have moved relative to eachother
// the vertices need to be resorted as they have moved relative to each other
curvedMesh.Vertices.Sort();
curvedMesh.MarkAsChanged();

View file

@ -288,13 +288,13 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
[Description("Allows you turn turn on and off applying the fit to the x axis.")]
[Description("Allows you turn on and off applying the fit to the x axis.")]
public bool StretchX { get; set; } = true;
[Description("Allows you turn turn on and off applying the fit to the y axis.")]
[Description("Allows you turn on and off applying the fit to the y axis.")]
public bool StretchY { get; set; } = true;
[Description("Allows you turn turn on and off applying the fit to the z axis.")]
[Description("Allows you turn on and off applying the fit to the z axis.")]
public bool StretchZ { get; set; } = true;
#endregion // editable properties

View file

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.DesignTools
double Transform(Color color);
/// <summary>
/// Do the actual thresholding of the color. This will convert it inte tho coordinate space
/// Do the actual thresholding of the color. This will convert it into the coordinate space
/// and also apply any clamping to the values.
/// </summary>
/// <param name="color"></param>

View file

@ -346,10 +346,10 @@ namespace MatterHackers.MatterControl.DesignTools
RangeEnd = Math.Max(0, Math.Min(1, RangeEnd));
if (RangeStart > RangeEnd - minSeparation)
{
// values are overlaped or too close together
// values are overlapped or too close together
if (RangeEnd < 1 - minSeparation)
{
// move the end up whever possible
// move the end up whenever possible
RangeEnd = RangeStart + minSeparation;
}
else

View file

@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
if (_primitiveColors == null)
{
_primitiveColors = new Dictionary<string, Color>();
// put in all the constant things before blening them
// put in all the constant things before blending them
_primitiveColors.Add("Cube", Color.FromHSL(.01, .98, .76)); // red
_primitiveColors.Add("Text", Color.FromHSL(.175, .98, .76)); // yellow
_primitiveColors.Add("HalfSphere", Color.FromHSL(.87, .98, .76)); // violet

View file

@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
/// <summary>
/// This function will return the source container and if it does not find one will:
/// <para>find the first child of the parent widget</para>
/// <para>remove it from paret</item>
/// <para>remove it from parent</item>
/// <para>create a new OperationSource</para>
/// <para>add the first child to the OperationSource</para>
/// <para>add the OperationSource to the parent</para>

View file

@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.DesignTools
transformedMesh.Vertices[i].Position = Vector3.Transform(newPos, invItemMatrix);
}
// the vertices need to be resorted as they have moved relative to eachother
// the vertices need to be resorted as they have moved relative to each other
transformedMesh.Vertices.Sort();
transformedMesh.MarkAsChanged();

View file

@ -175,7 +175,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
[Description("Toggle between specifying the size or the percentage to scale.")]
public bool UsePercentage { get; set; }
[Description("This is the positon to perform the scale about.")]
[Description("This is the position to perform the scale about.")]
public Vector3 ScaleAbout { get; set; }
#endregion // editable properties
@ -274,7 +274,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
else if(change.Changed == nameof(UsePercentage))
{
// make sure we update the controls on screen to reflect the differnt data type
// make sure we update the controls on screen to reflect the different data type
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Properties));
}
else if (change.Changed == nameof(MaitainProportions))