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

Moved ImageIO into a plugin and hooked then made the windows version of that.

Browse source
This commit is contained in:
larsbrubaker 2014-06-19 15:55:20 -07:00
parent 7d8382f15b
commit 254de7251d
20 changed files with 92 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -41,12 +41,12 @@ using System.Linq;
using System.Runtime.InteropServices;
using System.Threading;
using MatterHackers.Agg;
using MatterHackers.Agg.PlatfromAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.GCodeVisualizer;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrinterCommunication.Io;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.SerialPortCommunication;
@ -1230,11 +1230,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication
//Function is not mac-friendly
bool SerialPortAlreadyOpen(string portName)
{
if (MatterHackers.Agg.UI.WindowsFormsAbstract.GetOSType () == WindowsFormsAbstract.OSType.Mac)
if (OsInformation.GetOSType() == OsInformation.OSType.Mac)
{
return false;
}
else if (MatterHackers.Agg.UI.WindowsFormsAbstract.GetOSType () == WindowsFormsAbstract.OSType.X11)
else if (OsInformation.GetOSType() == OsInformation.OSType.X11)
{
return false;
}