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

Merge pull request #2786 from larsbrubaker/design_tools

Browse source 
Make infill overlap take a 0
This commit is contained in:
Lars Brubaker 2017-12-20 15:43:02 -08:00 • committed by GitHub
commit 2ff6e1b393
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -79,7 +79,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MappedSetting("disable_fan_first_layers", "firstLayerToAllowFan"),
new MappedSetting("extrusion_multiplier", "extrusionMultiplier"),
new MappedSetting("fill_angle", "infillStartingAngle"),
new AsPercentOfReferenceOrDirect(SettingsKey.infill_overlap_perimeter, "infillExtendIntoPerimeter", SettingsKey.nozzle_diameter),
new AsPercentOfReferenceOrDirect(SettingsKey.infill_overlap_perimeter, "infillExtendIntoPerimeter", SettingsKey.nozzle_diameter, change0ToReference: false),
new OverrideSpeedOnSlaPrinters("infill_speed", "infillSpeed", "infill_speed"),
new MappedSetting("infill_type", "infillType"),
new MappedSetting("max_fan_speed", "fanSpeedMaxPercent"),

7
SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -553,12 +553,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class AsPercentOfReferenceOrDirect : MappedSetting
{
bool change0ToReference;
string originalReference;
double scale;
public AsPercentOfReferenceOrDirect(string canonicalSettingsName, string exportedName, string originalReference, double scale = 1)
public AsPercentOfReferenceOrDirect(string canonicalSettingsName, string exportedName, string originalReference, double scale = 1, bool change0ToReference = true)
: base(canonicalSettingsName, exportedName)
{
this.change0ToReference = change0ToReference;
this.scale = scale;
this.originalReference = originalReference;
}
@ -581,7 +583,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
finalValue = ParseDouble(base.Value);
}
if (finalValue == 0)
if (change0ToReference
&& finalValue == 0)
{
finalValue = ParseDouble(ActiveSliceSettings.Instance.GetValue(originalReference));
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 850c69ffe9025d038f9848e41f544e0564203024
Subproject commit f3d01e4979302480603faf8a50d20a73d4d7110a