From 4b555f71c41832feea01166cdab82825502e9de4 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 18 Oct 2016 11:23:45 -0700 Subject: [PATCH 1/2] Fixed a bug with wipe towers Moving to 0,0 Not being inserted --- Submodules/MatterSlice | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index df38a59e2..d033df84d 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit df38a59e274103067d99da3542cb2a95c85ea1c2 +Subproject commit d033df84d755d53880e30eef409ba9fe4c5b4b0e From a22093bfcf7acae0ccde08fe7eff766ca82c8252 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 18 Oct 2016 11:45:47 -0700 Subject: [PATCH 2/2] Write the current color into printers on creation. --- SlicerConfiguration/Settings/ActiveSliceSettings.cs | 6 ------ SlicerConfiguration/Settings/ProfileManager.cs | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/SlicerConfiguration/Settings/ActiveSliceSettings.cs b/SlicerConfiguration/Settings/ActiveSliceSettings.cs index 4208d0656..99b3c7b48 100644 --- a/SlicerConfiguration/Settings/ActiveSliceSettings.cs +++ b/SlicerConfiguration/Settings/ActiveSliceSettings.cs @@ -134,12 +134,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration ActiveTheme.Instance = ActiveTheme.GetThemeColors(activeThemeName); ActiveTheme.ResumeEvents(); } - else - { - //If the active printer has no theme we set it to the current theme color - ActiveSliceSettings.Instance.SetValue(SettingsKey.active_theme_name, ActiveTheme.Instance.Name); - } - } } } diff --git a/SlicerConfiguration/Settings/ProfileManager.cs b/SlicerConfiguration/Settings/ProfileManager.cs index b63b573ef..136893394 100644 --- a/SlicerConfiguration/Settings/ProfileManager.cs +++ b/SlicerConfiguration/Settings/ProfileManager.cs @@ -444,6 +444,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration printerSettings.UserLayer[SettingsKey.printer_name.ToString()] = printerName; + //If the active printer has no theme we set it to the current theme color + printerSettings.UserLayer[SettingsKey.active_theme_name] = ActiveTheme.Instance.Name; + // Import named macros as defined in the following printers: (Airwolf Axiom, HD, HD-R, HD2x, HDL, HDx, Me3D Me2, Robo R1[+]) var classicDefaultMacros = printerSettings.GetValue("default_macros"); if (!string.IsNullOrEmpty(classicDefaultMacros))