diff --git a/ActionBar/TemperatureWidgetExtruder.cs b/ActionBar/TemperatureWidgetExtruder.cs index fe3e433a6..f7c2ac9f0 100644 --- a/ActionBar/TemperatureWidgetExtruder.cs +++ b/ActionBar/TemperatureWidgetExtruder.cs @@ -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)); diff --git a/ApplicationView/ApplicationController.cs b/ApplicationView/ApplicationController.cs index eaf1328b3..12fe4a346 100644 --- a/ApplicationView/ApplicationController.cs +++ b/ApplicationView/ApplicationController.cs @@ -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(); diff --git a/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs b/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs index d2eecefe4..2c837970b 100644 --- a/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs +++ b/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs @@ -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(SettingsKey.z_probe_xy_offset); diff --git a/CustomWidgets/PrintingWindow/ProgressDial.cs b/CustomWidgets/PrintingWindow/ProgressDial.cs index f9ff733d7..a8a724325 100644 --- a/CustomWidgets/PrintingWindow/ProgressDial.cs +++ b/CustomWidgets/PrintingWindow/ProgressDial.cs @@ -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}%"; } diff --git a/CustomWidgets/SimpleButton.cs b/CustomWidgets/SimpleButton.cs index 3f868c9cc..0c326213b 100644 --- a/CustomWidgets/SimpleButton.cs +++ b/CustomWidgets/SimpleButton.cs @@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.CustomWidgets public ImageBuffer IconImage => this.Enabled ? image : this.DisabledImage; /// - /// 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 /// /// internal void SetIcon(ImageBuffer icon) diff --git a/DataStorage/SQLiteAndroid.cs b/DataStorage/SQLiteAndroid.cs index 129d048c9..eab975ee1 100644 --- a/DataStorage/SQLiteAndroid.cs +++ b/DataStorage/SQLiteAndroid.cs @@ -486,7 +486,7 @@ namespace SQLiteAndroid /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the command text. + /// Arguments to substitute for the occurrences of '?' in the command text. /// /// /// A @@ -521,7 +521,7 @@ namespace SQLiteAndroid /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// The number of rows modified in the database as a result of this execution. @@ -591,7 +591,7 @@ namespace SQLiteAndroid /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -615,7 +615,7 @@ namespace SQLiteAndroid /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -643,7 +643,7 @@ namespace SQLiteAndroid /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -669,7 +669,7 @@ namespace SQLiteAndroid /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// 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 then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the the actual type instead + //If this type is Nullable 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); diff --git a/DataStorage/SQLiteAsync.cs b/DataStorage/SQLiteAsync.cs index 61a6a75e5..4171697bb 100644 --- a/DataStorage/SQLiteAsync.cs +++ b/DataStorage/SQLiteAsync.cs @@ -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 (conn.Table ()); diff --git a/DataStorage/SQLiteUnix.cs b/DataStorage/SQLiteUnix.cs index 65c1b1b05..6d6c72011 100644 --- a/DataStorage/SQLiteUnix.cs +++ b/DataStorage/SQLiteUnix.cs @@ -459,7 +459,7 @@ namespace SQLiteUnix /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the command text. + /// Arguments to substitute for the occurrences of '?' in the command text. /// /// /// A @@ -494,7 +494,7 @@ namespace SQLiteUnix /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// The number of rows modified in the database as a result of this execution. @@ -564,7 +564,7 @@ namespace SQLiteUnix /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -590,7 +590,7 @@ namespace SQLiteUnix /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -618,7 +618,7 @@ namespace SQLiteUnix /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -644,7 +644,7 @@ namespace SQLiteUnix /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// 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 then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the the actual type instead + //If this type is Nullable 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); diff --git a/DataStorage/SQLiteWin32.cs b/DataStorage/SQLiteWin32.cs index e6017ac40..934dbac09 100644 --- a/DataStorage/SQLiteWin32.cs +++ b/DataStorage/SQLiteWin32.cs @@ -504,7 +504,7 @@ namespace SQLiteWin32 /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// The number of rows modified in the database as a result of this execution. @@ -574,7 +574,7 @@ namespace SQLiteWin32 /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -598,7 +598,7 @@ namespace SQLiteWin32 /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -626,7 +626,7 @@ namespace SQLiteWin32 /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// An enumerable with one result for each row returned by the query. @@ -652,7 +652,7 @@ namespace SQLiteWin32 /// The fully escaped SQL. /// /// - /// Arguments to substitute for the occurences of '?' in the query. + /// Arguments to substitute for the occurrences of '?' in the query. /// /// /// 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 then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the the actual type instead + //If this type is Nullable 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); diff --git a/DesignTools/Obsolete/FitToBoundsObject3D.cs b/DesignTools/Obsolete/FitToBoundsObject3D.cs index 4b6393c84..969165a3f 100644 --- a/DesignTools/Obsolete/FitToBoundsObject3D.cs +++ b/DesignTools/Obsolete/FitToBoundsObject3D.cs @@ -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(); diff --git a/DesignTools/Operations/CurveObject3D.cs b/DesignTools/Operations/CurveObject3D.cs index 60509b15f..175e9bc33 100644 --- a/DesignTools/Operations/CurveObject3D.cs +++ b/DesignTools/Operations/CurveObject3D.cs @@ -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(); diff --git a/DesignTools/Operations/FitToBoundsObject3D_2.cs b/DesignTools/Operations/FitToBoundsObject3D_2.cs index 0571919c1..0f1f9f56e 100644 --- a/DesignTools/Operations/FitToBoundsObject3D_2.cs +++ b/DesignTools/Operations/FitToBoundsObject3D_2.cs @@ -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 diff --git a/DesignTools/Operations/Image/IThresholdFunction.cs b/DesignTools/Operations/Image/IThresholdFunction.cs index 32dd35650..4e59dfd3d 100644 --- a/DesignTools/Operations/Image/IThresholdFunction.cs +++ b/DesignTools/Operations/Image/IThresholdFunction.cs @@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.DesignTools double Transform(Color color); /// - /// 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. /// /// diff --git a/DesignTools/Operations/Image/ImageToPathObject3D.cs b/DesignTools/Operations/Image/ImageToPathObject3D.cs index e85db1e3f..8bc871b97 100644 --- a/DesignTools/Operations/Image/ImageToPathObject3D.cs +++ b/DesignTools/Operations/Image/ImageToPathObject3D.cs @@ -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 diff --git a/DesignTools/Operations/Object3DExtensions.cs b/DesignTools/Operations/Object3DExtensions.cs index 4a2aa4428..f68c5105d 100644 --- a/DesignTools/Operations/Object3DExtensions.cs +++ b/DesignTools/Operations/Object3DExtensions.cs @@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations if (_primitiveColors == null) { _primitiveColors = new Dictionary(); - // 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 diff --git a/DesignTools/Operations/OperationSourceObject3D.cs b/DesignTools/Operations/OperationSourceObject3D.cs index 91d681425..191a342f5 100644 --- a/DesignTools/Operations/OperationSourceObject3D.cs +++ b/DesignTools/Operations/OperationSourceObject3D.cs @@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations /// /// This function will return the source container and if it does not find one will: /// find the first child of the parent widget - /// remove it from paret + /// remove it from parent /// create a new OperationSource /// add the first child to the OperationSource /// add the OperationSource to the parent diff --git a/DesignTools/Operations/PinchObject3D.cs b/DesignTools/Operations/PinchObject3D.cs index 28bf9c3b5..f073974ac 100644 --- a/DesignTools/Operations/PinchObject3D.cs +++ b/DesignTools/Operations/PinchObject3D.cs @@ -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(); diff --git a/DesignTools/Operations/ScaleObject3D.cs b/DesignTools/Operations/ScaleObject3D.cs index 4327f00a5..f0fe00c90 100644 --- a/DesignTools/Operations/ScaleObject3D.cs +++ b/DesignTools/Operations/ScaleObject3D.cs @@ -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)) diff --git a/DesignTools/Primitives/BaseObject3D.cs b/DesignTools/Primitives/BaseObject3D.cs index dc2ff1765..6db3dd0bf 100644 --- a/DesignTools/Primitives/BaseObject3D.cs +++ b/DesignTools/Primitives/BaseObject3D.cs @@ -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(); diff --git a/DesignTools/Primitives/CylinderObject3D.cs b/DesignTools/Primitives/CylinderObject3D.cs index dd5896b3a..8dcd7b441 100644 --- a/DesignTools/Primitives/CylinderObject3D.cs +++ b/DesignTools/Primitives/CylinderObject3D.cs @@ -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); diff --git a/DesignTools/Primitives/ImageObject3D.cs b/DesignTools/Primitives/ImageObject3D.cs index 2fb445304..923652fe7 100644 --- a/DesignTools/Primitives/ImageObject3D.cs +++ b/DesignTools/Primitives/ImageObject3D.cs @@ -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); diff --git a/DesignTools/Primitives/PyramidObject3D.cs b/DesignTools/Primitives/PyramidObject3D.cs index d38eeb189..f2f4ddafe 100644 --- a/DesignTools/Primitives/PyramidObject3D.cs +++ b/DesignTools/Primitives/PyramidObject3D.cs @@ -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; diff --git a/Library/Providers/LibraryProviderHelpers.cs b/Library/Providers/LibraryProviderHelpers.cs index c57719c10..cf27377c0 100644 --- a/Library/Providers/LibraryProviderHelpers.cs +++ b/Library/Providers/LibraryProviderHelpers.cs @@ -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 /// The ImageBuffer to resize /// The target width /// The target height - /// A resized ImageBuffer contrained to the given bounds and centered on the new surface + /// A resized ImageBuffer constrained to the given bounds and centered on the new surface public static ImageBuffer ResizeImage(ImageBuffer imageBuffer, int targetWidth, int targetHeight) { var expectedSize = new Vector2((int)(targetWidth * GuiWidget.DeviceScale), (int)(targetHeight * GuiWidget.DeviceScale)); diff --git a/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialStream.cs b/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialStream.cs index a32b294d7..144db84f3 100644 --- a/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialStream.cs +++ b/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialStream.cs @@ -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); diff --git a/MatterControl.Printing/GCode/GCodeMemoryFile.cs b/MatterControl.Printing/GCode/GCodeMemoryFile.cs index 0aec21cff..e3d100f43 100644 --- a/MatterControl.Printing/GCode/GCodeMemoryFile.cs +++ b/MatterControl.Printing/GCode/GCodeMemoryFile.cs @@ -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": diff --git a/PartPreviewWindow/PartPreviewContent.cs b/PartPreviewWindow/PartPreviewContent.cs index 2b40b0f30..36608a750 100644 --- a/PartPreviewWindow/PartPreviewContent.cs +++ b/PartPreviewWindow/PartPreviewContent.cs @@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow double totalSeconds = 0; var textWidgets = updateAvailableButton.Descendants().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() { diff --git a/PartPreviewWindow/StartPage/ExplorePanel.cs b/PartPreviewWindow/StartPage/ExplorePanel.cs index 09cb0aeef..40d975210 100644 --- a/PartPreviewWindow/StartPage/ExplorePanel.cs +++ b/PartPreviewWindow/StartPage/ExplorePanel.cs @@ -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) { diff --git a/PartPreviewWindow/StartPage/ExploreSection.cs b/PartPreviewWindow/StartPage/ExploreSection.cs index d913af76f..f45d46144 100644 --- a/PartPreviewWindow/StartPage/ExploreSection.cs +++ b/PartPreviewWindow/StartPage/ExploreSection.cs @@ -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().FirstOrDefault(); var position = scroll.ScrollPositionFromTop; diff --git a/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs b/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs index 3cf4506f1..56b94098f 100644 --- a/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs +++ b/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs @@ -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) { diff --git a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs index c91a84d1e..5e5c519fc 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs @@ -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() { diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index e090ba0ce..c7d1ff753 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -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 diff --git a/PrinterControls/PrinterConnections/ShowAuthPanel.cs b/PrinterControls/PrinterConnections/ShowAuthPanel.cs index 34057f285..8d7dfd345 100644 --- a/PrinterControls/PrinterConnections/ShowAuthPanel.cs +++ b/PrinterControls/PrinterConnections/ShowAuthPanel.cs @@ -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()); diff --git a/PrinterControls/TerminalWindow/TextScrollWidget.cs b/PrinterControls/TerminalWindow/TextScrollWidget.cs index 6b9de8b2e..f45bd6ebb 100644 --- a/PrinterControls/TerminalWindow/TextScrollWidget.cs +++ b/PrinterControls/TerminalWindow/TextScrollWidget.cs @@ -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); } diff --git a/Queue/QueueData.cs b/Queue/QueueData.cs index 8bbc44c05..289ac1d00 100644 --- a/Queue/QueueData.cs +++ b/Queue/QueueData.cs @@ -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))); } } diff --git a/RootSystemWindow.cs b/RootSystemWindow.cs index 3258038af..7ff20e15c 100644 --- a/RootSystemWindow.cs +++ b/RootSystemWindow.cs @@ -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(); } } diff --git a/SlicerConfiguration/Settings/PrinterSettings.cs b/SlicerConfiguration/Settings/PrinterSettings.cs index dc1839fc4..bbfa4bd81 100644 --- a/SlicerConfiguration/Settings/PrinterSettings.cs +++ b/SlicerConfiguration/Settings/PrinterSettings.cs @@ -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; } diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index b41efd81f..8dba72705 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -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"), diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 8a4dd5ee4..1cab4fbb8 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 8a4dd5ee493dc743a65fdba5dcf53d1cc3e83b76 +Subproject commit 1cab4fbb8e7df0017db29bcab3aec994a6109c26 diff --git a/Tests/MatterControl.AutomationTests/PrintingTests.cs b/Tests/MatterControl.AutomationTests/PrintingTests.cs index 1a757edfe..388e58ebb 100644 --- a/Tests/MatterControl.AutomationTests/PrintingTests.cs +++ b/Tests/MatterControl.AutomationTests/PrintingTests.cs @@ -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(); diff --git a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs index 216138767..26b54adf7 100644 --- a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs @@ -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); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index d8d5c40e2..0571db4eb 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -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; /// - /// Determins if we use actual sytem file dialogs or simulated file dialogs. + /// Determines if we use actual system file dialogs or simulated file dialogs. /// public bool UseAutomationDialogs { get; set; } = true; diff --git a/Tests/MatterControl.Tests/MatterControl/MeshCsgTests.cs b/Tests/MatterControl.Tests/MatterControl/MeshCsgTests.cs index 60bf9869a..199de711b 100644 --- a/Tests/MatterControl.Tests/MatterControl/MeshCsgTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/MeshCsgTests.cs @@ -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); diff --git a/TextCreator/Braille/BrailleGrade2.cs b/TextCreator/Braille/BrailleGrade2.cs index 2ccb172b3..0672015ce 100644 --- a/TextCreator/Braille/BrailleGrade2.cs +++ b/TextCreator/Braille/BrailleGrade2.cs @@ -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); diff --git a/TextCreator/Braille/BrailleGrade2Mapping.cs b/TextCreator/Braille/BrailleGrade2Mapping.cs index 0faf2a770..083ef27ba 100644 --- a/TextCreator/Braille/BrailleGrade2Mapping.cs +++ b/TextCreator/Braille/BrailleGrade2Mapping.cs @@ -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 diff --git a/Utilities/JsonPath.cs b/Utilities/JsonPath.cs index c8b21696d..303eb6bd5 100644 --- a/Utilities/JsonPath.cs +++ b/Utilities/JsonPath.cs @@ -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); diff --git a/Utilities/WebUtilities/RequestManager.cs b/Utilities/WebUtilities/RequestManager.cs index 0b8182a25..26895465d 100644 --- a/Utilities/WebUtilities/RequestManager.cs +++ b/Utilities/WebUtilities/RequestManager.cs @@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl public string LastResponse { protected set; get; } /// - /// Gets or sets the time-out value in milliseconds + /// Gets or sets the time-out value in milliseconds /// /// The timeout. 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;