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

Spelling

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
ActionBar/TemperatureWidgetExtruder.cs
View file

@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl.ActionBar
buttonContainer.AddChild(extrudeButton);
this.AddChild(new SettingsItem(
macroButtons == null ? "Filament".Localize() : "", // Don't put the name if we put in a macro button (it hase the name)
macroButtons == null ? "Filament".Localize() : "", // Don't put the name if we put in a macro button (it has the name)
buttonContainer,
theme,
enforceGutter: false));

2
ApplicationView/ApplicationController.cs
View file

@ -1128,7 +1128,7 @@ namespace MatterHackers.MatterControl
// Release any waiting generator threads
this.Thumbnails.Shutdown();
// Kill all long running tasks (this will release the silcing thread if running)
// Kill all long running tasks (this will release the slicing thread if running)
foreach (var task in Tasks.RunningTasks)
{
task.CancelTask();

2
ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs
View file

@ -237,7 +237,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private Vector2 EnsureInPrintBounds(PrinterSettings printerSettings, Vector2 probePosition)
{
// check that the position is within the printing arrea and if not move it back in
// check that the position is within the printing area and if not move it back in
if (printerSettings.Helpers.UseZProbe())
{
var probeOffset = printer.Settings.GetValue<Vector2>(SettingsKey.z_probe_xy_offset);

2
CustomWidgets/PrintingWindow/ProgressDial.cs
View file

@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
{
percentCompleteWidget.Text = $"{percentComplete:0}%";
}
else // let's show the extra decimal during the last perecent
else // let's show the extra decimal during the last percent
{
percentCompleteWidget.Text = $"{Math.Min(99.9, percentComplete):0.0}%";
}

2
CustomWidgets/SimpleButton.cs
View file

@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
public ImageBuffer IconImage => this.Enabled ? image : this.DisabledImage;
/// <summary>
/// Switch icons without computing disabled image - use case for non-disablable toggle widgets
/// Switch icons without computing disabled image - use case for non-disableable toggle widgets
/// </summary>
/// <param name="icon"></param>
internal void SetIcon(ImageBuffer icon)

14
DataStorage/SQLiteAndroid.cs
View file

@ -486,7 +486,7 @@ namespace SQLiteAndroid
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the command text.
/// Arguments to substitute for the occurrences of '?' in the command text.
/// </param>
/// <returns>
/// A <see cref="SQLiteCommand"/>
@ -521,7 +521,7 @@ namespace SQLiteAndroid
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// The number of rows modified in the database as a result of this execution.
@ -591,7 +591,7 @@ namespace SQLiteAndroid
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -615,7 +615,7 @@ namespace SQLiteAndroid
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -643,7 +643,7 @@ namespace SQLiteAndroid
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -669,7 +669,7 @@ namespace SQLiteAndroid
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -1743,7 +1743,7 @@ namespace SQLiteAndroid
_prop = prop;
Name = colAttr == null ? prop.Name : colAttr.Name;
//If this type is Nullable<T> then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the the actual type instead
//If this type is Nullable<T> then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the actual type instead
ColumnType = Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType;
Collation = Orm.Collation(prop);
IsAutoInc = Orm.IsAutoInc(prop);

2
DataStorage/SQLiteAsync.cs
View file

@ -255,7 +255,7 @@ namespace SQLite
{
//
// This isn't async as the underlying connection doesn't go out to the database
// until the query is performed. The Async methods are on the query iteself.
// until the query is performed. The Async methods are on the query itself.
//
var conn = GetConnection ();
return new AsyncTableQuery<T> (conn.Table<T> ());

14
DataStorage/SQLiteUnix.cs
View file

@ -459,7 +459,7 @@ namespace SQLiteUnix
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the command text.
/// Arguments to substitute for the occurrences of '?' in the command text.
/// </param>
/// <returns>
/// A <see cref="SQLiteCommand"/>
@ -494,7 +494,7 @@ namespace SQLiteUnix
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// The number of rows modified in the database as a result of this execution.
@ -564,7 +564,7 @@ namespace SQLiteUnix
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -590,7 +590,7 @@ namespace SQLiteUnix
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -618,7 +618,7 @@ namespace SQLiteUnix
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -644,7 +644,7 @@ namespace SQLiteUnix
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -1715,7 +1715,7 @@ namespace SQLiteUnix
_prop = prop;
Name = colAttr == null ? prop.Name : colAttr.Name;
//If this type is Nullable<T> then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the the actual type instead
//If this type is Nullable<T> then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the actual type instead
ColumnType = Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType;
Collation = Orm.Collation(prop);
IsAutoInc = Orm.IsAutoInc(prop);

12
DataStorage/SQLiteWin32.cs
View file

@ -504,7 +504,7 @@ namespace SQLiteWin32
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// The number of rows modified in the database as a result of this execution.
@ -574,7 +574,7 @@ namespace SQLiteWin32
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -598,7 +598,7 @@ namespace SQLiteWin32
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -626,7 +626,7 @@ namespace SQLiteWin32
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -652,7 +652,7 @@ namespace SQLiteWin32
/// The fully escaped SQL.
/// </param>
/// <param name="args">
/// Arguments to substitute for the occurences of '?' in the query.
/// Arguments to substitute for the occurrences of '?' in the query.
/// </param>
/// <returns>
/// An enumerable with one result for each row returned by the query.
@ -1725,7 +1725,7 @@ namespace SQLiteWin32
_prop = prop;
Name = colAttr == null ? prop.Name : colAttr.Name;
//If this type is Nullable<T> then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the the actual type instead
//If this type is Nullable<T> then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the actual type instead
ColumnType = Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType;
Collation = Orm.Collation(prop);
IsAutoInc = Orm.IsAutoInc(prop);

6
DesignTools/Obsolete/FitToBoundsObject3D.cs
View file

@ -60,11 +60,11 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
[Description("Set the rules for how to maintain the part while scaling.")]
public MaintainRatio MaintainRatio { get; set; } = MaintainRatio.X_Y;
[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;
IObject3D ScaleItem => Children.First();

6
DesignTools/Operations/CurveObject3D.cs
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();

6
DesignTools/Operations/FitToBoundsObject3D_2.cs
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

2
DesignTools/Operations/Image/IThresholdFunction.cs
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>

4
DesignTools/Operations/Image/ImageToPathObject3D.cs
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

2
DesignTools/Operations/Object3DExtensions.cs
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

2
DesignTools/Operations/OperationSourceObject3D.cs
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>

2
DesignTools/Operations/PinchObject3D.cs
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();

4
DesignTools/Operations/ScaleObject3D.cs
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))

2
DesignTools/Primitives/BaseObject3D.cs
View file

@ -151,7 +151,7 @@ namespace MatterHackers.MatterControl.DesignTools
var firstChild = this.Children.FirstOrDefault();
// remove the base besh we added
// remove the base mesh we added
this.Children.Modify(list =>
{
list.Clear();

2
DesignTools/Primitives/CylinderObject3D.cs
View file

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.DesignTools
item.Matrix = Matrix4X4.CreateRotationX(MathHelper.Tau / 4);
break;
case Alignment.Z:
// This is the natural case (how it was modled)
// This is the natural case (how it was modeled)
break;
case Alignment.negX:
item.Matrix = Matrix4X4.CreateRotationY(-MathHelper.Tau / 4);

2
DesignTools/Primitives/ImageObject3D.cs
View file

@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
// we don't want to invalidate on the mesh chage
// we don't want to invalidate on the mesh change
using (RebuildLock())
{
base.Mesh = this.InitMesh() ?? PlatonicSolids.CreateCube(100, 100, 0.2);

3
DesignTools/Primitives/PyramidObject3D.cs
View file

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.DesignTools
{
public PyramidObject3D()
{
Name = "Pyriamid".Localize();
Name = "Pyramid".Localize();
Color = Operations.Object3DExtensions.PrimitiveColors["Pyramid"];
}
@ -53,7 +53,6 @@ namespace MatterHackers.MatterControl.DesignTools
return item;
}
public double Width { get; set; } = 20;
public double Depth { get; set; } = 20;
public double Height { get; set; } = 20;

7
Library/Providers/LibraryProviderHelpers.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2017, John Lewin
Copyright (c) 2018, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -27,11 +27,8 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.IO;
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.ImageProcessing;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.VectorMath;
@ -58,7 +55,7 @@ namespace MatterHackers.MatterControl.Library
/// <param name="imageBuffer">The ImageBuffer to resize</param>
/// <param name="targetWidth">The target width</param>
/// <param name="targetHeight">The target height</param>
/// <returns>A resized ImageBuffer contrained to the given bounds and centered on the new surface</returns>
/// <returns>A resized ImageBuffer constrained to the given bounds and centered on the new surface</returns>
public static ImageBuffer ResizeImage(ImageBuffer imageBuffer, int targetWidth, int targetHeight)
{
var expectedSize = new Vector2((int)(targetWidth * GuiWidget.DeviceScale), (int)(targetHeight * GuiWidget.DeviceScale));

2
MatterControl.Printing/Communication/FrostedSerial/FrostedSerialStream.cs
View file

@ -104,7 +104,7 @@ namespace MatterHackers.SerialPortCommunication.FrostedSerial
}
newtio.c_cflag |= (uint)(e_c_oflag.CLOCAL | e_c_oflag.CREAD);
// there is no defenition for e_c_lflag.ECHOL that I can find. It was in the list of or'ed flags below
// there is no definition for e_c_lflag.ECHOL that I can find. It was in the list of or'ed flags below
unchecked
{
newtio.c_lflag &= (uint)-(int)(e_c_lflag.ICANON | e_c_lflag.ECHO | e_c_lflag.ECHOE | e_c_lflag.ECHOK | e_c_lflag.ECHONL | e_c_lflag.ISIG | e_c_lflag.IEXTEN);

6
MatterControl.Printing/GCode/GCodeMemoryFile.cs
View file

@ -486,7 +486,7 @@ namespace MatterControl.Printing
break;
case "18":
// turn off stepers
// turn off steppers
break;
case "42":
@ -526,7 +526,7 @@ namespace MatterControl.Printing
break;
case "104":
// set extruder tempreature
// set extruder temperature
break;
case "105":
@ -655,7 +655,7 @@ namespace MatterControl.Printing
case "4":
case "04":
// wait a given number of miliseconds
// wait a given number of milliseconds
break;
case "1":

2
PartPreviewWindow/PartPreviewContent.cs
View file

@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double totalSeconds = 0;
var textWidgets = updateAvailableButton.Descendants<TextWidget>().Where((w) => w.Visible == true).ToArray();
Color startColor = theme.Colors.PrimaryTextColor;
// Show a highlite on the button as the user did not click it
// Show a highlight on the button as the user did not click it
Animation flashBackground = null;
flashBackground = new Animation()
{

2
PartPreviewWindow/StartPage/ExplorePanel.cs
View file

@ -158,7 +158,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
{
break;
// use the Golden Ratio to calculate an atractive size relative to the banner
// use the Golden Ratio to calculate an attractive size relative to the banner
var image = new ImageBuffer(1520, (int)(170 / 1.618));
var imageWidget = new ResponsiveImageWidget(image)
{

2
PartPreviewWindow/StartPage/ExploreSection.cs
View file

@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
{
ApplicationController.Instance.LaunchBrowser(content.group_link);
}
else // show more itmes in the list
else // show more items in the list
{
var scroll = this.Parents<ScrollableWidget>().FirstOrDefault();
var position = scroll.ScrollPositionFromTop;

2
PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
View file

@ -108,7 +108,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
this.DebugDepth("Reset MWM");
// Remove evrything above the objects that have the meshes we are wrapping that are mesh wrappers
// Remove everything above the objects that have the meshes we are wrapping that are mesh wrappers
var wrappers = this.Descendants().Where(o => o.OwnerID == this.ID).ToList();
foreach (var wrapper in wrappers)
{

2
PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -203,7 +203,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double totalSeconds = 0;
Color backgroundColor = activeButton.BackgroundColor;
Color hightlightColor = theme.Colors.PrimaryAccentColor.AdjustContrast(theme.Colors.PrimaryTextColor, 6).ToColor();
// Show a highlite on the button as the user did not click it
// Show a highlight on the button as the user did not click it
Animation flashBackground = null;
flashBackground = new Animation()
{

2
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -637,7 +637,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
GL.ReadPixels((int)lastMouseMove.X, (int)lastMouseMove.Y, image.Width, image.Height, PixelFormat.Rgba, PixelType.UnsignedByte, image.GetBuffer());
GL.GetError();
// Return to onscreen rendering:
// Return to on-screen rendering:
//GL.BindFramebuffer(0);
// Clean up gl stuff

2
PrinterControls/PrinterConnections/ShowAuthPanel.cs
View file

@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
AddBulletPointAndDescription(contentRow,
"Cloud Library".Localize(),
"Save your designs to the cloud and access them from anywhere in the world. You can also share them any time with with anyone you want.".Localize());
"Save your designs to the cloud and access them from anywhere in the world. You can also share them any time with anyone you want.".Localize());
AddBulletPointAndDescription(contentRow,
"Cloud Printer Profiles".Localize(),
"Create your machine settings once, and have them available anywhere you want to print. All your changes appear on all your devices.".Localize());

4
PrinterControls/TerminalWindow/TextScrollWidget.cs
View file

@ -235,11 +235,11 @@ namespace MatterHackers.MatterControl
base.OnMouseWheel(mouseEvent);
double scrollDelta = (mouseEvent.WheelDelta / ((visibleLines.Count) * 60.0));
if (scrollDelta < 0)//Rounding seems to favor scrolling up, compinsating scroll down to feel as smooth
if (scrollDelta < 0)//Rounding seems to favor scrolling up, compensating scroll down to feel as smooth
{
scrollDelta *= 2;
}
else if (Position0To1 == 0)//IF we scroll up at the bottum get pop out from the "on screen" chunck
else if (Position0To1 == 0)//IF we scroll up at the bottom get pop out from the "on screen" chunk
{
scrollDelta = (NumVisibleLines/(double)visibleLines.Count);
}

2
Queue/QueueData.cs
View file

@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.PrintQueue
if (!sdCardItemInQueue && validSdCardItem)
{
// If there is not alread an sd card item in the queue with this name then add it.
// If there is not already an sd card item in the queue with this name then add it.
AddItem(new PrintItemWrapper(new PrintItem(currentEvent.Data, QueueData.SdCardFileName)));
}
}

2
RootSystemWindow.cs
View file

@ -320,7 +320,7 @@ namespace MatterHackers.MatterControl
else
{
ApplicationController.Instance.ApplicationExiting = true;
// Make sure we tell the Application Conroller to shut down. This will release the silcing thread if running.
// Make sure we tell the Application Controller to shut down. This will release the slicing thread if running.
ApplicationController.Instance.Shutdown();
}
}

4
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -839,7 +839,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
#endif
if (typeof(T) == typeof(string))
{
// this way we can use the common pattern without errer
// this way we can use the common pattern without error
return (T)(object)this.GetValue(settingsKey);
}
else if(typeof(T) == typeof(LevelingSystem))
@ -1068,7 +1068,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
string location = "Location: 'Controls' -> 'Movement' -> 'Z Offset'".Localize();
string error = "Z Offset is too large.".Localize();
string details = "The Z Offset for your printer, sometimes called Babby Stepping, is greater than 2mm and invalid. Clear the value and re-level the bed.".Localize();
string details = "The Z Offset for your printer, sometimes called Baby Stepping, is greater than 2mm and invalid. Clear the value and re-level the bed.".Localize();
StyledMessageBox.ShowMessageBox(string.Format("{0}\n\n{1}\n\n{2}", error, details, location), "Calibration Error".Localize());
return false;
}

2
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -166,7 +166,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new OverrideSpeedOnSlaPrinters("perimeter_speed", "insidePerimetersSpeed", "infill_speed"),
new MappedSetting("raft_air_gap", "raftAirGap"),
// fan settings
new VisibleButNotMappedToEngine("enable_fan"), // this is considred when sending fan speeds to slicing
new VisibleButNotMappedToEngine("enable_fan"), // this is considered when sending fan speeds to slicing
new MappedFanSpeedSetting("min_fan_speed", "fanSpeedMinPercent"),
new MappedSetting("min_fan_speed_layer_time", "minFanSpeedLayerTime"),
new MappedFanSpeedSetting("max_fan_speed", "fanSpeedMaxPercent"),

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 8a4dd5ee493dc743a65fdba5dcf53d1cc3e83b76
Subproject commit 1cab4fbb8e7df0017db29bcab3aec994a6109c26

2
Tests/MatterControl.AutomationTests/PrintingTests.cs
View file

@ -35,7 +35,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.AddItemToBedplate();
// Sorten the delay so the test runs in a reasonable time
// Shorten the delay so the test runs in a reasonable time
ApplicationController.Instance.ActivePrinter.Connection.TurnOffHeatDelay = 5;
testRunner.StartPrint();

4
Tests/MatterControl.Tests/MatterControl/LevelingTests.cs
View file

@ -70,7 +70,7 @@ namespace MatterControl.Tests.MatterControl
AssertMeshLevelPoint(new Vector3(10, 10, 0), new Vector3(10, 10, 10), levelingFunctionsMesh2x2);
AssertMeshLevelPoint(new Vector3(0, 10, 0), new Vector3(0, 10, 0), levelingFunctionsMesh2x2);
// check raised on ponits
// check raised on points
AssertMeshLevelPoint(new Vector3(0, 0, 5), new Vector3(0, 0, 5), levelingFunctionsMesh2x2);
AssertMeshLevelPoint(new Vector3(10, 0, 5), new Vector3(10, 0, 15), levelingFunctionsMesh2x2);
AssertMeshLevelPoint(new Vector3(10, 10, 5), new Vector3(10, 10, 15), levelingFunctionsMesh2x2);
@ -111,7 +111,7 @@ namespace MatterControl.Tests.MatterControl
AssertMeshLevelPoint(new Vector3(10, 10, 0), new Vector3(10, 10, 10), levelingFunctionsMesh2x2);
AssertMeshLevelPoint(new Vector3(0, 10, 0), new Vector3(0, 10, 0), levelingFunctionsMesh2x2);
// check raised on ponits
// check raised on points
AssertMeshLevelPoint(new Vector3(0, 0, 5), new Vector3(0, 0, 5), levelingFunctionsMesh2x2);
AssertMeshLevelPoint(new Vector3(10, 0, 5), new Vector3(10, 0, 15), levelingFunctionsMesh2x2);
AssertMeshLevelPoint(new Vector3(10, 10, 5), new Vector3(10, 10, 15), levelingFunctionsMesh2x2);

4
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -229,7 +229,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
// Override the heat up time
Emulator.DefaultHeatUpTime = config.HeatupTime;
// Override the temp stablization time
// Override the temp stabilization time
WaitForTempStream.WaitAfterReachTempTime = config.TempStabilizationTime;
// Create the printer
@ -959,7 +959,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
public double TimeToMoveMouse { get; set; } = .5;
/// <summary>
/// Determins if we use actual sytem file dialogs or simulated file dialogs.
/// Determines if we use actual system file dialogs or simulated file dialogs.
/// </summary>
public bool UseAutomationDialogs { get; set; } = true;

8
Tests/MatterControl.Tests/MatterControl/MeshCsgTests.cs
View file

@ -60,7 +60,7 @@ namespace MatterHackers.PolygonMesh.UnitTests
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "StaticData"));
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(5));
// check that we subtarct two 3 sideh cylinders
// check that we subtract two 3 sided cylinders
{
double topHeight = 10;
int sides = 3;
@ -87,7 +87,7 @@ namespace MatterHackers.PolygonMesh.UnitTests
var resultMesh = keepMesh.Subtract(subtractMesh, null, CancellationToken.None);
// this is for debuging the opperation
// this is for debugging the operation
//split1.FinishOutput();
//resultMesh.Save("c:/temp/mesh1.stl", CancellationToken.None);
@ -106,7 +106,7 @@ namespace MatterHackers.PolygonMesh.UnitTests
}
}
// check that we subtarct two 3 sideh cylinders
// check that we subtract two 3 side cylinders
{
int sides = 3;
IObject3D keep = CylinderObject3D.Create(20, 20, sides);
@ -129,7 +129,7 @@ namespace MatterHackers.PolygonMesh.UnitTests
var resultMesh = keepMesh.Subtract(subtractMesh, null, CancellationToken.None);
// this is for debuging the opperation
// this is for debugging the operation
//split1.FinishOutput();
//resultMesh.Save("c:/temp/mesh2.stl", CancellationToken.None);

2
TextCreator/Braille/BrailleGrade2.cs
View file

@ -72,7 +72,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
EnsureInitialized();
string converted = text;
//Convert numbers and punctuation, skip words startign with # in the contractions
//Convert numbers and punctuation, skip words starting with # in the contractions
if (IsNumeric(converted))
{
string numConversion = ("#" + converted);

6
TextCreator/Braille/BrailleGrade2Mapping.cs
View file

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
public static class BrailleGrade2Mapping
{
public static string mappingTable =
// + means needs one or more lettes before or after
// + means needs one or more letters before or after
// * means needs one or more words before or after
// all caps means needs to be exact match
@"
@ -256,7 +256,7 @@ under ""u
upon ~u
US u
// v's
// v's
VERY v
// w's
@ -287,7 +287,7 @@ yourselves yrvs
3 c
4 d
5 e
6 f
6 f
7 g
8 h
9 i

2
Utilities/JsonPath.cs
View file

@ -238,7 +238,7 @@ namespace JsonPath
stack.Push(Args(m + ";" + x, v, p));
});
}
else if (RegExp.IsMatch(atom, @"^(-?[0-9]*):(-?[0-9]*):?([0-9]*)$")) // [start:end:step] Phyton slice syntax
else if (RegExp.IsMatch(atom, @"^(-?[0-9]*):(-?[0-9]*):?([0-9]*)$")) // [start:end:step] Python slice syntax
{
foreach (var a in Slice(atom, tail, value, path).Reverse())
stack.Push(a);

4
Utilities/WebUtilities/RequestManager.cs
View file

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl
public string LastResponse { protected set; get; }
/// <summary>
/// Gets or sets the time-out value in milliseconds
/// Gets or sets the time-out value in milliseconds
/// </summary>
/// <value>The timeout.</value>
public int Timeout { get; internal set; } = 100000;
@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl
// Set cookie container to maintain cookies
request.CookieContainer = cookies;
request.AllowAutoRedirect = false;
// If sign in is empty use defaul credentials
// If sign in is empty use default credentials
if (string.IsNullOrEmpty(signIn))
{
request.Credentials = CredentialCache.DefaultNetworkCredentials;