diff --git a/ApplicationView/PrinterModels.cs b/ApplicationView/PrinterModels.cs index 16db1e873..a64773078 100644 --- a/ApplicationView/PrinterModels.cs +++ b/ApplicationView/PrinterModels.cs @@ -32,6 +32,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Threading.Tasks; +using MatterControl.Printing; using MatterHackers.Agg.UI; using MatterHackers.MatterControl.DataStorage; using MatterHackers.MatterControl.PrintQueue; diff --git a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs index bc2400324..397083b16 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs @@ -27,13 +27,12 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using System.Collections.Generic; +using MatterControl.Printing; using MatterHackers.Agg; -using MatterHackers.GCodeVisualizer; using MatterHackers.Localizations; using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.VectorMath; -using System.Collections.Generic; -using MatterHackers.MatterControl.PrinterCommunication; namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling { diff --git a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs index 1989807d6..d1f22d19b 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs @@ -27,15 +27,14 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.Agg; -using MatterHackers.GCodeVisualizer; -using MatterHackers.Localizations; -using MatterHackers.MatterControl.PrinterCommunication; -using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.VectorMath; using System; using System.Collections.Generic; using System.Text; +using MatterControl.Printing; +using MatterHackers.Agg; +using MatterHackers.Localizations; +using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling { diff --git a/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs b/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs index 0eba6aac7..5874b1588 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs @@ -27,17 +27,15 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using System; +using System.Collections.Generic; +using System.Text; +using MatterControl.Printing; using MatterHackers.Agg; -using MatterHackers.GCodeVisualizer; using MatterHackers.Localizations; -using MatterHackers.MatterControl.PrinterCommunication; using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling { diff --git a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs index d96b9c0e6..dec659bdd 100644 --- a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs +++ b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs @@ -27,6 +27,7 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.GCodeVisualizer; diff --git a/Library/Export/GCodeExport.cs b/Library/Export/GCodeExport.cs index fc157289e..d1f184c25 100644 --- a/Library/Export/GCodeExport.cs +++ b/Library/Export/GCodeExport.cs @@ -33,6 +33,7 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; +using MatterControl.Printing; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs index 111a1309e..49857e195 100644 --- a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs +++ b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs @@ -29,6 +29,7 @@ either expressed or implied, of the FreeBSD Project. using System; using System.Collections.Generic; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.RenderOpenGl; diff --git a/MatterControl.Printing/GCode/GCodeFile.cs b/MatterControl.Printing/GCode/GCodeFile.cs index 28703b070..e10c7c394 100644 --- a/MatterControl.Printing/GCode/GCodeFile.cs +++ b/MatterControl.Printing/GCode/GCodeFile.cs @@ -26,18 +26,15 @@ The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using System; +using System.IO; +using System.Threading; using MatterHackers.Agg; using MatterHackers.VectorMath; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Threading.Tasks; -using System.Threading; -namespace MatterHackers.GCodeVisualizer +namespace MatterControl.Printing { - public abstract class GCodeFile + public abstract class GCodeFile { private static readonly Vector4 MaxAccelerationMmPerS2 = new Vector4(1000, 1000, 100, 5000); private static readonly Vector4 MaxVelocityMmPerS = new Vector4(500, 500, 5, 25); diff --git a/MatterControl.Printing/GCode/GCodeFileStreamed.cs b/MatterControl.Printing/GCode/GCodeFileStreamed.cs index bd7d203b1..ab1404b35 100644 --- a/MatterControl.Printing/GCode/GCodeFileStreamed.cs +++ b/MatterControl.Printing/GCode/GCodeFileStreamed.cs @@ -33,7 +33,7 @@ using MatterHackers.VectorMath; using System; using System.IO; -namespace MatterHackers.GCodeVisualizer +namespace MatterControl.Printing { public class GCodeFileStreamed : GCodeFile { diff --git a/MatterControl.Printing/GCode/GCodeMemoryFile.cs b/MatterControl.Printing/GCode/GCodeMemoryFile.cs index a7e7a9c15..04a9ea4bb 100644 --- a/MatterControl.Printing/GCode/GCodeMemoryFile.cs +++ b/MatterControl.Printing/GCode/GCodeMemoryFile.cs @@ -38,7 +38,7 @@ using System.Threading.Tasks; using MatterHackers.Agg; using MatterHackers.VectorMath; -namespace MatterHackers.GCodeVisualizer +namespace MatterControl.Printing { public class GCodeMemoryFile : GCodeFile { diff --git a/MatterControl.Printing/GCode/PrinterMachineInstruction.cs b/MatterControl.Printing/GCode/PrinterMachineInstruction.cs index a9565df47..89e792c74 100644 --- a/MatterControl.Printing/GCode/PrinterMachineInstruction.cs +++ b/MatterControl.Printing/GCode/PrinterMachineInstruction.cs @@ -30,7 +30,7 @@ either expressed or implied, of the FreeBSD Project. using MatterHackers.VectorMath; using System.Text; -namespace MatterHackers.GCodeVisualizer +namespace MatterControl.Printing { public class PrinterMachineInstruction { diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index c25fb35a1..d86bb333c 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -28,23 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using MatterHackers.Agg; -using MatterHackers.Agg.Platform; -using MatterHackers.Agg.UI; -using MatterHackers.DataConverters3D; -using MatterHackers.MatterControl.DataStorage; -using MatterHackers.MatterControl.PluginSystem; -using MatterHackers.MatterControl.PrinterControls.PrinterConnections; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.RenderOpenGl.OpenGl; +using MatterControl.Printing; namespace MatterHackers.MatterControl { @@ -70,7 +54,7 @@ namespace MatterHackers.MatterControl public static void CheckKnownAssemblyConditionalCompSymbols() { MatterControlApplication.AssertDebugNotDefined(); - MatterHackers.GCodeVisualizer.GCodeFile.AssertDebugNotDefined(); + GCodeFile.AssertDebugNotDefined(); MatterHackers.Agg.Graphics2D.AssertDebugNotDefined(); MatterHackers.Agg.UI.SystemWindow.AssertDebugNotDefined(); MatterHackers.Agg.ImageProcessing.InvertLightness.AssertDebugNotDefined(); diff --git a/PartPreviewWindow/GCode2DWidget.cs b/PartPreviewWindow/GCode2DWidget.cs index 6f3f1e019..5d3b85360 100644 --- a/PartPreviewWindow/GCode2DWidget.cs +++ b/PartPreviewWindow/GCode2DWidget.cs @@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using System; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.Agg.Transform; using MatterHackers.Agg.UI; diff --git a/PartPreviewWindow/GCodeDetails.cs b/PartPreviewWindow/GCodeDetails.cs index 0d731087f..3070a64e8 100644 --- a/PartPreviewWindow/GCodeDetails.cs +++ b/PartPreviewWindow/GCodeDetails.cs @@ -27,7 +27,7 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.GCodeVisualizer; +using MatterControl.Printing; using MatterHackers.MatterControl.SlicerConfiguration; namespace MatterHackers.MatterControl.PartPreviewWindow diff --git a/PartPreviewWindow/PrinterTabPage.cs b/PartPreviewWindow/PrinterTabPage.cs index 7b686b192..99eac2622 100644 --- a/PartPreviewWindow/PrinterTabPage.cs +++ b/PartPreviewWindow/PrinterTabPage.cs @@ -30,12 +30,12 @@ either expressed or implied, of the FreeBSD Project. using System; using System.IO; using System.Linq; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.Agg.ImageProcessing; using MatterHackers.Agg.OpenGlGui; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; -using MatterHackers.GCodeVisualizer; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PrinterCommunication; @@ -239,8 +239,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow && printer?.ViewState.ViewMode != PartViewMode.Layers2D; } - private GCodeFile loadedGCode => sceneContext.LoadedGCode; - private void BedPlate_LoadedGCodeChanged(object sender, EventArgs e) { bool gcodeLoaded = sceneContext.LoadedGCode != null; diff --git a/PartPreviewWindow/SpeedsLegend.cs b/PartPreviewWindow/SpeedsLegend.cs index da170cc2b..aa49eb5c1 100644 --- a/PartPreviewWindow/SpeedsLegend.cs +++ b/PartPreviewWindow/SpeedsLegend.cs @@ -30,6 +30,7 @@ either expressed or implied, of the FreeBSD Project. using System; using System.Collections.Generic; using System.Linq; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.GCodeVisualizer; diff --git a/PartPreviewWindow/View3D/SliceProgressReporter.cs b/PartPreviewWindow/View3D/SliceProgressReporter.cs index f68b7e197..55e99a9f1 100644 --- a/PartPreviewWindow/View3D/SliceProgressReporter.cs +++ b/PartPreviewWindow/View3D/SliceProgressReporter.cs @@ -28,8 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using System; -using System.Diagnostics; -using MatterHackers.GCodeVisualizer; +using MatterControl.Printing; using MatterHackers.Agg; namespace MatterHackers.MatterControl.PartPreviewWindow diff --git a/PrinterCommunication/Io/BabyStepsStream.cs b/PrinterCommunication/Io/BabyStepsStream.cs index b92a0636a..d51dbe772 100644 --- a/PrinterCommunication/Io/BabyStepsStream.cs +++ b/PrinterCommunication/Io/BabyStepsStream.cs @@ -28,8 +28,8 @@ either expressed or implied, of the FreeBSD Project. */ using System; +using MatterControl.Printing; using MatterHackers.Agg; -using MatterHackers.GCodeVisualizer; using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.VectorMath; diff --git a/PrinterCommunication/Io/ExtrusionMultiplyerStream.cs b/PrinterCommunication/Io/ExtrusionMultiplyerStream.cs index f4996baee..abedd1838 100644 --- a/PrinterCommunication/Io/ExtrusionMultiplyerStream.cs +++ b/PrinterCommunication/Io/ExtrusionMultiplyerStream.cs @@ -27,11 +27,7 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using System; -using MatterHackers.Agg.UI; -using MatterHackers.GCodeVisualizer; -using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.VectorMath; +using MatterControl.Printing; namespace MatterHackers.MatterControl.PrinterCommunication.Io { diff --git a/PrinterCommunication/Io/GCodeFileStream.cs b/PrinterCommunication/Io/GCodeFileStream.cs index d83b8eaf6..253d383f9 100644 --- a/PrinterCommunication/Io/GCodeFileStream.cs +++ b/PrinterCommunication/Io/GCodeFileStream.cs @@ -27,7 +27,7 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.GCodeVisualizer; +using MatterControl.Printing; namespace MatterHackers.MatterControl.PrinterCommunication.Io { diff --git a/PrinterCommunication/Io/GCodeStream.cs b/PrinterCommunication/Io/GCodeStream.cs index 25fd772af..a3d9d0c9d 100644 --- a/PrinterCommunication/Io/GCodeStream.cs +++ b/PrinterCommunication/Io/GCodeStream.cs @@ -29,7 +29,7 @@ either expressed or implied, of the FreeBSD Project. using System; using System.Text; -using MatterHackers.GCodeVisualizer; +using MatterControl.Printing; using MatterHackers.MatterControl.SlicerConfiguration; namespace MatterHackers.MatterControl.PrinterCommunication.Io diff --git a/PrinterCommunication/Io/PauseHandlingStream.cs b/PrinterCommunication/Io/PauseHandlingStream.cs index 3b7ced034..91f7aca3a 100644 --- a/PrinterCommunication/Io/PauseHandlingStream.cs +++ b/PrinterCommunication/Io/PauseHandlingStream.cs @@ -27,16 +27,16 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.Agg; -using MatterHackers.Agg.UI; -using MatterHackers.GCodeVisualizer; -using MatterHackers.Localizations; -using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.VectorMath; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using MatterControl.Printing; +using MatterHackers.Agg; +using MatterHackers.Agg.UI; +using MatterHackers.Localizations; +using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.PrinterCommunication.Io { diff --git a/PrinterCommunication/Io/PrintLevelingStream.cs b/PrinterCommunication/Io/PrintLevelingStream.cs index 264fbed5e..c12092a04 100644 --- a/PrinterCommunication/Io/PrintLevelingStream.cs +++ b/PrinterCommunication/Io/PrintLevelingStream.cs @@ -28,11 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using System; -using MatterHackers.Agg; -using MatterHackers.GCodeVisualizer; -using MatterHackers.VectorMath; -using System.Text; -using System.Collections.Generic; +using MatterControl.Printing; using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; using MatterHackers.MatterControl.SlicerConfiguration; diff --git a/PrinterCommunication/Io/PrintRecoveryStream.cs b/PrinterCommunication/Io/PrintRecoveryStream.cs index f5be2a930..31f54224c 100644 --- a/PrinterCommunication/Io/PrintRecoveryStream.cs +++ b/PrinterCommunication/Io/PrintRecoveryStream.cs @@ -27,11 +27,9 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using System; -using MatterHackers.GCodeVisualizer; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.MatterControl.PrinterControls; using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.PrinterCommunication.Io diff --git a/PrinterCommunication/Io/WaitForTempStream.cs b/PrinterCommunication/Io/WaitForTempStream.cs index 5c65d3673..25b3b8fb5 100644 --- a/PrinterCommunication/Io/WaitForTempStream.cs +++ b/PrinterCommunication/Io/WaitForTempStream.cs @@ -30,7 +30,7 @@ either expressed or implied, of the FreeBSD Project. using System; using System.Diagnostics; using System.Threading; -using MatterHackers.GCodeVisualizer; +using MatterControl.Printing; namespace MatterHackers.MatterControl.PrinterCommunication.Io { diff --git a/PrinterCommunication/PrinterConnection.cs b/PrinterCommunication/PrinterConnection.cs index 6fe9094c5..605ad452d 100644 --- a/PrinterCommunication/PrinterConnection.cs +++ b/PrinterCommunication/PrinterConnection.cs @@ -38,8 +38,8 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; +using MatterControl.Printing; using MatterHackers.Agg; -using MatterHackers.GCodeVisualizer; using MatterHackers.MatterControl.DataStorage; using MatterHackers.MatterControl.PrinterCommunication.Io; using MatterHackers.MatterControl.PrinterControls.PrinterConnections; diff --git a/PrinterControls/PrintLevelingPlane.cs b/PrinterControls/PrintLevelingPlane.cs index ed5081fbf..3effeab1a 100644 --- a/PrinterControls/PrintLevelingPlane.cs +++ b/PrinterControls/PrintLevelingPlane.cs @@ -1,7 +1,6 @@ -using MatterHackers.GCodeVisualizer; -using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; +using System; +using MatterControl.Printing; using MatterHackers.VectorMath; -using System; namespace MatterHackers.MatterControl { diff --git a/Queue/OptionsMenu/ExportToFolderProcess.cs b/Queue/OptionsMenu/ExportToFolderProcess.cs index 98f075052..d0b8b025d 100644 --- a/Queue/OptionsMenu/ExportToFolderProcess.cs +++ b/Queue/OptionsMenu/ExportToFolderProcess.cs @@ -31,6 +31,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Threading; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.DataConverters3D; using MatterHackers.GCodeVisualizer; diff --git a/Tests/MatterControl.Tests/MatterControl/GCodeStreamTests.cs b/Tests/MatterControl.Tests/MatterControl/GCodeStreamTests.cs index 739174f17..4efd73dea 100644 --- a/Tests/MatterControl.Tests/MatterControl/GCodeStreamTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/GCodeStreamTests.cs @@ -29,11 +29,10 @@ either expressed or implied, of the FreeBSD Project. using System.Collections.Generic; using System.Diagnostics; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.Agg.Platform; -using MatterHackers.GCodeVisualizer; using MatterHackers.MatterControl; -using MatterHackers.MatterControl.PrinterCommunication; using MatterHackers.MatterControl.PrinterCommunication.Io; using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.MatterControl.Tests.Automation; diff --git a/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs b/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs index 0fcb5d358..eb5f65ba6 100644 --- a/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs @@ -27,14 +27,6 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using System.Collections.Generic; -using MatterHackers.Agg; -using MatterHackers.Agg.Platform; -using MatterHackers.GCodeVisualizer; -using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; -using MatterHackers.MatterControl.SlicerConfiguration; -using MatterHackers.MatterControl.Tests.Automation; -using MatterHackers.VectorMath; using NUnit.Framework; namespace MatterControl.Tests.MatterControl diff --git a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs index 8d75d216f..923b80257 100644 --- a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs @@ -28,9 +28,9 @@ either expressed or implied, of the FreeBSD Project. */ using System.Collections.Generic; +using MatterControl.Printing; using MatterHackers.Agg; using MatterHackers.Agg.Platform; -using MatterHackers.GCodeVisualizer; using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.MatterControl.Tests.Automation;