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

added avoid max ratio

Browse source
This commit is contained in:
Lars Brubaker 2020-05-22 12:36:47 -07:00
parent 740bf4c11b
commit 169b40f3fd
5 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControl.Printing/Settings/SettingsKey.cs
View file

@ -36,6 +36,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string air_gap_speed = nameof(air_gap_speed);
public const string auto_connect = nameof(auto_connect);
public const string auto_release_motors = nameof(auto_release_motors);
public const string avoid_crossing_max_ratio = nameof(avoid_crossing_max_ratio);
public const string avoid_crossing_perimeters = nameof(avoid_crossing_perimeters);
public const string baby_step_z_offset = nameof(baby_step_z_offset);
public const string backup_firmware_before_update = nameof(backup_firmware_before_update);

11
MatterControl.Printing/Settings/SliceSettingsFields.cs
View file

@ -496,6 +496,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Converter = new AsPercentOrDirect(),
},
new SliceSettingData()
{
SlicerConfigName = SettingsKey.avoid_crossing_max_ratio,
PresentationName = "Avoid Crossing Max Ratio".Localize(),
HelpText = "The maximum amount that an avoid crossing travel can exceed the direct distance travel. If exceeded the direct travel will be executed.".Localize(),
DataEditType = DataEditTypes.DOUBLE_OR_PERCENT,
Units = "Ratio or %".Localize(),
ShowIfSet = "!sla_printer",
DefaultValue = "2",
Converter = new AsPercentOrDirect(),
},
new SliceSettingData()
{
SlicerConfigName = SettingsKey.filament_cost,
PresentationName = "Cost".Localize(),

5
MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
View file

@ -97,13 +97,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
[SettingsKey.max_acceleration] = new ExportField("maxAcceleration"),
[SettingsKey.max_velocity] = new ExportField("maxVelocity"),
[SettingsKey.jerk_velocity] = new ExportField("jerkVelocity"),
[SettingsKey.avoid_crossing_max_ratio] = new ExportField("avoidCrossingMaxRatio"),
[SettingsKey.print_time_estimate_multiplier] = new ExportField(
"printTimeEstimateMultiplier",
(value, settings) =>
{
if (double.TryParse(value, out double infillRatio))
if (double.TryParse(value, out double timeMultiplier))
{
return $"{infillRatio * .01}";
return $"{timeMultiplier * .01}";
}
return "0";

1
StaticData/SliceSettings/Layouts.txt
View file

@ -12,6 +12,7 @@ Advanced
Layers / Surface
Outer Surface - Perimeters
avoid_crossing_perimeters
avoid_crossing_max_ratio
external_perimeters_first
perimeter_start_end_overlap
merge_overlapping_lines

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit d58cefe19c7d52038b7173c551555e22586480f0
Subproject commit f8554b254586120110eedabec5ed829005695cb6