AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable old style auto supports

Browse source
This commit is contained in:
Stewart Allen 2020-12-14 14:58:55 -05:00
commit e536355b7e
4 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri/conf.js
View file

@ -287,14 +287,14 @@
sliceFillOverlap: 0.3, sliceFillOverlap: 0.3,
sliceFillSparse: 0.5, sliceFillSparse: 0.5,
sliceFillType: "hex", sliceFillType: "hex",
sliceSupportEnable: false, // sliceSupportEnable: false,
sliceSupportDensity: 0.25, sliceSupportDensity: 0.25,
sliceSupportOffset: 1.0, sliceSupportOffset: 1.0,
sliceSupportGap: 0.75, sliceSupportGap: 0.75,
sliceSupportSize: 5, sliceSupportSize: 5,
sliceSupportArea: 1, sliceSupportArea: 1,
sliceSupportExtra: 0, sliceSupportExtra: 0,
sliceSupportSpan: 5, // sliceSupportSpan: 5,
sliceSupportAngle: 50, sliceSupportAngle: 50,
sliceSupportNozzle: 0, sliceSupportNozzle: 0,
sliceSolidMinArea: 1, sliceSolidMinArea: 1,

16
src/kiri/init.js
View file

@ -1606,7 +1606,8 @@
sliceFillAngle: UC.newInput(LANG.fi_angl_s, {title:LANG.fi_angl_l, convert:UC.toFloat, modes:FDM, expert:true}), 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}), 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}), 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}), 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}), 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}), 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}), 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}), 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}), 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}), // 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}), // 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, 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: UC.newRow([
sliceSupportGen: LOCAL ? UC.newRow([
UI.ssaGen = UC.newButton('detect', onButtonClick, {class: "f-col grow a-center"}) 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([ sliceSupportManual: UC.newRow([
(UI.ssmAdd = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-plus"></i>'})), (UI.ssmAdd = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-plus"></i>'})),
(UI.ssmDun = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-check"></i>'})), (UI.ssmDun = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-check"></i>'})),

6
src/mode/fdm/client.js
View file

@ -35,7 +35,7 @@
}); });
api.event.on("settings.saved", (settings) => { api.event.on("settings.saved", (settings) => {
let proc = settings.process; 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 => { api.event.on("button.click", target => {
switch (target) { switch (target) {
@ -48,8 +48,8 @@
}); });
} }
}); });
api.event.on("fdm.supports.gen", func.sgen = () => { api.event.on("fdm.supports.detect", func.sgen = () => {
alert = api.show.alert("analyzing part...", 1000); alert = api.show.alert("analyzing part(s)...", 1000);
FDM.support_generate(array => { FDM.support_generate(array => {
console.log({generated_supports: array}); console.log({generated_supports: array});
api.hide.alert(alert); api.hide.alert(alert);

3
src/mode/fdm/slice.js
View file

@ -242,7 +242,6 @@
} }
// calculations only relevant when supports are enabled // calculations only relevant when supports are enabled
// if (supportEnabled) {
{ {
let auto = spro.sliceSupportEnable && spro.sliceSupportDensity > 0.0, let auto = spro.sliceSupportEnable && spro.sliceSupportDensity > 0.0,
minArea = spro.sliceSupportArea; minArea = spro.sliceSupportArea;
@ -807,7 +806,7 @@
*/ */
function doSupport(slice, proc, auto, fixed) { function doSupport(slice, proc, auto, fixed) {
let minOffset = proc.sliceSupportOffset, let minOffset = proc.sliceSupportOffset,
maxBridge = proc.sliceSupportSpan, maxBridge = proc.sliceSupportSpan || 5,
expand = proc.sliceSupportExtra, expand = proc.sliceSupportExtra,
minArea = proc.supportMinArea, minArea = proc.supportMinArea,
pillarSize = proc.sliceSupportSize, pillarSize = proc.sliceSupportSize,