diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index 39554b0b..f029fc94 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -144,12 +144,8 @@ CAM.init = function(kiri, api) { isIndexed = undefined; isCamMode = mode === 'CAM'; SPACE.platform.setColor(isCamMode ? 0xeeeeee : 0xcccccc); - api.uc.setVisible($('set-tools'), isCamMode); api.uc.setVisible($('camops'), isCamMode && isArrange); api.uc.setVisible(UI.func.animate, isCamMode); - // $('set-tools').style.display = isCamMode ? '' : 'none'; - // $('camops').style.display = isCamMode && isArrange ? 'flex' : ''; - // UI.func.animate.style.display = isCamMode ? '' : 'none'; if (!isCamMode) { func.clearPops(); func.tabClear(); diff --git a/src/kiri/main.js b/src/kiri/main.js index 9e10e611..bb2ff749 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -919,8 +919,9 @@ gapp.register("kiri.main", [], (root, exports) => { current.device = clone(current.cdev[mode]); api.event.emit('device.set', currentDeviceName()); } - // really belongs in CAM driver (lots of work / abstraction needed) - // updateStockVisibility(); + // hide/show + api.uc.setVisible($('menu-nozzle'), mode === 'FDM'); + api.uc.setVisible($('set-tools'), mode === 'CAM'); // updates right-hand menu by enabling/disabling fields setViewMode(VIEWS.ARRANGE); UC.setMode(MODE); diff --git a/src/kiri/platform.js b/src/kiri/platform.js index c75ac2d8..52280477 100644 --- a/src/kiri/platform.js +++ b/src/kiri/platform.js @@ -247,7 +247,6 @@ function platformUpdateSelected() { let disC = selwid.filter(w => w.meta.disabled === true).length; enable.style.display = disC ? 'flex' : 'none'; disable.style.display = enaC ? 'flex' : 'none'; - ui.nozzle.classList.remove('hide'); if (api.feature.meta && selcount === 1) { let sel = selwid[0]; let name = sel.meta.file || sel.meta.url; @@ -276,11 +275,8 @@ function platformUpdateSelected() { ui.mesh.name.innerText = '[0]'; ui.mesh.points.innerText = '-'; ui.mesh.faces.innerText = '-'; - ui.nozzle.classList.add('hide'); } - ui.nozzle.style.display = extruders && extruders.length > 1 ? 'flex' : ''; - if (extruders) { for (let i = 0; i < extruders.length; i++) { let b = $(`sel-ext-${i}`);