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

Platform providers

Browse source 
- New Provider model
- Remove WindowsFileDialogs project
- Remove PlatformAbstract assembly, use AggContext
- Rename OsInformation to OperatingSystem
This commit is contained in:
John Lewin 2017-08-20 02:34:39 -07:00
parent 82c2d333e7
commit 3a9833697d
108 changed files with 398 additions and 435 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PrinterCommunication/Io/MacroProcessingStream.cs
View file

@ -33,7 +33,7 @@ using System.IO;
using System.Text.RegularExpressions;
using System.Threading;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.PrinterControls;
using MatterHackers.MatterControl.SlicerConfiguration;
@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
try
{
imageOnDisk = StaticData.Instance.FileExists(filePath);
imageOnDisk = AggContext.StaticData.FileExists(filePath);
}
catch
{
@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
if (imageOnDisk)
{
return StaticData.Instance.LoadImage(filePath);
return AggContext.StaticData.LoadImage(filePath);
}
else
{

6
PrinterCommunication/Io/QueuedCommandsStream.cs
View file

@ -33,7 +33,7 @@ using System.IO;
using System.Text.RegularExpressions;
using System.Threading;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.PrinterControls;
using MatterHackers.MatterControl.SlicerConfiguration;
@ -79,7 +79,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
try
{
imageOnDisk = StaticData.Instance.FileExists(filePath);
imageOnDisk = AggContext.StaticData.FileExists(filePath);
}
catch
{
@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
if (imageOnDisk)
{
return StaticData.Instance.LoadImage(filePath);
return AggContext.StaticData.LoadImage(filePath);
}
else
{