nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert more string literals into SettingsKey constants

Browse source
This commit is contained in:
John Lewin 2016-07-12 17:46:48 -07:00
parent bc0b040fe4
commit da695dc581
24 changed files with 101 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SlicerConfiguration/SlicerMapping/EngineMappingCura.cs
View file

@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
new ScaledSingleNumber(SettingsKey.layer_height, "layerThickness", 1000),
new AsPercentOfReferenceOrDirect(SettingsKey.first_layer_height, "initialLayerThickness", SettingsKey.layer_height, 1000),
new ScaledSingleNumber("filament_diameter", "filamentDiameter", 1000),
new ScaledSingleNumber(SettingsKey.filament_diameter, "filamentDiameter", 1000),
//filamentFlow
//layer0extrusionWidth
new ScaledSingleNumber(SettingsKey.nozzle_diameter, "extrusionWidth", 1000),
@ -289,7 +289,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
double lengthToExtrudeMm = ParseDouble(base.Value);
// we need to convert mm of filament to mm of extrusion path
double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.GetValue<double>("filament_diameter") * MathHelper.Tau * lengthToExtrudeMm;
double amountOfFilamentCubicMms = ActiveSliceSettings.Instance.GetValue<double>(SettingsKey.filament_diameter) * MathHelper.Tau * lengthToExtrudeMm;
double extrusionSquareSize = ActiveSliceSettings.Instance.GetValue<double>(SettingsKey.first_layer_height) * ActiveSliceSettings.Instance.GetValue<double>(SettingsKey.nozzle_diameter);
double lineLength = amountOfFilamentCubicMms / extrusionSquareSize;