diff --git a/MatterControl.Printing/GCode/GCodeFile.cs b/MatterControl.Printing/GCode/GCodeFile.cs index 74f90ea60..e08ff0e72 100644 --- a/MatterControl.Printing/GCode/GCodeFile.cs +++ b/MatterControl.Printing/GCode/GCodeFile.cs @@ -183,7 +183,7 @@ namespace MatterHackers.GCodeVisualizer } else { - return new GCodeFileLoaded(fileName); + return new GCodeMemoryFile(fileName); } } diff --git a/MatterControl.Printing/GCode/GCodeFileLoaded.cs b/MatterControl.Printing/GCode/GCodeMemoryFile.cs similarity index 97% rename from MatterControl.Printing/GCode/GCodeFileLoaded.cs rename to MatterControl.Printing/GCode/GCodeMemoryFile.cs index 371715181..4c5dd5d1f 100644 --- a/MatterControl.Printing/GCode/GCodeFileLoaded.cs +++ b/MatterControl.Printing/GCode/GCodeMemoryFile.cs @@ -39,7 +39,7 @@ using MatterHackers.VectorMath; namespace MatterHackers.GCodeVisualizer { - public class GCodeFileLoaded : GCodeFile + public class GCodeMemoryFile : GCodeFile { private double amountOfAccumulatedEWhileParsing = 0; @@ -55,12 +55,12 @@ namespace MatterHackers.GCodeVisualizer private List GCodeCommandQueue = new List(); - public GCodeFileLoaded(bool gcodeHasExplicitLayerChangeInfo = false) + public GCodeMemoryFile(bool gcodeHasExplicitLayerChangeInfo = false) { this.gcodeHasExplicitLayerChangeInfo = gcodeHasExplicitLayerChangeInfo; } - public GCodeFileLoaded(string pathAndFileName, bool gcodeHasExplicitLayerChangeInfo = false) + public GCodeMemoryFile(string pathAndFileName, bool gcodeHasExplicitLayerChangeInfo = false) { this.gcodeHasExplicitLayerChangeInfo = gcodeHasExplicitLayerChangeInfo; this.Load(pathAndFileName); @@ -104,9 +104,9 @@ namespace MatterHackers.GCodeVisualizer return ParseFileContents(gcodeContents, null); } - public static GCodeFileLoaded Load(Stream fileStream) + public static GCodeMemoryFile Load(Stream fileStream) { - GCodeFileLoaded loadedGCode = null; + GCodeMemoryFile loadedGCode = null; try { string gCodeString = ""; @@ -125,7 +125,7 @@ namespace MatterHackers.GCodeVisualizer return loadedGCode; } - public static async Task LoadInBackground(string fileName, ReportProgressRatio progressReporter) + public static async Task LoadInBackground(string fileName, ReportProgressRatio progressReporter) { if (Path.GetExtension(fileName).ToUpper() == ".GCODE") { @@ -156,7 +156,7 @@ namespace MatterHackers.GCodeVisualizer { using (StreamReader streamReader = new StreamReader(fileStream)) { - GCodeFileLoaded loadedFile = GCodeFileLoaded.Load(streamReader.BaseStream); + GCodeMemoryFile loadedFile = GCodeMemoryFile.Load(streamReader.BaseStream); this.indexOfChangeInZ = loadedFile.indexOfChangeInZ; this.center = loadedFile.center; @@ -198,7 +198,7 @@ namespace MatterHackers.GCodeVisualizer return crCount + 1; } - public static GCodeFileLoaded ParseFileContents(string gCodeString, ReportProgressRatio progressReporter) + public static GCodeMemoryFile ParseFileContents(string gCodeString, ReportProgressRatio progressReporter) { if (gCodeString == null) { @@ -217,7 +217,7 @@ namespace MatterHackers.GCodeVisualizer gcodeHasExplicitLayerChangeInfo = true; } - GCodeFileLoaded loadedGCodeFile = new GCodeFileLoaded(gcodeHasExplicitLayerChangeInfo); + GCodeMemoryFile loadedGCodeFile = new GCodeMemoryFile(gcodeHasExplicitLayerChangeInfo); int crCount = CountNumLines(gCodeString); int lineIndex = 0; diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj index 63dc40a24..c439ebf8a 100644 --- a/MatterControl.Printing/MatterControl.Printing.csproj +++ b/MatterControl.Printing/MatterControl.Printing.csproj @@ -43,7 +43,7 @@ - + diff --git a/PartPreviewWindow/GCode2DWidget.cs b/PartPreviewWindow/GCode2DWidget.cs index dc803c72c..f2e41bc44 100644 --- a/PartPreviewWindow/GCode2DWidget.cs +++ b/PartPreviewWindow/GCode2DWidget.cs @@ -415,7 +415,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // TODO: The bulk of this should move to the data model rather than in this widget public async void LoadInBackground(string gcodePathAndFileName) { - printer.BedPlate.LoadedGCode = await GCodeFileLoaded.LoadInBackground(gcodePathAndFileName, this.progressReporter); + printer.BedPlate.LoadedGCode = await GCodeMemoryFile.LoadInBackground(gcodePathAndFileName, this.progressReporter); if (loadedGCode == null) { diff --git a/PrinterCommunication/PrinterConnection.cs b/PrinterCommunication/PrinterConnection.cs index 4d2bfa093..72040ee2b 100644 --- a/PrinterCommunication/PrinterConnection.cs +++ b/PrinterCommunication/PrinterConnection.cs @@ -216,7 +216,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication private DataViewGraph sendTimeAfterOkGraph; - private GCodeFile loadedGCode = new GCodeFileLoaded(); + private GCodeFile loadedGCode = new GCodeMemoryFile(); private GCodeFileStream gCodeFileStream0 = null; private PauseHandlingStream pauseHandlingStream1 = null; diff --git a/Queue/OptionsMenu/ExportToFolderProcess.cs b/Queue/OptionsMenu/ExportToFolderProcess.cs index 84fc8c535..3c5aaab1d 100644 --- a/Queue/OptionsMenu/ExportToFolderProcess.cs +++ b/Queue/OptionsMenu/ExportToFolderProcess.cs @@ -190,7 +190,7 @@ namespace MatterHackers.MatterControl.PrintQueue if (ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) { - GCodeFileLoaded unleveledGCode = new GCodeFileLoaded(savedGcodeFileName); + GCodeMemoryFile unleveledGCode = new GCodeMemoryFile(savedGcodeFileName); for (int j = 0; j < unleveledGCode.LineCount; j++) {