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 nozzle/tool hide/show state

Browse source
This commit is contained in:
Stewart Allen 2024-05-20 22:36:20 -04:00
commit c6a7ff00b2
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri-mode/cam/client.js
View file

@ -144,12 +144,8 @@ CAM.init = function(kiri, api) {
isIndexed = undefined; isIndexed = undefined;
isCamMode = mode === 'CAM'; isCamMode = mode === 'CAM';
SPACE.platform.setColor(isCamMode ? 0xeeeeee : 0xcccccc); SPACE.platform.setColor(isCamMode ? 0xeeeeee : 0xcccccc);
api.uc.setVisible($('set-tools'), isCamMode);
api.uc.setVisible($('camops'), isCamMode && isArrange); api.uc.setVisible($('camops'), isCamMode && isArrange);
api.uc.setVisible(UI.func.animate, isCamMode); 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) { if (!isCamMode) {
func.clearPops(); func.clearPops();
func.tabClear(); func.tabClear();

5
src/kiri/main.js
View file

@ -919,8 +919,9 @@ gapp.register("kiri.main", [], (root, exports) => {
current.device = clone(current.cdev[mode]); current.device = clone(current.cdev[mode]);
api.event.emit('device.set', currentDeviceName()); api.event.emit('device.set', currentDeviceName());
} }
// really belongs in CAM driver (lots of work / abstraction needed) // hide/show
// updateStockVisibility(); api.uc.setVisible($('menu-nozzle'), mode === 'FDM');
api.uc.setVisible($('set-tools'), mode === 'CAM');
// updates right-hand menu by enabling/disabling fields // updates right-hand menu by enabling/disabling fields
setViewMode(VIEWS.ARRANGE); setViewMode(VIEWS.ARRANGE);
UC.setMode(MODE); UC.setMode(MODE);

4
src/kiri/platform.js
View file

@ -247,7 +247,6 @@ function platformUpdateSelected() {
let disC = selwid.filter(w => w.meta.disabled === true).length; let disC = selwid.filter(w => w.meta.disabled === true).length;
enable.style.display = disC ? 'flex' : 'none'; enable.style.display = disC ? 'flex' : 'none';
disable.style.display = enaC ? 'flex' : 'none'; disable.style.display = enaC ? 'flex' : 'none';
ui.nozzle.classList.remove('hide');
if (api.feature.meta && selcount === 1) { if (api.feature.meta && selcount === 1) {
let sel = selwid[0]; let sel = selwid[0];
let name = sel.meta.file || sel.meta.url; let name = sel.meta.file || sel.meta.url;
@ -276,11 +275,8 @@ function platformUpdateSelected() {
ui.mesh.name.innerText = '[0]'; ui.mesh.name.innerText = '[0]';
ui.mesh.points.innerText = '-'; ui.mesh.points.innerText = '-';
ui.mesh.faces.innerText = '-'; ui.mesh.faces.innerText = '-';
ui.nozzle.classList.add('hide');
} }
ui.nozzle.style.display = extruders && extruders.length > 1 ? 'flex' : '';
if (extruders) { if (extruders) {
for (let i = 0; i < extruders.length; i++) { for (let i = 0; i < extruders.length; i++) {
let b = $(`sel-ext-${i}`); let b = $(`sel-ext-${i}`);