From fb5d2d9c6e732eb57713eb4a89a85caa47b1a3ab Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 12 Jul 2016 16:43:39 -0700 Subject: [PATCH] Fixed a problem with first layer extrusion width not parsing correctly in new settings model --- SetupWizard/LicenseAgreementPage.cs | 2 -- SlicerConfiguration/Settings/SettingsProfile.cs | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SetupWizard/LicenseAgreementPage.cs b/SetupWizard/LicenseAgreementPage.cs index db7660da0..092a79616 100644 --- a/SetupWizard/LicenseAgreementPage.cs +++ b/SetupWizard/LicenseAgreementPage.cs @@ -28,8 +28,6 @@ either expressed or implied, of the FreeBSD Project. */ using System; -using System.Collections.Generic; - using MatterHackers.Agg.PlatformAbstract; using MatterHackers.Agg.UI; using MatterHackers.Localizations; diff --git a/SlicerConfiguration/Settings/SettingsProfile.cs b/SlicerConfiguration/Settings/SettingsProfile.cs index 044d7a621..1368eb21c 100644 --- a/SlicerConfiguration/Settings/SettingsProfile.cs +++ b/SlicerConfiguration/Settings/SettingsProfile.cs @@ -451,11 +451,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } else if (settingsKey == "first_layer_extrusion_width") { - return (T)(object)(GetValue(SettingsKey.layer_height) * ratio); + return (T)(object)(GetValue(SettingsKey.nozzle_diameter) * ratio); } return (T)(object)(ratio); } + else if (settingsKey == "first_layer_extrusion_width") + { + double extrusionResult; + double.TryParse(this.GetValue(settingsKey), out extrusionResult); + return (T)(object)(extrusionResult == 0 ? GetValue(SettingsKey.nozzle_diameter) : extrusionResult); + } if (settingsKey == SettingsKey.bed_temperature && !this.GetValue(SettingsKey.has_heated_bed))