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

checkpoint ui refactor

Browse source
This commit is contained in:
Stewart Allen 2024-05-23 00:38:38 -04:00
commit 331bff9378
7 changed files with 88 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,8 +187,6 @@ CAM.init = function(kiri, api) {
if (wannot.tab && wannot.tab.length) hasTabs = true;
if (wannot.trace && wannot.trace.length) hasTraces = true;
}
// show/hide dots in enabled process pop buttons
api.ui.camTabs.marker.style.display = hasTabs ? 'flex' : 'none';
api.platform.update_bounds();
updateIndex();
updateStock();

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

@ -137,9 +137,9 @@ FDM.init = function(kiri, api) {
if (!isFdmMode) {
return;
}
// if (!api.conf.get().controller.danger) {
if (!api.conf.get().controller.danger) {
return;
// }
}
let pct = 0;
let int = setInterval(() => {
if (pct <= 1) {

1
src/kiri-mode/laser/driver.js
View file

@ -28,7 +28,6 @@ const LASER = driver.LASER = {
function init(kiri, api) {
api.event.on("settings.saved", (settings) => {
let ui = kiri.api.ui;
ui.knife.marker.style.display = ui.knifeOn.checked ? '' : 'none';
});
}

2
src/kiri/init.js
View file

@ -1951,8 +1951,8 @@ gapp.register("kiri.init", [], (root, exports) => {
camStockOffset: uc.newBoolean(LANG.cs_offs_s, onBooleanClick, {title:LANG.cs_offs_l, modes:CAM}),
camStockClipTo: uc.newBoolean(LANG.cs_clip_s, onBooleanClick, {title:LANG.cs_clip_l, modes:CAM}),
camSep: uc.newBlank({class:"pop-sep", modes:CAM}),
camStockIndexGrid: uc.newBoolean(LANG.cs_ishg_s, onBooleanClick, {title:LANG.cs_ishg_l, modes:CAM, show:() => ui.camStockIndexed.checked}),
camStockIndexed: uc.newBoolean(LANG.cs_indx_s, onBooleanClick, {title:LANG.cs_indx_l, modes:CAM}),
camStockIndexGrid: uc.newBoolean(LANG.cs_ishg_s, onBooleanClick, {title:LANG.cs_ishg_l, modes:CAM, show:() => ui.camStockIndexed.checked}),
camCommon: uc.newGroup(LANG.cc_menu, null, {modes:CAM}),
camZAnchor: uc.newSelect(LANG.ou_zanc_s, {title: LANG.ou_zanc_l, action:zAnchorSave, modes:CAM, trace:true, show:() => !ui.camStockIndexed.checked}, "zanchor"),

113
src/kiri/ui.js
View file

@ -253,48 +253,47 @@ gapp.register("kiri.ui", [], (root, exports) => {
let row = DOC.createElement('div'),
dbkey = `beta-${prefix}-show-${group}`,
popper = !opt.inline && label,
// popper = !opt.inline && label,
link;
if (popper) {
let pop = DOC.createElement('div');
pop.classList.add('set-pop');
if (opt.class) {
for (let ce of opt.class.split(' ')) {
pop.classList.add(ce);
}
}
row.appendChild(pop);
row.setAttribute("class", "set-group noselect");
addTo = pop;
} else {
// if (popper) {
// let pop = DOC.createElement('div');
// pop.classList.add('set-pop');
// if (opt.class) {
// for (let ce of opt.class.split(' ')) {
// pop.classList.add(ce);
// }
// }
// row.appendChild(pop);
// row.setAttribute("class", "set-group noselect");
// addTo = pop;
// } else {
if (opt.class) {
opt.class.split(' ').forEach(ce => {
row.classList.add(ce);
});
} else {
row.setAttribute("class", "set-header col");
row.setAttribute("class", "set-header");
}
addTo = lastDiv;
}
if (opt.marker) {
let marker = row.marker = DOC.createElement('div');
marker.setAttribute('class', 'marker');
row.appendChild(marker);
}
// }
div.appendChild(row);
if (label) {
link = DOC.createElement('a');
link.appendChild(DOC.createTextNode(label));
row.appendChild(link);
let line = DOC.createElement('hr');
line.classList.add('set-header-line');
row.appendChild(line);
}
addModeControls(row, opt);
lastGroup = groups[group] = [];
lastGroup.key = dbkey;
groupName = group;
groupShow[group] = popper ? state[dbkey] === 'true' : state[dbkey] !== 'false';
groupShow[group] = state[dbkey] !== 'false';
// groupShow[group] = popper ? state[dbkey] === 'true' : state[dbkey] !== 'false';
row.onclick = function(ev) {
if (ev.target !== link && ev.target !== row) {
return;
@ -302,41 +301,41 @@ gapp.register("kiri.ui", [], (root, exports) => {
console.log({ toggleGroup: group, dbkey });
toggleGroup(group, dbkey);
};
if (popper) {
let saveclick = row.onclick;
row.onclick = function(ev) {
let showing = groupShow[group];
if (saveclick && showing) {
saveclick(ev);
} else {
row.onmouseenter(ev, true);
}
};
row.onmouseenter = function(ev, click) {
let showing = groupShow[group];
if (!(letHoverPop || click || showing)) {
return;
}
if (ev.target !== link && ev.target !== row) {
return;
}
clearTimeout(exitimer);
showGroup(group);
};
row.onmouseleave = function(ev) {
if (groupSticky) {
return;
}
if (ev.target !== link && ev.target !== row) {
return;
}
clearTimeout(exitimer);
exitimer = setTimeout(showGroup, 1000);
};
addTo._group = group;
addModeControls(addTo, opt);
lastGroup.push(addTo);
}
// if (popper) {
// let saveclick = row.onclick;
// row.onclick = function(ev) {
// let showing = groupShow[group];
// if (saveclick && showing) {
// saveclick(ev);
// } else {
// row.onmouseenter(ev, true);
// }
// };
// row.onmouseenter = function(ev, click) {
// let showing = groupShow[group];
// if (!(letHoverPop || click || showing)) {
// return;
// }
// if (ev.target !== link && ev.target !== row) {
// return;
// }
// clearTimeout(exitimer);
// showGroup(group);
// };
// row.onmouseleave = function(ev) {
// if (groupSticky) {
// return;
// }
// if (ev.target !== link && ev.target !== row) {
// return;
// }
// clearTimeout(exitimer);
// exitimer = setTimeout(showGroup, 1000);
// };
// addTo._group = group;
// addModeControls(addTo, opt);
// lastGroup.push(addTo);
// }
return row;
}

60
web/kiri/index.css
View file

@ -497,10 +497,12 @@ th, tr, td, label {
z-index: -1;
}
.chonk {
height: 10px;
min-height: 10px;
margin: 10px 0 10px 0;
height: 0px;
min-height: 0px;
max-height: 0px;
min-width: 100px;
background-color: rgba(0,0,0,0.25);
border-top: 3px dashed black;
}
#mode-info {
white-space: nowrap;
@ -927,13 +929,12 @@ th, tr, td, label {
gap: 5px;
}
.cam-pop-op {
top: 0;
right: 100%;
text-align: left;
position: absolute;
white-space: nowrap;
flex-direction: column;
top: 0;
right: 100%;
/* transform: translateY(-30%); */
background-color: rgba(255,255,255,0.8);
border: 1px solid #aaa;
border-radius: 5px;
@ -1827,12 +1828,15 @@ th, tr, td, label {
align-items: stretch;
text-transform: capitalize;
background-color: rgba(255,255,255,0.5);
padding: 5px;
gap: 2px;
/* padding: 5px; */
/* gap: 2px; */
}
#settings .set-group {
cursor: pointer;
}
#settings .pop-sep {
display: none !important;
}
.pop-sep {
border: 0 !important;
padding: 0 !important;
@ -1848,12 +1852,19 @@ th, tr, td, label {
right: -9px;
}
.set-header {
background-color: rgba(0,0,0,0.1);
text-align: center;
padding: 3px 5px 3px 5px;
margin: 7px 3px 3px 3px;
white-space: nowrap;
justify-content: center;
border-radius: 2px;
}
.set-header:hover {
background-color: rgba(0,0,0,0.1);
border-radius: 2px;
}
.set-header-line {
margin-left: 5px;
width: 100%;
}
.set-group {
align-items: center;
flex-direction: column;
@ -1881,29 +1892,12 @@ th, tr, td, label {
margin-right: 5px;
padding: 5px;
}
/* .set-pop.xdown {
transform: translateY(-25%) !important;
#settings .var-row {
margin: 0 10px 0 15px;
}
.set-pop.fdmout {
transform: translateY(-63%) !important;
}
.set-pop.fdmadv {
transform: translateY(-74%) !important;
}
.set-pop.rough {
transform: translateY(-14%) !important;
}
.set-pop.outline {
transform: translateY(-36%) !important;
} */
.marker {
position:absolute;
border-radius: 2px;
background-color: rgba(0,0,0,0.25);
bottom: 1px;
left: 1px;
width: 4px;
height: 4px;
#settings .ext-buttons {
margin: 0 9px 0 14px;
gap: 3px;
}
#layers .var-row {
border-radius: 10px;

4
web/kiri/index.html
View file

@ -488,10 +488,10 @@
</div>
</div>
<div id="end" class="f-col a-center">
<!-- <div id="end" class="f-col a-center">
the end
<div id="bottom">the bottom</div>
</div>
</div> -->
<!-- ThreeJS container -->
<div id="container"></div>