From 407a7d1388a55c5ff76eebd3a7f7b9b5e0d3c67d Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 15 Jun 2018 11:05:33 -0700 Subject: [PATCH 1/3] Another bug in the eeprom writing --- EeProm/EePromMarlinSettings.cs | 2 +- Submodules/agg-sharp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EeProm/EePromMarlinSettings.cs b/EeProm/EePromMarlinSettings.cs index 9c944fa17..486b885c2 100644 --- a/EeProm/EePromMarlinSettings.cs +++ b/EeProm/EePromMarlinSettings.cs @@ -493,7 +493,7 @@ namespace MatterHackers.MatterControl.EeProm { get { - return acc_travel_moves; + return acc_retraction; } set diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index b0e86c1b3..f72f11182 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit b0e86c1b34df07656eb44fe9dbd3bc4271bf0e57 +Subproject commit f72f111824056c3c4dae9327326dc39b2eb85a1b From e149b76d56a4d2f58bb53a1390f38937b1aac1a6 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 15 Jun 2018 11:11:49 -0700 Subject: [PATCH 2/3] Make eeprom setting disabled if not connected issue: MatterHackers/MCCentral#3628 "Configure EEPROM" should be disabled when printer is not connected --- .../View3D/PrinterBar/PrinterActionsBar.cs | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs index 178073892..57a079b5b 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs @@ -287,29 +287,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { Icon = AggContext.StaticData.LoadIcon("memory_16x16.png", 16, 16, theme.InvertIcons), Title = "Configure EEProm".Localize(), - Action = configureEePromButton_Click + Action = configureEePromButton_Click, + IsEnabled = () => printer.Connection.IsConnected }, - //new NamedAction() - //{ - // Title = "Rename Printer".Localize(), - // Action = () => - // { - // DialogWindow.Show( - // new InputBoxPage( - // "Rename Printer".Localize(), - // "Name".Localize(), - // printer.Settings.GetValue(SettingsKey.printer_name), - // "Enter New Name Here".Localize(), - // "Rename".Localize(), - // (newName) => - // { - // if (!string.IsNullOrEmpty(newName)) - // { - // printer.Settings.SetValue(SettingsKey.printer_name, newName); - // } - // })); - // } - //}, new NamedBoolAction() { Title = "Configure Printer".Localize(), From 97dabda7ca1079f650232105b6c325ef4bbc5093 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 15 Jun 2018 11:20:12 -0700 Subject: [PATCH 3/3] Filter Add Base Object to IPatheObjects issue: MatterHackers/MCCentral#3627 Filter "Add Base" to items that have a descendant of IVertexSource --- ApplicationView/ApplicationController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ApplicationView/ApplicationController.cs b/ApplicationView/ApplicationController.cs index 2c0eeca6c..9d4a3ea21 100644 --- a/ApplicationView/ApplicationController.cs +++ b/ApplicationView/ApplicationController.cs @@ -830,7 +830,7 @@ namespace MatterHackers.MatterControl return Task.CompletedTask; }, (sceneItem) => true, - (sceneItem) => true); + (sceneItem) => sceneItem.DescendantsAndSelf().Any((i) => i is IPathObject)); ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) => {