From 4c2af4415c5226bd37d3b3332ff6f7a52d8a4ba4 Mon Sep 17 00:00:00 2001 From: mmcw-dev Date: Fri, 5 Jan 2018 09:17:41 -0500 Subject: [PATCH] Sequence UI was broken with capture/transfer logic --- app/lib/light-ui.js | 2 +- app/lib/seq-ui.js | 10 +++++----- app/main.js | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/lib/light-ui.js b/app/lib/light-ui.js index 018fc38..95c6852 100644 --- a/app/lib/light-ui.js +++ b/app/lib/light-ui.js @@ -109,7 +109,7 @@ light.colorPickers = function () { }); light.rgb.init(); light.kelvin.init(); - light.cmy.init(); + //light.cmy.init(); }; light.set = function (rgb, callback) { //rgb = [0,0,0] 'use strict'; diff --git a/app/lib/seq-ui.js b/app/lib/seq-ui.js index c0102e5..fe60da9 100644 --- a/app/lib/seq-ui.js +++ b/app/lib/seq-ui.js @@ -74,10 +74,10 @@ seq.run = function () { log.info('Sequence completed in ' + humanizeDuration(timeEnd), 'SEQUENCE', true); } - capture.report = ipcRenderer.sendSync('transfer', { action: 'end'}); - if (capture.active) { - alert(capture.report); - } + //capture.report = ipcRenderer.sendSync('transfer', { action: 'end'}); + //if (capture.active) { + //alert(capture.report); + //} gui.notify('Sequence done!', (mcopy.state.sequence.arr.length * mcopy.loop) + ' actions completed in ' + humanizeDuration(timeEnd)); //clear gui $('.row input').removeClass('h'); @@ -108,7 +108,7 @@ seq.init = function (start) { } seq.stop(false); seq.i = start; - ipcRenderer.sendSync('transfer', { action: 'start'}); + //ipcRenderer.sendSync('transfer', { action: 'start'}); seq.run(); }; seq.stats = function () { diff --git a/app/main.js b/app/main.js index bd28618..7078d60 100644 --- a/app/main.js +++ b/app/main.js @@ -343,11 +343,10 @@ cam.end = function (cmd, id, ms) { }; log.file = function () { - const platform = process.platform let logPath = `/var/log/mcopy/` - if (platform === 'darwin') { + if (process.platform === 'darwin') { - } else if (platform === 'win32') { + } else if (process.platform === 'win32') { }