diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs index 0a9d9d627..60243dc71 100644 --- a/MatterControlLib/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -2048,7 +2048,7 @@ namespace MatterHackers.MatterControl if (SettingsValidation.SettingsValid(printer)) { - // check that current bed temp is is within 10 degrees of leveling temp + // check that current bed temp is within 10 degrees of leveling temp var enabled = printer.Settings.GetValue(SettingsKey.print_leveling_enabled); var required = printer.Settings.GetValue(SettingsKey.print_leveling_required_to_print); if (enabled || required) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs index 4fad9dfa1..45081c0ed 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs @@ -213,7 +213,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling // Allow extrusion at any temperature. S0 only works on Marlin S1 works on repetier and marlin printer.Connection.QueueLine("M302 S1"); - // send a dwel to empty out the current move commands + // send a dwell to empty out the current move commands printer.Connection.QueueLine("G4 P1"); // put in a second one to use as a signal for the first being processed printer.Connection.QueueLine("G4 P1"); diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/UnloadFilamentWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/UnloadFilamentWizard.cs index 749397bd2..e1ea10e54 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/UnloadFilamentWizard.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/UnloadFilamentWizard.cs @@ -131,7 +131,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling // Allow extrusion at any temperature. S0 only works on Marlin S1 works on repetier and marlin printer.Connection.QueueLine("M302 S1"); - // send a dwel to empty out the current move commands + // send a dwell to empty out the current move commands printer.Connection.QueueLine("G4 P1"); // put in a second one to use as a signal for the first being processed printer.Connection.QueueLine("G4 P1"); diff --git a/MatterControlLib/CustomWidgets/ColorPicker/RadialColorPicker.cs b/MatterControlLib/CustomWidgets/ColorPicker/RadialColorPicker.cs index 1d41366af..bcc5f90d6 100644 --- a/MatterControlLib/CustomWidgets/ColorPicker/RadialColorPicker.cs +++ b/MatterControlLib/CustomWidgets/ColorPicker/RadialColorPicker.cs @@ -63,15 +63,15 @@ namespace MatterHackers.MatterControl.CustomWidgets.ColorPicker if (!TriangleToWidgetTransform(0).Transform(new Vector2(1, .5)).Equals(new Vector2(88, 50), .01)) { - //throw new Exception("Incorect transform"); + //throw new Exception("Incorrect transform"); } if (!TriangleToWidgetTransform(0).InverseTransform(new Vector2(88, 50)).Equals(new Vector2(1, .5), .01)) { - //throw new Exception("Incorect transform"); + //throw new Exception("Incorrect transform"); } if (!TriangleToWidgetTransform(0).Transform(new Vector2(0, .5)).Equals(new Vector2(23.13, 50), .01)) { - //throw new Exception("Incorect transform"); + //throw new Exception("Incorrect transform"); } } diff --git a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs index 5076946de..9c08c7313 100644 --- a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs +++ b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs @@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { if (isDirty) { - // doing this durring draw will often result in a enumeration changed + // doing this during draw will often result in a enumeration changed UiThread.RunOnIdle(RebuildContentSection); } diff --git a/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs b/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs index d7664e69e..5c7124575 100644 --- a/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs @@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations } /// - /// Prepare the children of an object tha contains an OpperationSource to be removed + /// Prepare the children of an object that contains an OpperationSource to be removed /// /// internal static void Remove(IObject3D parent) diff --git a/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs index 871e91351..786d680bd 100644 --- a/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/InflatePathObject3D.cs @@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations var path = this.Children.OfType().FirstOrDefault(); if(path == null) { - // cleare our existing data + // clear our existing data VertexSource = new VertexStorage(); return; } diff --git a/MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs index 3909d8de6..54913e500 100644 --- a/MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/SmoothPathObject3D.cs @@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations var path = this.Children.OfType().FirstOrDefault(); if(path == null) { - // cleare our existing data + // clear our existing data VertexSource = new VertexStorage(); return; } diff --git a/MatterControlLib/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs index 4aeb6e793..443ad60c8 100644 --- a/MatterControlLib/DesignTools/PublicPropertyEditor.cs +++ b/MatterControlLib/DesignTools/PublicPropertyEditor.cs @@ -456,7 +456,7 @@ namespace MatterHackers.MatterControl.DesignTools rowContainer = CreateSettingsRow(property, field); } - else // show the subtarct editor for boolean subtract and subtract and replace + else // show the subtract editor for boolean subtract and subtract and replace { rowContainer = CreateSettingsColumn(property); rowContainer.AddChild(CreateSelector(childSelector, property.Item, theme)); diff --git a/MatterControlLib/Library/Widgets/HardwarePage/PrinterDetails.cs b/MatterControlLib/Library/Widgets/HardwarePage/PrinterDetails.cs index bfe0222cf..b2064e2eb 100644 --- a/MatterControlLib/Library/Widgets/HardwarePage/PrinterDetails.cs +++ b/MatterControlLib/Library/Widgets/HardwarePage/PrinterDetails.cs @@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage // Get the printer sid from settings string storeID = null; - // Use the the make-model mapping table + // Use the make-model mapping table if (OemSettings.Instance.OemPrinters.TryGetValue($"{printerInfo.Make}-{ printerInfo.Model}", out StorePrinterID storePrinterID)) { storeID = storePrinterID?.SID; diff --git a/MatterControlLib/Library/Widgets/LibraryWidget.cs b/MatterControlLib/Library/Widgets/LibraryWidget.cs index e708062fd..51d787e27 100644 --- a/MatterControlLib/Library/Widgets/LibraryWidget.cs +++ b/MatterControlLib/Library/Widgets/LibraryWidget.cs @@ -883,7 +883,7 @@ namespace MatterHackers.MatterControl.PrintLibrary Title = "Remove".Localize(), Action = (selectedLibraryItems, listView) => { - // Perviously - deleteFromLibraryButton_Click + // Previously - deleteFromLibraryButton_Click // ask before remove var libraryItems = libraryView.SelectedItems.Select(p => p.Model); diff --git a/MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs b/MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs index 43a587829..8823b1d12 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs @@ -549,7 +549,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow return new HitData(i, 7, faceData.top, connections[faceData.top].Tile(i)); } - // we have found the face we are hiting + // we have found the face we are hitting return new HitData(i, 4); } } diff --git a/MatterControlLib/PrinterCommunication/Drivers/Emulator/Heater.cs b/MatterControlLib/PrinterCommunication/Drivers/Emulator/Heater.cs index 135047b79..74acffa44 100644 --- a/MatterControlLib/PrinterCommunication/Drivers/Emulator/Heater.cs +++ b/MatterControlLib/PrinterCommunication/Drivers/Emulator/Heater.cs @@ -115,7 +115,7 @@ namespace MatterHackers.PrinterEmulator #region EPositions data /// - /// The absolute eposition from the time the emulator was started. + /// The absolute e-position from the time the emulator was started. /// never resets with G92 /// public double AbsoluteEPosition { get; set; } = 0; diff --git a/MatterControlLib/PrinterCommunication/Io/GCodeSwitcher.cs b/MatterControlLib/PrinterCommunication/Io/GCodeSwitcher.cs index 277ef5691..1c6e65bc0 100644 --- a/MatterControlLib/PrinterCommunication/Io/GCodeSwitcher.cs +++ b/MatterControlLib/PrinterCommunication/Io/GCodeSwitcher.cs @@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io // see if there is a layer height that is compatible in the new gcode for (int i = 0; i < switchToGCode.LayerCount; i++) { - // find the first layer in the new code that is greater than or eaqual to our current height + // find the first layer in the new code that is greater than or equal to our current height var switchBottom = switchToGCode.GetLayerBottom(i); if (switchBottom >= currentBottom) { diff --git a/MatterControlLib/PrinterCommunication/Io/ProcessWriteRegExStream.cs b/MatterControlLib/PrinterCommunication/Io/ProcessWriteRegExStream.cs index a1784156b..064a1ce73 100644 --- a/MatterControlLib/PrinterCommunication/Io/ProcessWriteRegExStream.cs +++ b/MatterControlLib/PrinterCommunication/Io/ProcessWriteRegExStream.cs @@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io GCodeFile.GetFirstNumberAfter("Z", lineToSend, ref this.currentMove.position.Z); GCodeFile.GetFirstNumberAfter("E", lineToSend, ref this.currentMove.extrusion); - // tell the steam pipline what the actual printer position is + // tell the steam pipeline what the actual printer position is this.SetPrinterPosition(this.currentMove); } diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index 4a3e76306..83676995e 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -1023,7 +1023,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication } /// - /// Disable the currently acive printer connection and job if it is being actively controled by MC + /// Disable the currently active printer connection and job if it is being actively controlled by MC /// If we are observing an SD card print, do nothing. /// public void Disable() @@ -1031,7 +1031,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication if(this.CommunicationState == CommunicationStates.PrintingFromSd || (this.PrinterIsPaused && this.PrePauseCommunicationState == CommunicationStates.PrintingFromSd)) { - // don't turn off anything if we are prnting from sd + // don't turn off anything if we are printing from sd return; } @@ -2240,19 +2240,19 @@ namespace MatterHackers.MatterControl.PrinterCommunication { if (lineBeingSetToPrinter.StartsWith("G28")) { - // don't time the homing opperation + // don't time the homing operation timeSinceStartedPrint.Stop(); DetailedPrintingState = DetailedPrintingState.HomingAxis; } else if (waitForTempStream7?.HeatingBed ?? false) { - // don't time the heating bed opperation opperation + // don't time the heating bed operation timeSinceStartedPrint.Stop(); DetailedPrintingState = DetailedPrintingState.HeatingBed; } else if (waitForTempStream7?.HeatingExtruder ?? false) { - // don't time the heating extruder opperation opperation + // don't time the heating extruder operation timeSinceStartedPrint.Stop(); DetailedPrintingState = DetailedPrintingState.HeatingExtruder; } diff --git a/MatterControlLib/SettingsManagement/UserSettings.cs b/MatterControlLib/SettingsManagement/UserSettings.cs index 871f1a575..fd06fed6e 100644 --- a/MatterControlLib/SettingsManagement/UserSettings.cs +++ b/MatterControlLib/SettingsManagement/UserSettings.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl public const string ThemeName = nameof(ThemeName); public const string ThumbnailRenderingMode = nameof(ThumbnailRenderingMode); public const string UpdateFeedType = nameof(UpdateFeedType); - public const string ShownWelcomMessage = nameof(ShownWelcomMessage); + public const string ShownWelcomeMessage = nameof(ShownWelcomeMessage); } public class UserSettings diff --git a/MatterControlLib/SetupWizard/WelcomPage.cs b/MatterControlLib/SetupWizard/WelcomePage.cs similarity index 95% rename from MatterControlLib/SetupWizard/WelcomPage.cs rename to MatterControlLib/SetupWizard/WelcomePage.cs index 379b41ddf..62db07aa6 100644 --- a/MatterControlLib/SetupWizard/WelcomPage.cs +++ b/MatterControlLib/SetupWizard/WelcomePage.cs @@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl this.HeaderText = "Welcome to MatterControl".Localize(); - var welcome = @"Thank you for installing MatterControl. We are excited to help you bring your ideas to life. This new version includes hundreds of improvmets and new features. + var welcome = @"Thank you for installing MatterControl. We are excited to help you bring your ideas to life. This new version includes hundreds of improvements and new features. Features: • Simple Setup @@ -87,7 +87,7 @@ Click 'Next' to for a quick tour of the interface"; public override void OnClosed(EventArgs e) { - UserSettings.Instance.set(UserSettingsKey.ShownWelcomMessage, "true"); + UserSettings.Instance.set(UserSettingsKey.ShownWelcomeMessage, "true"); base.OnClosed(e); } diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs index 425d7625a..43c4ba50c 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs @@ -101,7 +101,7 @@ namespace Markdig.Renderers UiThread.RunOnIdle(() => { // TODO: investigate why this is required, layout should have already done this - // but it didn't. markdown that looks like the following will not laout correctly without this + // but it didn't. markdown that looks like the following will not layout correctly without this // string badLayoutMarkdown = "I [s]()\n\nT"; if (RootWidget?.Parent?.Parent != null) { diff --git a/Program.cs b/Program.cs index 1099e8727..ed1ef3aee 100644 --- a/Program.cs +++ b/Program.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture; CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture; - // make sure we can bulid a system relevant serial port + // make sure we can build a system relevant serial port FrostedSerialPortFactory.GetPlatformSerialPort = (serialPortName) => { return new CSharpSerialPortWrapper(serialPortName); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index d2dbc0f13..0a9d021af 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit d2dbc0f1321aa252a2cb08d03da12a0b13fb2201 +Subproject commit 0a9d021afbe4fefde8be7d93e9ded79217e9fe3c diff --git a/Tests/MatterControl.AutomationTests/PrintingTests.cs b/Tests/MatterControl.AutomationTests/PrintingTests.cs index 5850e2ee3..899d931db 100644 --- a/Tests/MatterControl.AutomationTests/PrintingTests.cs +++ b/Tests/MatterControl.AutomationTests/PrintingTests.cs @@ -141,7 +141,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.CancelPrint(); - // now modify the leveling data manualy and assert that it is applied when printing + // now modify the leveling data manually and assert that it is applied when printing testRunner.SwitchToControlsTab(); testRunner.ClickByName("Edit Leveling Data Button"); for(int i=0; i<3; i++) diff --git a/Tests/MatterControl.AutomationTests/ReSliceTests.cs b/Tests/MatterControl.AutomationTests/ReSliceTests.cs index c31389976..62c7946ed 100644 --- a/Tests/MatterControl.AutomationTests/ReSliceTests.cs +++ b/Tests/MatterControl.AutomationTests/ReSliceTests.cs @@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.Tests.Automation } double printerRetraction = 7 + .1; // the airwolf has a retraction of 7 mm Assert.GreaterOrEqual(delta, -printerRetraction, "We should never move back more than the retraction amount"); - Assert.GreaterOrEqual(emulator.CurrentExtruder.AbsoluteEPosition, largestAbsoluteEPosition - printerRetraction, "Never go back more than the retaction amount"); + Assert.GreaterOrEqual(emulator.CurrentExtruder.AbsoluteEPosition, largestAbsoluteEPosition - printerRetraction, "Never go back more than the retraction amount"); Assert.LessOrEqual(emulator.CurrentExtruder.AbsoluteEPosition, lastAbsoluteEPostion + 10, "We should never move up more than 10 mm"); lastAbsoluteEPostion = emulator.CurrentExtruder.AbsoluteEPosition; }; @@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl.Tests.Automation // Wait for done testRunner.WaitForPrintFinished(); - // this will make sure we turned off line spliting and had good data about the extruder position + // this will make sure we turned off line splitting and had good data about the extruder position Assert.AreEqual(-7, largestRetraction, "Airwolf HD has a retraction of 7mm, make sure we had one"); }