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

Allow IObjectSlicer to drive active settings

Browse source
This commit is contained in:
jlewin 2019-06-26 18:27:23 -07:00
parent cd5b5c6fe4
commit 5c81e19a3c
5 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControl.Printing/Settings/IObjectSlicer.cs
View file

@ -35,5 +35,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public interface IObjectSlicer
{
bool Slice(IObject3D object3D, PrinterSettings printerSettings, Stream outputStream);
bool MapContains(string canonicalSettingsName);
}
}

8
MatterControl.Printing/Settings/PrinterSettings.cs
View file

@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class PrinterSettings
{
// TODO: Move to more appropriate location after more consideration
public static IObjectSlicer ExternalSlicer { get; set; }
public static IObjectSlicer Slicer { get; set; }
// Latest version should be in the form of:
// Year|month|day|versionForDay (to support multiple revisions on a given day)
@ -711,6 +711,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
&& (differsFromPreset || differsFromBase);
}
public bool IsActive(string canonicalSettingsName)
{
return PrinterSettings.Slicer.MapContains(canonicalSettingsName)
|| PrinterSettings.ApplicationLevelSettings.Contains(canonicalSettingsName);
}
// Helper method to debug settings layers per setting
public List<(string layerName, string currentValue)> GetLayerValues(string sliceSetting, IEnumerable<PrinterSettingsLayer> layerCascade = null)
{