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 settings, language, other modal dialog work

Browse source
This commit is contained in:
Stewart Allen 2020-06-06 20:05:21 -04:00
commit 28a1cd5051
10 changed files with 292 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

176
src/kiri/init.js
View file

@ -510,7 +510,7 @@
}
function getSelectedDevice() {
return UI.deviceSelect.options[UI.deviceSelect.selectedIndex].text;
return UI.deviceList.options[UI.deviceList.selectedIndex].text;
}
function selectDevice(devicename, lock) {
@ -535,7 +535,6 @@
}
function setDeviceCode(code, devicename) {
return console.log('TODO setDeviceCode');
try {
if (typeof(code) === 'string') code = js2o(code) || {};
@ -559,19 +558,21 @@
if (dev.extruders) {
let ext = API.lists.extruders = [];
dev.internal = 0;
let selext = $('sel-ext');
let selext = $('pop-nozzle');
selext.innerHTML = '';
for (let i=dev.extruders.length-1; i>=0; i--) {
let d = DOC.createElement('div');
let b = DOC.createElement('button');
b.appendChild(DOC.createTextNode(i));
b.setAttribute('id', `sel-ext-${i}`);
d.appendChild(b);
// b.setAttribute('id', `pop-nozzle-${i}`);
b.onclick = function() {
API.selection.for_widgets(w => {
current.widget[w.id] = {extruder: i};
});
API.platform.update_selected();
};
selext.appendChild(b);
selext.appendChild(d);
ext.push({id:i, name:i});
}
}
@ -627,9 +628,9 @@
e.parentNode.style.display = dev.spindleMax >= 0 ? 'none' : 'block';
});
UI.deviceSave.disabled = !local;
UI.deviceDelete.disabled = !local;
UI.deviceAdd.disabled = dev.noclone;
// UI.deviceSave.disabled = !local;
// UI.deviceDelete.disabled = !local;
// UI.deviceAdd.disabled = dev.noclone;
API.view.update_fields();
platform.update_size();
@ -665,9 +666,6 @@
}
function renderDevices(devices) {
UI.devices.onclick = UC.hidePop;
UC.hidePop();
let selectedIndex = -1,
selected = API.device.get(),
devs = settings().devices;
@ -687,33 +685,33 @@
devices = devices.sort();
UI.deviceClose.onclick = API.dialog.hide;
UI.deviceSave.onclick = function() {
API.function.clear();
API.conf.save();
showDevices();
};
UI.deviceAdd.onclick = function() {
API.function.clear();
cloneDevice();
showDevices();
};
UI.deviceDelete.onclick = function() {
API.function.clear();
removeLocalDevice(getSelectedDevice());
showDevices();
};
UI.deviceAll.onclick = function() {
API.show.favorites(false);
showDevices();
};
UI.deviceFavorites.onclick = function() {
API.show.favorites(true);
showDevices();
};
UI.deviceSelect.innerHTML = '';
// UI.deviceClose.onclick = API.dialog.hide;
// UI.deviceSave.onclick = function() {
// API.function.clear();
// API.conf.save();
// showDevices();
// };
// UI.deviceAdd.onclick = function() {
// API.function.clear();
// cloneDevice();
// showDevices();
// };
// UI.deviceDelete.onclick = function() {
// API.function.clear();
// removeLocalDevice(getSelectedDevice());
// showDevices();
// };
//
// UI.deviceAll.onclick = function() {
// API.show.favorites(false);
// showDevices();
// };
// UI.deviceFavorites.onclick = function() {
// API.show.favorites(true);
// showDevices();
// };
//
UI.deviceList.innerHTML = '';
let incr = 0;
let faves = API.show.favorites();
let found = false;
@ -751,7 +749,7 @@
};
if (loc) opt.setAttribute("local", 1);
if (loc || fav) opt.setAttribute("favorite", 1);
UI.deviceSelect.appendChild(opt);
UI.deviceList.appendChild(opt);
if (device === selected) {
selectedIndex = incr;
found = true;
@ -760,17 +758,12 @@
});
if (selectedIndex >= 0) {
UI.deviceSelect.selectedIndex = selectedIndex;
UI.deviceList.selectedIndex = selectedIndex;
selectDevice(selected);
} else {
UI.deviceSelect.selectedIndex = 0;
UI.deviceList.selectedIndex = 0;
selectDevice(first);
}
API.dialog.show('devices', true);
API.dialog.update();
UI.deviceSelect.focus();
}
function renderTools() {
@ -968,10 +961,15 @@
UI.toolSelect.focus();
}
function updateDeviceList() {
renderDevices(Object.keys(devices[API.mode.get_lower()]).sort());
}
function showDevices() {
if (deviceLock) return;
API.modal.hide();
renderDevices(Object.keys(devices[API.mode.get_lower()]).sort());
updateDeviceList();
API.modal.show('setup');
UI.deviceList.focus();
}
function dragOverHandler(evt) {
@ -1094,25 +1092,28 @@
menusep: $('lt-sep'),
rotate: $('lt-rotate'),
scale: $('lt-scale'),
nozzle: $('lt-nozzle'),
modal: $('modal'),
help: $('mod-help'),
setup: $('mod-setup'),
tools: $('mod-tools'),
prefs: $('mod-prefs'),
files: $('mod-files'),
print: $('mod-print'),
local: $('mod-local'),
files: $('mod-files'),
setup: $('mod-setup'),
catalogBody: $('catalogBody'),
catalogList: $('catalogList'),
devices: $('devices'),
deviceList: $('device-list'),
deviceAdd: $('device-add'),
deviceDelete: $('device-del'),
deviceSave: $('device-save'),
deviceClose: $('device-close'),
deviceSelect: $('device-select'),
deviceFavorites: $('device-favorites'),
deviceAll: $('device-all'),
tools: $('tools'),
toolsSave: $('tools-save'),
toolsClose: $('tools-close'),
toolSelect: $('tool-select'),
@ -1231,14 +1232,14 @@
// ]
// ], {modes:ALL, expert:true}),
layout: UC.newGroup(LANG.op_menu),
layout: UC.newGroup(LANG.op_menu, $('mod-prefs'), {nocompact: true}),
expert: UC.newBoolean(LANG.op_xprt_s, booleanSave, {title:LANG.op_xprt_l}),
dark: UC.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l}),
showOrigin: UC.newBoolean(LANG.op_show_s, booleanSave, {title:LANG.op_show_l, modes:GCODE}),
alignTop: UC.newBoolean(LANG.op_alig_s, booleanSave, {title:LANG.op_alig_l, modes:CAM}),
autoLayout: UC.newBoolean(LANG.op_auto_s, booleanSave, {title:LANG.op_auto_l}),
freeLayout: UC.newBoolean(LANG.op_free_s, booleanSave, {title:LANG.op_free_l, modes:ALL, expert:true}),
reverseZoom: UC.newBoolean(LANG.op_invr_s, booleanSave, {title:LANG.op_invr_l, modes:ALL, expert:true}),
freeLayout: UC.newBoolean(LANG.op_free_s, booleanSave, {title:LANG.op_free_l, modes:ALL}),
reverseZoom: UC.newBoolean(LANG.op_invr_s, booleanSave, {title:LANG.op_invr_l, modes:ALL}),
units: UC.newSelect(LANG.op_unit_s, {title: LANG.op_unit_l, modes:CAM}, "units"),
// allow modules to insert new items at the bottom of the left menu
@ -1447,19 +1448,12 @@
layerMoves: UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE})
});
// populate language drop-down
let lp = $('langpop');
let elp = DOC.createElement("div");
let dlp = DOC.createElement("div");
elp.appendChild(DOC.createTextNode('english'));
dlp.appendChild(DOC.createTextNode('danish'));
lp.appendChild(elp);
lp.appendChild(dlp);
elp.onclick = function() {
// bind language choices
$('lset-en').onclick = function() {
SDB.setItem('kiri-lang', 'en-us');
API.space.reload();
};
dlp.onclick = function() {
$('lset-da').onclick = function() {
SDB.setItem('kiri-lang', 'da-dk');
API.space.reload();
};
@ -1579,13 +1573,20 @@
// };
//
// $('cache-close').onclick = API.dialog.hide;
//
// UI.toolMetric.onclick = updateTool;
// UI.toolType.onchange = updateTool;
UI.toolMetric.onclick = updateTool;
UI.toolType.onchange = updateTool;
function showSetup() {
API.modal.show('setup');
}
// bind interface action elements
$('app-name').onclick = API.help.show;
$('lt-setup').onclick = () => { API.modal.show('setup') };
$('app-mode').onclick = showSetup;
$('set-device').onclick = showSetup;
$('set-tools').onclick = showTools;
$('set-prefs').onclick = () => { API.modal.show('prefs') };
$('file-recent').onclick = () => { API.modal.show('files') };
$('file-import').onclick = API.event.import;
$('act-slice').onclick = API.function.slice;
@ -1595,14 +1596,28 @@
$('view-top').onclick = SPACE.view.top;
$('view-home').onclick = SPACE.view.home;
$('mode-fdm').onclick = () => { API.mode.set('FDM') };
$('mode-sla').onclick = () => { API.mode.set('SLA') };
$('mode-cam').onclick = () => { API.mode.set('CAM') };
$('mode-laser').onclick = () => { API.mode.set('LASER') };
function mksvg(src) {
let svg = DOC.createElement('svg');
svg.innerHTML = src;
return svg;
}
$('mode-fdm').appendChild(mksvg(icons.fdm));
$('mode-sla').appendChild(mksvg(icons.sla));
$('mode-cam').appendChild(mksvg(icons.cnc));
$('mode-laser').appendChild(mksvg(icons.laser));
SPACE.platform.setSize(
settings().device.bedWidth,
settings().device.bedDepth,
settings().device.bedHeight
);
// UI.selection.classList.add('compact');
if (dark) {
SPACE.platform.setGrid(25, 5, 0x999999, 0x333333);
SPACE.platform.opacity(0.8);
@ -1635,22 +1650,6 @@
}
});
// SPACE.mouse.onHover(function(d,me) {
// if (d) {
// // console.log(d,d.object.widget.id,d.face.materialIndex)
// // d.object.material.vertexColors = true;
// // d.object.material.needsUpdate = true;
// // d.face.vertexColors = [
// // new THREE.Color(0xffaa88),
// // new THREE.Color(0xffaa88),
// // new THREE.Color(0xffaa88)
// // ];
// // d.face.materialIndex = 1;
// } else {
// return API.widgets.meshes();
// }
// });
SPACE.mouse.onDrag(function(delta) {
if (delta && UI.freeLayout.checked) {
let set = settings();
@ -1754,6 +1753,9 @@
// setup tab visibility watcher
// DOC.addEventListener('visibilitychange', function() { document.title = document.hidden });
// fill device list
updateDeviceList();
// ensure settings has gcode
selectDevice(DEVNAME || API.device.get(), DEVNAME);

31
src/kiri/main.js
View file

@ -808,8 +808,6 @@
callback();
}
}
// update slider window
API.dialog.update();
// handle slicing errors
if (error && !errored) {
errored = true;
@ -1019,8 +1017,10 @@
function platformUpdateSelected() {
let menu_show = platform.selected_count() ? 'flex': '';
let ext_show = platform.selected_count() && MODE === 'FDM' ? 'flex': '';
UI.scale.style.display = menu_show;
UI.rotate.style.display = menu_show;
UI.nozzle.style.display = menu_show;
UI.menusep.style.display = menu_show;
// $('ext-sel').style.display = (MODE === MODES.FDM) ? 'inline-block' : 'none';
let extruders = settings.device.extruders;
@ -1281,7 +1281,7 @@
camStock.material.visible = settings.mode === 'CAM';
camTopZ = csz;
} else if (camStock) {
UI.stock.style.display = 'none';
// UI.stock.style.display = 'none';
SPACE.platform.remove(camStock);
camStock = null;
camTopZ = topZ;
@ -1630,7 +1630,7 @@
visible = modalShowing(),
info = { pct: 0 };
["setup","print","help","files","local"].forEach(function(name) {
["help","setup","tools","prefs","files","print","local"].forEach(function(name) {
UI[name].style.display = name === which ? 'flex' : '';
});
@ -1725,9 +1725,9 @@
settings.process.outputOriginCenter = (settings.device.originCenter || false);
}
if (!named) {
hideModal();
}
// if (!named) {
// hideModal();
// }
updateFields();
API.conf.update();
@ -1778,7 +1778,6 @@
row.appendChild(del);
table.appendChild(row);
});
API.dialog.update();
}
function showSettings() {
@ -1801,7 +1800,7 @@
}
function showHelpFile(local) {
hideModal();
// hideModal();
if (!local) {
WIN.open("//wiki.grid.space/wiki/Kiri:Moto", "_help");
return;
@ -1815,7 +1814,7 @@
}
function showLocal() {
$('local-close').onclick = hideModal;
// $('local-close').onclick = hideModal;
showModal('local');
fetch("/api/grid_local")
.then(r => r.json())
@ -1918,12 +1917,12 @@
}
function setMode(mode, lock, then) {
hideModal();
if (!MODES[mode]) {
DBUG.log("invalid mode: "+mode);
mode = 'FDM';
}
$('app-mode').innerHTML = mode;
$('set-tools').style.display = mode === 'CAM' ? '' : 'none';
settings.mode = mode;
// restore cached device profile for this mode
if (settings.cdev[mode]) {
@ -1943,6 +1942,14 @@
API.conf.save();
clearWidgetCache();
SPACE.update();
["fdm","sla","cam","laser"].forEach(dev => {
let cl = $(`mode-${dev}`).classList;
if (dev === mode.toLowerCase()) {
cl.add("dev-sel");
} else {
cl.remove("dev-sel");
}
});
// UI.modeFDM.setAttribute('class', MODE === MODES.FDM ? 'buton' : '');
// UI.modeSLA.setAttribute('class', MODE === MODES.SLA ? 'buton' : '');
// UI.modeCAM.setAttribute('class', MODE === MODES.CAM ? 'buton' : '');
@ -1959,7 +1966,7 @@
triggerSettingsEvent();
platformUpdateSelected();
updateFields();
if (settings.device.new) {
if (modalShowing()) {
API.show.devices();
}
API.event.emit("mode.set", mode);

14
src/kiri/ui.js
View file

@ -59,8 +59,6 @@
};
function setMode(mode) {
// $('control-left').classList.add('compact');
// $('control-right').classList.add('compact');
Object.keys(groupShow).forEach(group => {
updateGroupShow(group);
});
@ -344,7 +342,7 @@
row.appendChild(newLabel(label));
row.appendChild(btn);
row.setAttribute("class", "flow-row");
row.setAttribute("class", "var-row");
if (opt.title) row.setAttribute("title", options.title);
btn.setVisible = row.setVisible;
@ -362,7 +360,7 @@
row.appendChild(newLabel(label));
row.appendChild(ip);
row.setAttribute("class", "flow-row");
row.setAttribute("class", "var-row");
if (height > 1) {
ip.setAttribute("cols", size);
ip.setAttribute("rows", height);
@ -432,7 +430,7 @@
if (label) row.appendChild(newLabel(label));
row.appendChild(ip);
row.setAttribute("class", "flow-row");
row.setAttribute("class", "var-row");
ip.setAttribute("type", "range");
ip.setAttribute("min", (options && options.min ? options.min : 0));
ip.setAttribute("max", (options && options.max ? options.max : 100));
@ -459,7 +457,7 @@
row.appendChild(newLabel(label));
row.appendChild(ip);
row.setAttribute("source", source || "tools");
row.setAttribute("class", "flow-row");
row.setAttribute("class", "var-row");
row.style.display = hide ? 'none' : '';
if (options) {
if (options.convert) ip.convert = options.convert.bind(ip);
@ -482,7 +480,7 @@
row.appendChild(newLabel(label));
}
row.appendChild(ip);
row.setAttribute("class", "flow-row");
row.setAttribute("class", "var-row");
row.style.display = hide ? 'none' : '';
ip.setAttribute("type", "checkbox");
ip.checked = false;
@ -503,7 +501,7 @@
let row = newDiv(options),
hide = options && options.hide;
row.setAttribute("class", "flow-row");
row.setAttribute("class", "var-row");
row.style.display = hide ? 'none' : '';
ip.setVisible = row.setVisible;