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

35
SlicerConfiguration/SlicerMapping/EngineMapingBase.cs
View file

@ -46,21 +46,21 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.bed_size,
SettingsKey.bed_temperature,
SettingsKey.build_height,
"cancel_gcode",
"connect_gcode",
"has_fan",
"has_hardware_leveling",
"has_heated_bed",
"has_power_control",
"has_sd_card_reader",
"printer_name",
"auto_connect",
"baud_rate",
"com_port",
"created_date",
"delete_printer",
"filament_cost",
"filament_density",
SettingsKey.cancel_gcode,
SettingsKey.connect_gcode,
SettingsKey.has_fan,
SettingsKey.has_hardware_leveling,
SettingsKey.has_heated_bed,
SettingsKey.has_power_control,
SettingsKey.has_sd_card_reader,
SettingsKey.printer_name,
SettingsKey.auto_connect,
SettingsKey.baud_rate,
SettingsKey.com_port,
SettingsKey.created_date,
SettingsKey.delete_printer,
SettingsKey.filament_cost,
SettingsKey.filament_density,
"manual_probe_paper_width",
"pause_gcode",
"print_leveling_method",
@ -79,7 +79,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
"heat_extruder_before_homing",
"include_firmware_updater",
"layer_to_pause",
"show_reset_connection"
"show_reset_connection",
SettingsKey.make,
SettingsKey.model,
};
public SliceEngineMapping(string engineName)

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;

4
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MappedSetting(SettingsKey.nozzle_diameter, "extrusionWidth"),
new MappedSetting("max_fan_speed", "fanSpeedMaxPercent"),
new MappedSetting("min_fan_speed", "fanSpeedMinPercent"),
new MappedSetting("filament_diameter", "filamentDiameter"),
new MappedSetting(SettingsKey.filament_diameter, "filamentDiameter"),
new MappedSetting("extrusion_multiplier", "extrusionMultiplier"),
new AsPercentOfReferenceOrDirect("first_layer_extrusion_width", "firstLayerExtrusionWidth", SettingsKey.nozzle_diameter),
new AsPercentOfReferenceOrDirect("first_layer_speed", "firstLayerSpeed", "infill_speed"),
@ -330,7 +330,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;

2
SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MappedSetting("bridge_fan_speed","bridge_fan_speed"),
new MappedSetting("bridge_speed","bridge_speed"),
new MappedSetting("extruder_wipe_temperature","extruder_wipe_temperature"),
new MappedSetting("filament_diameter","filament_diameter"),
new MappedSetting(SettingsKey.filament_diameter,SettingsKey.filament_diameter),
new MappedSetting("first_layer_bed_temperature", SettingsKey.bed_temperature),
new MappedSetting("first_layer_temperature", "temperature"),
new MappedSetting("max_fan_speed","max_fan_speed"),