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

Merge pull request #130 from larsbrubaker/development

Browse source 
Handle the raft and support extruder set to index 0 (undefined).
This commit is contained in:
Lars Brubaker 2014-12-16 16:54:13 -08:00
commit 0a72f29202
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
SlicerConfiguration/SlicingQueue.cs
View file

@ -173,22 +173,28 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// If we have support enabled and and are using an extruder other than 0 for it
if (ActiveSliceSettings.Instance.SupportEnabled)
{
int supportExtruder = Math.Max(0, Math.Min(ActiveSliceSettings.Instance.ExtruderCount - 1, ActiveSliceSettings.Instance.SupportExtruder - 1));
extrudersUsed[supportExtruder] = true;
if (ActiveSliceSettings.Instance.SupportExtruder != 0)
{
int supportExtruder = Math.Max(0, Math.Min(ActiveSliceSettings.Instance.ExtruderCount - 1, ActiveSliceSettings.Instance.SupportExtruder - 1));
extrudersUsed[supportExtruder] = true;
}
}
// If we have raft enabled and are using an extruder other than 0 for it
if (ActiveSliceSettings.Instance.RaftEnabled)
{
int raftExtruder = Math.Max(0, Math.Min(ActiveSliceSettings.Instance.ExtruderCount - 1, ActiveSliceSettings.Instance.RaftExtruder - 1));
extrudersUsed[raftExtruder] = true;
if (ActiveSliceSettings.Instance.RaftExtruder != 0)
{
int raftExtruder = Math.Max(0, Math.Min(ActiveSliceSettings.Instance.ExtruderCount - 1, ActiveSliceSettings.Instance.RaftExtruder - 1));
extrudersUsed[raftExtruder] = true;
}
}
switch (Path.GetExtension(fileToSlice).ToUpper())
{
case ".STL":
case ".GCODE":
extrudersUsed.Add(true);
extrudersUsed[0] = true;
return new string[] { fileToSlice };
case ".AMF":