From 155e33f120cb87e56201cee02743cb101c3ea4ea Mon Sep 17 00:00:00 2001
From: John Lewin <lewin76@gmail.com>
Date: Sun, 3 Sep 2017 18:50:44 +0300
Subject: [PATCH] Make SliceSettingsWidget require a SettingsContext

---
 PartPreviewWindow/PrinterTabPage.cs            |  8 +++++++-
 .../SlicePresetsWindow/SlicePresetsWindow.cs   | 18 ++++++++++--------
 SlicerConfiguration/SliceSettingsWidget.cs     |  4 ++--
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/PartPreviewWindow/PrinterTabPage.cs b/PartPreviewWindow/PrinterTabPage.cs
index 05e819066..0e1cf27f1 100644
--- a/PartPreviewWindow/PrinterTabPage.cs
+++ b/PartPreviewWindow/PrinterTabPage.cs
@@ -588,7 +588,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			if (printerConnection.PrinterSettings.PrinterSelected)
 			{
-				sideBar.AddPage("Slice Settings".Localize(), new SliceSettingsWidget(printerConnection));
+				sideBar.AddPage(
+					"Slice Settings".Localize(), 
+					new SliceSettingsWidget(
+						printerConnection,
+						new SettingsContext(
+							null, 
+							SlicerConfiguration.NamedSettingsLayers.All)));
 			}
 			else
 			{
diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs b/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs
index 903d50d8c..2942167b6 100644
--- a/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs
+++ b/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs
@@ -145,14 +145,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 
 		private GuiWidget CreateSliceSettingsWidget(PrinterSettingsLayer persistenceLayer)
 		{
-			var layerCascade = new List<PrinterSettingsLayer>
-			{
-				persistenceLayer,
-				ActiveSliceSettings.Instance.OemLayer,
-				ActiveSliceSettings.Instance.BaseLayer
-			};
+			var settingsContext = new SettingsContext(
+				new List<PrinterSettingsLayer>
+				{
+					persistenceLayer,
+					ActiveSliceSettings.Instance.OemLayer,
+					ActiveSliceSettings.Instance.BaseLayer
+				},
+				presetsContext.LayerType);
 
-			return new SliceSettingsWidget(printerConnection, layerCascade, presetsContext.LayerType)
+			return new SliceSettingsWidget(printerConnection, settingsContext)
 			{
 				ShowControlBar = false
 			};
@@ -232,4 +234,4 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			return container;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index 1efb57036..4f9033f3a 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -79,12 +79,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 
 		private EventHandler unregisterEvents;
 
-		public SliceSettingsWidget(PrinterConnection printerConnection, List<PrinterSettingsLayer> layerCascade = null, NamedSettingsLayers viewFilter = NamedSettingsLayers.All)
+		public SliceSettingsWidget(PrinterConnection printerConnection, SettingsContext settingsContext)
 		{
 			this.printerConnection = printerConnection;
 			this.BackgroundColor = ApplicationController.Instance.Theme.TabBodyBackground;
 
-			this.settingsContext = new SettingsContext(layerCascade, viewFilter);
+			this.settingsContext = settingsContext;
 
 			pageTopToBottomLayout = new FlowLayoutWidget(FlowDirection.TopToBottom)
 			{