From 1397c525ee9087df7cfbf125ef9df2829ce9e98b Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 15 Jul 2020 10:47:40 -0400 Subject: [PATCH] fix layers in sla, sla outline color --- src/kiri/init.js | 10 +++++----- src/kiri/main.js | 5 +++-- src/mode/sla/driver.js | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 93d914c4..33b3356c 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1524,11 +1524,11 @@ layerFinishY: UC.newBoolean(LANG.la_finy, onLayerToggle, {modes:CAM}), layerFill: UC.newBoolean(LANG.la_fill, onLayerToggle, {modes:FDM}), layerSparse: UC.newBoolean(LANG.la_sprs, onLayerToggle, {modes:FDM}), - layerSupport: UC.newBoolean(LANG.la_sprt, onLayerToggle, {modes:FDM_SLA}), - layerOutline: UC.newBoolean(LANG.la_olin, onLayerToggle, {modes:ALL}), - layerDelta: UC.newBoolean(LANG.la_dlta, onLayerToggle, {modes:FDM_SLA}), - layerSolid: UC.newBoolean(LANG.la_slds, onLayerToggle, {modes:FDM_SLA}), - layerPrint: UC.newBoolean(LANG.la_prnt, onLayerToggle), + layerSupport: UC.newBoolean(LANG.la_sprt, onLayerToggle, {modes:FDM}), + layerOutline: UC.newBoolean(LANG.la_olin, onLayerToggle, {modes:GCODE}), + layerDelta: UC.newBoolean(LANG.la_dlta, onLayerToggle, {modes:FDM}), + layerSolid: UC.newBoolean(LANG.la_slds, onLayerToggle, {modes:FDM}), + layerPrint: UC.newBoolean(LANG.la_prnt, onLayerToggle, {modes:GCODE}), layerMoves: UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE}) }); diff --git a/src/kiri/main.js b/src/kiri/main.js index 1350d75d..549322aa 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -589,6 +589,7 @@ let print = UI.layerPrint.checked, moves = UI.layerMoves.checked, cam = MODE === MODES.CAM, + sla = MODE === MODES.SLA, 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; @@ -640,8 +641,8 @@ } } - UI.layerPrint.parentNode.style.display = currentPrint ? '' : 'none'; - UI.layerMoves.parentNode.style.display = currentPrint ? '' : 'none'; + UI.layerPrint.parentNode.style.display = currentPrint && !sla ? '' : 'none'; + UI.layerMoves.parentNode.style.display = currentPrint && !sla ? '' : 'none'; SPACE.update(); } diff --git a/src/mode/sla/driver.js b/src/mode/sla/driver.js index 98ff94f2..9495a76a 100644 --- a/src/mode/sla/driver.js +++ b/src/mode/sla/driver.js @@ -748,7 +748,7 @@ if (slice.supports) polys.appendAll(slice.supports); polys.forEach(poly => { poly = poly.clone(true).move(widget.track.pos); - layer.poly(poly, 0x010101, true); + layer.poly(poly, 0x777777, true); layer.solid(poly, 0x0099cc); }); });