Merge pull request #1075 from larsbrubaker/master

Fixed a problem with first layer extrusion width not parsing correctl…
This commit is contained in:
johnlewin 2016-07-12 17:50:55 -07:00 committed by GitHub
commit bc0b040fe4
2 changed files with 7 additions and 3 deletions

View file

@ -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;

View file

@ -451,11 +451,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
else if (settingsKey == "first_layer_extrusion_width")
{
return (T)(object)(GetValue<double>(SettingsKey.layer_height) * ratio);
return (T)(object)(GetValue<double>(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<double>(SettingsKey.nozzle_diameter) : extrusionResult);
}
if (settingsKey == SettingsKey.bed_temperature
&& !this.GetValue<bool>(SettingsKey.has_heated_bed))