From a66b614ae3e9abc84622aa2b58f64569a881e4d0 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Fri, 7 Feb 2014 15:14:29 -0800 Subject: [PATCH] Made the save stl in preview have better asyc early in save. Made the support everywhere curaengine setting work --- PartPreviewWindow/View3DTransfromPart.cs | 6 +++--- SliceConfiguration/CuraEnginMappings.cs | 2 +- StaticData/PrinterSettings/config.ini | 1 + StaticData/SliceSettings/Layouts.txt | 1 + StaticData/SliceSettings/Properties.txt | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/PartPreviewWindow/View3DTransfromPart.cs b/PartPreviewWindow/View3DTransfromPart.cs index 297bd4b8a..c8629784e 100644 --- a/PartPreviewWindow/View3DTransfromPart.cs +++ b/PartPreviewWindow/View3DTransfromPart.cs @@ -1385,9 +1385,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow processingProgressControl.PercentComplete = 0; LockEditControls(); - // we sent the data to the asynch lists but we will not pull it back out (only use it as a temp holder). - PushMeshDataToAsynchLists(true); - BackgroundWorker mergeAndSavePartsBackgroundWorker = new BackgroundWorker(); mergeAndSavePartsBackgroundWorker.WorkerReportsProgress = true; @@ -1401,6 +1398,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow void mergeAndSavePartsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) { + // we sent the data to the asynch lists but we will not pull it back out (only use it as a temp holder). + PushMeshDataToAsynchLists(true); + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; BackgroundWorker backgroundWorker = (BackgroundWorker)sender; try diff --git a/SliceConfiguration/CuraEnginMappings.cs b/SliceConfiguration/CuraEnginMappings.cs index 154fd31a5..d3a94eb2c 100644 --- a/SliceConfiguration/CuraEnginMappings.cs +++ b/SliceConfiguration/CuraEnginMappings.cs @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl new ScaledSingleNumber("supportLineDistance", "support_material_spacing", 1000), new SupportMatterial("supportAngle", "support_material"), new NotPassedItem("", "support_material_threshold"), - //new ScaledSingleNumber(supportEverywhere); + new MapItem("supportEverywhere", "support_material_create_internal_support"), new ScaledSingleNumber("supportXYDistance", "support_material_xy_distance", 1000), new ScaledSingleNumber("supportZDistance", "support_material_z_distance", 1000), diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index 82c9b7d41..a2587d480 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -94,6 +94,7 @@ start_perimeters_at_concave_points = 0 start_perimeters_at_non_overhang = 0 support_material = 0 support_material_angle = 0 +support_material_create_internal_support = 0 support_material_enforce_layers = 0 support_material_extruder = 1 support_material_extrusion_width = 0 diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 8b72dcf0a..6f2e9b398 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -111,6 +111,7 @@ Advanced support_material_interface_spacing support_material_xy_distance support_material_z_distance + support_material_create_internal_support Notes Notes notes diff --git a/StaticData/SliceSettings/Properties.txt b/StaticData/SliceSettings/Properties.txt index 7fe563121..17ed65647 100644 --- a/StaticData/SliceSettings/Properties.txt +++ b/StaticData/SliceSettings/Properties.txt @@ -94,6 +94,7 @@ start_gcode|Start G-Code|MULTI_LINE_TEXT||This gcode will be inserted into the o start_perimeters_at_concave_points|Start At Concave Points|CHECK_BOX||Make sure the first point on a perimeter is a concave point. start_perimeters_at_non_overhang|Start At Non Overhang|CHECK_BOX||Make sure the first point on a perimeter is not an overhang. support_material_angle|Pattern Angle|POSITVE_DOUBLE|degrees|The starting angle of the supports. +support_material_create_internal_support|Internal Support|CHECK_BOX||Create support where needed on internal features. support_material_enforce_layers|Enforce Support For First|INT|layers|Generate support material everywhere not touching the bed for n layers, regardless of angle. support_material_extruder|Support Material Extruder|INT||The index of the extruder to use for support material. support_material_extrusion_width|Support Material|DOUBLE_OR_PERCENT|mm or %\nleave 0 for default|Leave this as 0 to allow automatic calculation of extrusion width.