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

Merge pull request #911 from jlewin/master

Browse source 
Apply test exception to SupportInterfaceMaterialAssignedToExtruderOne
This commit is contained in:
Lars Brubaker 2016-06-09 17:37:19 -07:00 • committed by GitHub
commit a29ac88c02
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs
View file

@ -335,12 +335,6 @@ namespace MatterControl.Tests.MatterControl
{ {
ValidateOnAllPrinters((printer, settings) => ValidateOnAllPrinters((printer, settings) =>
{ {
// Make exception for extruder assignment on 3D Stuffmaker slice files
if (printer.Oem == "3D Stuffmaker" && settings.RelativeFilePath.IndexOf(".slice", StringComparison.OrdinalIgnoreCase) != -1)
{
return;
}
string supportMaterialExtruder = settings.LayerCascade.GetValue("support_material_extruder"); string supportMaterialExtruder = settings.LayerCascade.GetValue("support_material_extruder");
if (!string.IsNullOrEmpty(supportMaterialExtruder) && printer.Oem != "Esagono") if (!string.IsNullOrEmpty(supportMaterialExtruder) && printer.Oem != "Esagono")
{ {
@ -354,6 +348,12 @@ namespace MatterControl.Tests.MatterControl
{ {
ValidateOnAllPrinters((printer, settings) => ValidateOnAllPrinters((printer, settings) =>
{ {
// Make exception for extruder assignment on 3D Stuffmaker slice files
if (printer.Oem == "3D Stuffmaker" && settings.RelativeFilePath.IndexOf(".slice", StringComparison.OrdinalIgnoreCase) != -1)
{
return;
}
string supportMaterialInterfaceExtruder = settings.LayerCascade.GetValue("support_material_interface_extruder"); string supportMaterialInterfaceExtruder = settings.LayerCascade.GetValue("support_material_interface_extruder");
if (!string.IsNullOrEmpty(supportMaterialInterfaceExtruder) && printer.Oem != "Esagono") if (!string.IsNullOrEmpty(supportMaterialInterfaceExtruder) && printer.Oem != "Esagono")
{ {