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

Added new speed for air gap layer

Browse source
This commit is contained in:
LarsBrubaker 2018-09-23 19:22:44 -07:00
parent 2ce1cca0df
commit 3e4150b1b6
8 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MatterControlLib/DesignTools/Operations/ScaleObject3D.cs
View file

@ -184,24 +184,24 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
public override void OnInvalidate(InvalidateArgs invalidateType)
public override void OnInvalidate(InvalidateArgs invalidateArgs)
{
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
&& invalidateType.Source != this
if ((invalidateArgs.InvalidateType == InvalidateType.Content
|| invalidateArgs.InvalidateType == InvalidateType.Matrix
|| invalidateArgs.InvalidateType == InvalidateType.Mesh)
&& invalidateArgs.Source != this
&& !RebuildLocked)
{
Rebuild(null);
}
else if (invalidateType.InvalidateType == InvalidateType.Properties
&& invalidateType.Source == this)
else if (invalidateArgs.InvalidateType == InvalidateType.Properties
&& invalidateArgs.Source == this)
{
Rebuild(null);
Rebuild(invalidateArgs.UndoBuffer);
}
else
{
base.OnInvalidate(invalidateType);
base.OnInvalidate(invalidateArgs);
}
}

1
MatterControlLib/SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -1182,6 +1182,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string normalSpeedLocation = "Location: 'Settings & Controls' -> 'Settings' -> 'General' -> 'Speed'".Localize();
// If the given speed is part of the current slice engine then check that it is greater than 0.
if (!ValidateGoodSpeedSettingGreaterThan0("bridge_speed", normalSpeedLocation)) return false;
if (!ValidateGoodSpeedSettingGreaterThan0("air_gap_speed", normalSpeedLocation)) return false;
if (!ValidateGoodSpeedSettingGreaterThan0("external_perimeter_speed", normalSpeedLocation)) return false;
if (!ValidateGoodSpeedSettingGreaterThan0(SettingsKey.first_layer_speed, normalSpeedLocation)) return false;
if (!ValidateGoodSpeedSettingGreaterThan0("infill_speed", normalSpeedLocation)) return false;

2
MatterControlLib/SlicerConfiguration/Slicer.cs
View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private static Dictionary<Mesh, MeshPrintOutputSettings> meshPrintOutputSettings = new Dictionary<Mesh, MeshPrintOutputSettings>();
public static List<bool> extrudersUsed = new List<bool>();
public static bool RunInProcess = false;
public static bool RunInProcess { get; set; } = false;
public static List<(Matrix4X4 matrix, string fileName)> GetStlFileLocations(IObject3D object3D, ref string mergeRules, PrinterConfig printer, IProgress<ProgressStatus> progressReporter, CancellationToken cancellationToken)
{

1
MatterControlLib/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -154,6 +154,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MapFirstValue("retract_restart_extra_time_to_apply", "retractRestartExtraTimeToApply"),
new MapFirstValue("retract_speed", "retractionSpeed"),
new OverrideSpeedOnSlaPrinters("bridge_speed", "bridgeSpeed", "infill_speed"),
new OverrideSpeedOnSlaPrinters("air_gap_speed", "airGapSpeed", "infill_speed"),
new OverrideSpeedOnSlaPrinters("bottom_infill_speed", "bottomInfillSpeed", "infill_speed"),
new MappedToBoolString("bridge_over_infill", "bridgeOverInfill"),
new MappedSetting("extrusion_multiplier", "extrusionMultiplier"),

1
MatterControlLib/SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -47,6 +47,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MappedSetting(SettingsKey.bed_remove_part_temperature,SettingsKey.bed_remove_part_temperature),
new MappedSetting("bridge_fan_speed","bridge_fan_speed"),
new MappedSetting("bridge_speed","bridge_speed"),
new MappedSetting("air_gap_speed", "air_gap_speed"),
new MappedSetting("extruder_wipe_temperature","extruder_wipe_temperature"),
new MappedSetting(SettingsKey.filament_diameter,SettingsKey.filament_diameter),
new MappedSetting("first_layer_bed_temperature", SettingsKey.bed_temperature),

9
StaticData/SliceSettings/Properties.json
View file

@ -146,6 +146,15 @@
"ShowIfSet": "!sla_printer",
"DefaultValue": "20"
},
{
"SlicerConfigName": "air_gap_speed",
"PresentationName": "Air Gap",
"HelpText": "The speed at which the air gap layer will print.",
"DataEditType": "POSITIVE_DOUBLE",
"Units": "mm/s",
"ShowIfSet": "!sla_printer",
"DefaultValue": "15"
},
{
"SlicerConfigName": "bottom_infill_speed",
"PresentationName": "Botom Solid Infill",

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 2619166d2431cbc82bcd6aa833ebdbed5d406c8d
Subproject commit def18677492324b14f5e28455614b6bb5477900e

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit c5fc89ec56e43e7e01ce1458364e400b678e5073
Subproject commit 5396f19ce81e0d53fecf13aa83962a837135adfe