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 preview feature and generally clean up view state progression

Browse source
This commit is contained in:
Stewart Allen 2020-11-15 13:44:48 -05:00
commit 76d2ad5530
4 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/kiri/export.js
View file

@ -19,24 +19,14 @@
let printSeq = parseInt(SDB['kiri-print-seq'] || SDB['print-seq'] || "0") + 1;
function isPrepared() {
return API.view.get() === API.const.VIEWS.PREVIEW;
}
function exportFile(options) {
if (isPrepared()) {
const mode = API.mode.get();
API.event.emit('export', mode);
switch (mode) {
case 'LASER': return callExportLaser(options);
case 'FDM': return callExport(options, mode);
case 'CAM': return callExport(options, mode);
case 'SLA': return callExportSLA(options);
}
} else {
API.function.prepare(function() {
exportFile(options)
});
const mode = API.mode.get();
API.event.emit('export', mode);
switch (mode) {
case 'LASER': return callExportLaser(options);
case 'FDM': return callExport(options, mode);
case 'CAM': return callExport(options, mode);
case 'SLA': return callExportSLA(options);
}
}

5
src/kiri/init.js
View file

@ -154,7 +154,10 @@
UI.fps.style.display = on ? 'block' : '';
if (on) {
setInterval(() => {
UI.fps.innerText = SPACE.view.getFPS().toFixed(2);
const nv = SPACE.view.getFPS().toFixed(2);
if (nv !== UI.fps.innerText) {
UI.fps.innerText = nv;
}
}, 100);
}
}

30
src/kiri/main.js
View file

@ -42,6 +42,7 @@
MODE = MODES.FDM,
STACKS = KIRI.stacks,
DRIVER = undefined,
complete = {},
onEvent = {},
selectedMeshes = [],
localFilterKey ='kiri-gcode-filters',
@ -239,7 +240,7 @@
slice: prepareSlices,
print: preparePreview,
prepare: preparePreview,
export: function() { KIRI.export(...arguments) },
export: prepareExport,
cancel: cancelWorker,
clear: KIRI.client.clear
},
@ -696,6 +697,9 @@
callback = preparePreview;
}
// clear completion marks
complete = {};
hideSlider(true);
platform.deselect();
setViewMode(VIEWS.SLICE);
@ -752,6 +756,8 @@
API.event.emit('slice.end', getMode());
// print stats
DBUG.log(segtimes);
// mark slicing complete for prep/preview
complete.slice = true;
if (callback && typeof callback === 'function') {
callback();
}
@ -783,11 +789,14 @@
}
function preparePreview(callback) {
if (viewMode === VIEWS.PREVIEW) return;
if (viewMode === VIEWS.ARRANGE) {
if (complete.preview) {
return;
}
if (!complete.slice) {
prepareSlices(() => {
preparePreview(callback);
});
return;
}
hideSlider(true);
@ -834,12 +843,27 @@
updateSpeeds(maxSpeed);
}
// mark preview complete for export
complete.preview = true;
if (typeof(callback) === 'function') {
callback();
}
});
}
function prepareExport() {
const argsave = arguments;
if (!complete.preview) {
preparePreview(() => {
prepareExport(...argsave);
});
return;
}
complete.export = true;
KIRI.export(...argsave);
}
function loadCode(code, type) {
setViewMode(VIEWS.PREVIEW);
setOpacity(0);