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

fix layers in sla, sla outline color

Browse source
This commit is contained in:
Stewart Allen 2020-07-15 10:47:40 -04:00
commit 1397c525ee
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kiri/init.js
View file

@ -1524,11 +1524,11 @@
layerFinishY: UC.newBoolean(LANG.la_finy, onLayerToggle, {modes:CAM}), layerFinishY: UC.newBoolean(LANG.la_finy, onLayerToggle, {modes:CAM}),
layerFill: UC.newBoolean(LANG.la_fill, onLayerToggle, {modes:FDM}), layerFill: UC.newBoolean(LANG.la_fill, onLayerToggle, {modes:FDM}),
layerSparse: UC.newBoolean(LANG.la_sprs, onLayerToggle, {modes:FDM}), layerSparse: UC.newBoolean(LANG.la_sprs, onLayerToggle, {modes:FDM}),
layerSupport: UC.newBoolean(LANG.la_sprt, onLayerToggle, {modes:FDM_SLA}), layerSupport: UC.newBoolean(LANG.la_sprt, onLayerToggle, {modes:FDM}),
layerOutline: UC.newBoolean(LANG.la_olin, onLayerToggle, {modes:ALL}), layerOutline: UC.newBoolean(LANG.la_olin, onLayerToggle, {modes:GCODE}),
layerDelta: UC.newBoolean(LANG.la_dlta, onLayerToggle, {modes:FDM_SLA}), layerDelta: UC.newBoolean(LANG.la_dlta, onLayerToggle, {modes:FDM}),
layerSolid: UC.newBoolean(LANG.la_slds, onLayerToggle, {modes:FDM_SLA}), layerSolid: UC.newBoolean(LANG.la_slds, onLayerToggle, {modes:FDM}),
layerPrint: UC.newBoolean(LANG.la_prnt, onLayerToggle), layerPrint: UC.newBoolean(LANG.la_prnt, onLayerToggle, {modes:GCODE}),
layerMoves: UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE}) layerMoves: UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE})
}); });

5
src/kiri/main.js
View file

@ -589,6 +589,7 @@
let print = UI.layerPrint.checked, let print = UI.layerPrint.checked,
moves = UI.layerMoves.checked, moves = UI.layerMoves.checked,
cam = MODE === MODES.CAM, cam = MODE === MODES.CAM,
sla = MODE === MODES.SLA,
hi = cam ? API.var.layer_max - API.var.layer_lo : API.var.layer_hi, hi = cam ? API.var.layer_max - API.var.layer_lo : API.var.layer_hi,
lo = cam ? API.var.layer_max - API.var.layer_hi : API.var.layer_lo; lo = cam ? API.var.layer_max - API.var.layer_hi : API.var.layer_lo;
@ -640,8 +641,8 @@
} }
} }
UI.layerPrint.parentNode.style.display = currentPrint ? '' : 'none'; UI.layerPrint.parentNode.style.display = currentPrint && !sla ? '' : 'none';
UI.layerMoves.parentNode.style.display = currentPrint ? '' : 'none'; UI.layerMoves.parentNode.style.display = currentPrint && !sla ? '' : 'none';
SPACE.update(); SPACE.update();
} }

2
src/mode/sla/driver.js
View file

@ -748,7 +748,7 @@
if (slice.supports) polys.appendAll(slice.supports); if (slice.supports) polys.appendAll(slice.supports);
polys.forEach(poly => { polys.forEach(poly => {
poly = poly.clone(true).move(widget.track.pos); poly = poly.clone(true).move(widget.track.pos);
layer.poly(poly, 0x010101, true); layer.poly(poly, 0x777777, true);
layer.solid(poly, 0x0099cc); layer.solid(poly, 0x0099cc);
}); });
}); });