From 194284f16d41a2c87f85c86a9e541978a15c4e60 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 18 Apr 2020 11:34:54 -0400 Subject: [PATCH] move some stats to events --- js/kiri-export.js | 2 +- js/kiri-init.js | 8 +++----- js/kiri.js | 11 ++++------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/js/kiri-export.js b/js/kiri-export.js index 6d75ae3e..a13ea603 100644 --- a/js/kiri-export.js +++ b/js/kiri-export.js @@ -24,7 +24,7 @@ let gs_kiri_export = exports; function exportPrint() { let currentPrint = API.print.get(); if (currentPrint) { - STATS.add(`ua_${API.mode.get_lower()}_export`); + API.event.emit('export', API.mode.get()); switch (API.mode.get()) { case 'LASER': return exportPrintLaser(currentPrint); case 'FDM': return exportPrintGCODE(currentPrint); diff --git a/js/kiri-init.js b/js/kiri-init.js index 118b5008..a8a84f48 100644 --- a/js/kiri-init.js +++ b/js/kiri-init.js @@ -539,10 +539,10 @@ var gs_kiri_init = exports; function setDeviceCode(code, devicename) { try { - STATS.set(`ud_${API.mode.get_lower()}`, devicename); - if (typeof(code) === 'string') code = js2o(code) || {}; + API.event.emit('device.set', devicename); + let mode = API.mode.get(), current = settings(), local = isLocalDevice(devicename), @@ -968,8 +968,6 @@ var gs_kiri_init = exports; API.dialog.show('tools'); UI.toolSelect.focus(); - - STATS.add('ua_get_tools'); } function showDevices() { @@ -978,7 +976,6 @@ var gs_kiri_init = exports; API.ajax("/api/filters-"+API.mode.get_lower(), function(flvalue) { if (!flvalue) return; renderDevices(js2o(flvalue)); - STATS.add('ua_get_devs'); }); } @@ -1743,6 +1740,7 @@ var gs_kiri_init = exports; scr.setAttribute('src','/code/'+lib+'.js'); DOC.body.appendChild(scr); STATS.add('load_'+lib); + API.event.emit('load.lib', lib); }); // load CSS extensions diff --git a/js/kiri.js b/js/kiri.js index cc6372e8..8c699dc2 100644 --- a/js/kiri.js +++ b/js/kiri.js @@ -684,8 +684,7 @@ self.kiri.copyright = exports.COPYRIGHT; currentPrint.render(); - // on done - STATS.add(`ua_${getModeLower()}_print`); + API.event.emit('print', getMode()); SPACE.platform.add(currentPrint.group); SPACE.update(); @@ -774,7 +773,7 @@ self.kiri.copyright = exports.COPYRIGHT; // update segment time if (lastMsg) segtimes[segNumber+"_"+lastMsg] = mark - startTime; DBUG.log(segtimes); - STATS.add(`ua_${getModeLower()}_slice`); + API.event.emit('slice', getMode()); updateSliderMax(true); if (preserveMax != API.var.layer_max) { preserveLayer = API.var.layer_max; @@ -1757,7 +1756,6 @@ self.kiri.copyright = exports.COPYRIGHT; hideDialog(); if (!local) { WIN.open("//wiki.grid.space/wiki/Kiri:Moto", "_help"); - STATS.add('ua_help'); return; } ajax(local, function(html) { @@ -1765,8 +1763,8 @@ self.kiri.copyright = exports.COPYRIGHT; $('help-close').onclick = hideModal; $('kiri-version').innerHTML = `${LANG.version} ${KIRI.version}`; showModal('help'); - STATS.add('ua_help'); }); + API.event.emit('help.show', local); } function showLocal() { @@ -1883,8 +1881,6 @@ self.kiri.copyright = exports.COPYRIGHT; if (settings.cdev[mode]) { settings.device = clone(settings.cdev[mode]); } - // update device stat for FDM/CAM - STATS.set(`ud_${getModeLower()}`, settings.filter[mode] || 'default'); MODE = MODES[mode]; // updates right-hand menu by enabling/disabling fields UC.setMode(MODE); @@ -1910,6 +1906,7 @@ self.kiri.copyright = exports.COPYRIGHT; if (settings.device.new) { API.show.devices(); } + API.event.emit("mode.set", mode); } function updateSkipSliceView() {