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

Move Printing objects from GCodeVisualizer namespace to MC.Printing

Browse source
This commit is contained in:
John Lewin 2018-01-05 12:44:57 -08:00
parent 38e2aa55f7
commit f5d31e7d29
31 changed files with 49 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ApplicationView/PrinterModels.cs
View file

@ -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;

5
ConfigurationPage/PrintLeveling/LevelWizard3Point.cs
View file

@ -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
{

11
ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs
View file

@ -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
{

10
ConfigurationPage/PrintLeveling/LevelWizardMesh.cs
View file

@ -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
{

1
ConfigurationPage/PrintLeveling/PrintLevelPages.cs
View file

@ -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;

1
Library/Export/GCodeExport.cs
View file

@ -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;

1
MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
View file

@ -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;

13
MatterControl.Printing/GCode/GCodeFile.cs
View file

@ -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);

2
MatterControl.Printing/GCode/GCodeFileStreamed.cs
View file

@ -33,7 +33,7 @@ using MatterHackers.VectorMath;
using System;
using System.IO;
namespace MatterHackers.GCodeVisualizer
namespace MatterControl.Printing
{
public class GCodeFileStreamed : GCodeFile
{

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

@ -38,7 +38,7 @@ using System.Threading.Tasks;
using MatterHackers.Agg;
using MatterHackers.VectorMath;
namespace MatterHackers.GCodeVisualizer
namespace MatterControl.Printing
{
public class GCodeMemoryFile : GCodeFile
{

2
MatterControl.Printing/GCode/PrinterMachineInstruction.cs
View file

@ -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
{

20
MatterControlApplication.cs
View file

@ -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();

1
PartPreviewWindow/GCode2DWidget.cs
View file

@ -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;

2
PartPreviewWindow/GCodeDetails.cs
View file

@ -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

4
PartPreviewWindow/PrinterTabPage.cs
View file

@ -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;

1
PartPreviewWindow/SpeedsLegend.cs
View file

@ -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;

3
PartPreviewWindow/View3D/SliceProgressReporter.cs
View file

@ -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

2
PrinterCommunication/Io/BabyStepsStream.cs
View file

@ -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;

6
PrinterCommunication/Io/ExtrusionMultiplyerStream.cs
View file

@ -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
{

2
PrinterCommunication/Io/GCodeFileStream.cs
View file

@ -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
{

2
PrinterCommunication/Io/GCodeStream.cs
View file

@ -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

12
PrinterCommunication/Io/PauseHandlingStream.cs
View file

@ -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
{

6
PrinterCommunication/Io/PrintLevelingStream.cs
View file

@ -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;

4
PrinterCommunication/Io/PrintRecoveryStream.cs
View file

@ -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

2
PrinterCommunication/Io/WaitForTempStream.cs
View file

@ -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
{

2
PrinterCommunication/PrinterConnection.cs
View file

@ -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;

5
PrinterControls/PrintLevelingPlane.cs
View file

@ -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
{

1
Queue/OptionsMenu/ExportToFolderProcess.cs
View file

@ -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;

3
Tests/MatterControl.Tests/MatterControl/GCodeStreamTests.cs
View file

@ -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;

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

@ -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

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

@ -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;