From e536355b7e451684f28e87239e838e96d0c04619 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Mon, 14 Dec 2020 14:58:55 -0500 Subject: [PATCH] disable old style auto supports --- src/kiri/conf.js | 4 ++-- src/kiri/init.js | 16 ++++++++-------- src/mode/fdm/client.js | 6 +++--- src/mode/fdm/slice.js | 3 +-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/kiri/conf.js b/src/kiri/conf.js index e6b33feb..12b5a783 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -287,14 +287,14 @@ sliceFillOverlap: 0.3, sliceFillSparse: 0.5, sliceFillType: "hex", - sliceSupportEnable: false, + // sliceSupportEnable: false, sliceSupportDensity: 0.25, sliceSupportOffset: 1.0, sliceSupportGap: 0.75, sliceSupportSize: 5, sliceSupportArea: 1, sliceSupportExtra: 0, - sliceSupportSpan: 5, + // sliceSupportSpan: 5, sliceSupportAngle: 50, sliceSupportNozzle: 0, sliceSolidMinArea: 1, diff --git a/src/kiri/init.js b/src/kiri/init.js index 6a0ae65a..509e1cb6 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1606,7 +1606,8 @@ sliceFillAngle: UC.newInput(LANG.fi_angl_s, {title:LANG.fi_angl_l, convert:UC.toFloat, modes:FDM, expert:true}), sliceFillOverlap: UC.newInput(LANG.fi_over_s, {title:LANG.fi_over_l, convert:UC.toFloat, bound:UC.bound(0.0,2.0), modes:FDM, expert:true}), - fdmSupport: UC.newGroup(LANG.sp_menu, null, {modes:FDM, marker:true}), + fdmSupport: UC.newGroup(LANG.sp_menu, null, {modes:FDM, marker:false}), + sliceSupportNozzle: UC.newSelect(LANG.sp_nozl_s, {title:LANG.sp_nozl_l, modes:FDM, expert:true}, "extruders"), sliceSupportDensity: UC.newInput(LANG.sp_dens_s, {title:LANG.sp_dens_l, convert:UC.toFloat, bound:UC.bound(0.05,1.0), modes:FDM}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), sliceSupportSize: UC.newInput(LANG.sp_size_s, {title:LANG.sp_size_l, bound:UC.bound(1.0,200.0), convert:UC.toFloat, modes:FDM}), @@ -1615,16 +1616,15 @@ fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), sliceSupportArea: UC.newInput(LANG.sp_area_s, {title:LANG.sp_area_l, bound:UC.bound(0.0,200.0), convert:UC.toFloat, modes:FDM}), sliceSupportExtra: UC.newInput(LANG.sp_xpnd_s, {title:LANG.sp_xpnd_l, bound:UC.bound(0.0,200.0), convert:UC.toFloat, modes:FDM, expert:true}), - sliceSupportNozzle: UC.newSelect(LANG.sp_nozl_s, {title:LANG.sp_nozl_l, modes:FDM, expert:true}, "extruders"), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), - sliceSupportSpan: UC.newInput(LANG.sp_span_s, {title:LANG.sp_span_l, bound:UC.bound(0.0,200.0), convert:UC.toFloat, modes:FDM, show: () => UI.sliceSupportEnable.checked}), - sliceSupportEnable: UC.newBoolean(LANG.sp_auto_s, onBooleanClick, {title: LANG.sp_auto_l, modes:FDM, trigger:true}), - sliceSupportAngle: LOCAL ? UC.newInput(LANG.sp_angl_s, {title:LANG.sp_angl_l, bound:UC.bound(0.0,90.0), convert:UC.toFloat, modes:FDM}) : null, + // sliceSupportSpan: UC.newInput(LANG.sp_span_s, {title:LANG.sp_span_l, bound:UC.bound(0.0,200.0), convert:UC.toFloat, modes:FDM, show: () => UI.sliceSupportEnable.checked}), + // sliceSupportEnable: UC.newBoolean(LANG.sp_auto_s, onBooleanClick, {title: LANG.sp_auto_l, modes:FDM, trigger:true}), + sliceSupportAngle: UC.newInput(LANG.sp_angl_s, {title:LANG.sp_angl_l, bound:UC.bound(0.0,90.0), convert:UC.toFloat, modes:FDM}), - fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), - sliceSupportGen: LOCAL ? UC.newRow([ + sliceSupportGen: UC.newRow([ UI.ssaGen = UC.newButton('detect', onButtonClick, {class: "f-col grow a-center"}) - ], { modes: FDM, class: "ext-buttons f-row grow" }) : null, + ], { modes: FDM, class: "ext-buttons f-row grow" }), + fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), sliceSupportManual: UC.newRow([ (UI.ssmAdd = UC.newButton(undefined, onButtonClick, {icon:''})), (UI.ssmDun = UC.newButton(undefined, onButtonClick, {icon:''})), diff --git a/src/mode/fdm/client.js b/src/mode/fdm/client.js index 48ac5b1e..9df9253f 100644 --- a/src/mode/fdm/client.js +++ b/src/mode/fdm/client.js @@ -35,7 +35,7 @@ }); api.event.on("settings.saved", (settings) => { let proc = settings.process; - api.ui.fdmSupport.marker.style.display = proc.sliceSupportEnable ? 'flex' : 'none'; + // api.ui.fdmSupport.marker.style.display = proc.sliceSupportEnable ? 'flex' : 'none'; }); api.event.on("button.click", target => { switch (target) { @@ -48,8 +48,8 @@ }); } }); - api.event.on("fdm.supports.gen", func.sgen = () => { - alert = api.show.alert("analyzing part...", 1000); + api.event.on("fdm.supports.detect", func.sgen = () => { + alert = api.show.alert("analyzing part(s)...", 1000); FDM.support_generate(array => { console.log({generated_supports: array}); api.hide.alert(alert); diff --git a/src/mode/fdm/slice.js b/src/mode/fdm/slice.js index d2fa576f..ce63036b 100644 --- a/src/mode/fdm/slice.js +++ b/src/mode/fdm/slice.js @@ -242,7 +242,6 @@ } // calculations only relevant when supports are enabled - // if (supportEnabled) { { let auto = spro.sliceSupportEnable && spro.sliceSupportDensity > 0.0, minArea = spro.sliceSupportArea; @@ -807,7 +806,7 @@ */ function doSupport(slice, proc, auto, fixed) { let minOffset = proc.sliceSupportOffset, - maxBridge = proc.sliceSupportSpan, + maxBridge = proc.sliceSupportSpan || 5, expand = proc.sliceSupportExtra, minArea = proc.supportMinArea, pillarSize = proc.sliceSupportSize,