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

Change the namespace of PrinterCommunication and the class name.

Browse source 
Deleted lots of unused usings.
Working to get the 2point leveling working.
Started work on a new printer io layer
Fixed the crash on disconnect while printing.
This commit is contained in:
larsbrubaker 2014-06-11 14:52:58 -07:00
parent e6a1cabadf
commit 0e646dca68
50 changed files with 571 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/ActiveSliceSettings.cs
View file

@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
PrintLevelingData levelingData = PrintLevelingData.GetForPrinter(ActivePrinterProfile.Instance.ActivePrinter);
PrintLeveling.Instance.SetPrintLevelingEquation(
PrintLevelingPlane.Instance.SetPrintLevelingEquation(
levelingData.sampledPosition0,
levelingData.sampledPosition1,
levelingData.sampledPosition2,

7
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -34,9 +34,8 @@ using MatterHackers.Agg.Font;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.VertexSource;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.VectorMath;
using MatterHackers.MatterControl;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
@ -276,9 +275,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
event EventHandler unregisterEvents;
private void AddHandlers()
{
PrinterCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
ActivePrinterProfile.Instance.ActivePrinterChanged.RegisterEvent(APP_onPrinterStatusChanged, ref unregisterEvents);
PrinterCommunication.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
}
public override void OnClosed(EventArgs e)

15
SlicerConfiguration/SlicingQueue.cs
View file

@ -29,20 +29,17 @@ either expressed or implied, of the FreeBSD Project.
//#define RUN_MATTER_SLICE_IN_PROCESS
using System;
using System.IO;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Runtime.InteropServices;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading;
using MatterHackers.Agg;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrintQueue;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
@ -200,7 +197,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
while (!haltSlicingThread)
{
if (PrinterCommunication.Instance.ActivePrintItem != null && listOfSlicingItems.Count > 0)
if (PrinterConnectionAndCommunication.Instance.ActivePrintItem != null && listOfSlicingItems.Count > 0)
{
PrintItemWrapper itemToSlice = listOfSlicingItems[0];
// check that the STL file is currently on disk