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

Merge pull request #4058 from larsbrubaker/master

Browse source 
Return that SliceItem failed if we have nothing on the bed
This commit is contained in:
Lars Brubaker 2018-12-05 11:48:37 -08:00 • committed by GitHub
commit d410e4968e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/SlicerConfiguration/Slicer.cs
View file

@ -203,7 +203,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var stlFileLocations = GetStlFileLocations(object3D, ref mergeRules, printer, progressReporter, cancellationToken);
return SliceItem(stlFileLocations, mergeRules, gcodeFilePath, printer, progressReporter, cancellationToken);
if (stlFileLocations.Count > 0)
{
return SliceItem(stlFileLocations, mergeRules, gcodeFilePath, printer, progressReporter, cancellationToken);
}
return Task.FromResult(false);
}
public static Task<bool> SliceItem(List<(Matrix4X4 matrix, string fileName)> stlFileLocations, string mergeRules, string gcodeFilePath, PrinterConfig printer, IProgress<ProgressStatus> reporter, CancellationToken cancellationToken)

4
Program.cs
View file

@ -67,8 +67,8 @@ namespace MatterHackers.MatterControl
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
// Set default Agg providers
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.OpenGLWinformsWindowProvider, agg_platform_win32";
//AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformsSingleWindowProvider, MatterControl.Winforms";
//AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.OpenGLWinformsWindowProvider, agg_platform_win32";
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformsSingleWindowProvider, MatterControl.Winforms";
string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 1fd8552e0a6df4fba11dee91e6d72e256d457ba6
Subproject commit 3b0f4710bf8f500d8bc803b2d4bea6c84a3dcd7a