16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Sequence UI was broken with capture/transfer logic

This commit is contained in:
mmcw-dev 2018-01-05 09:17:41 -05:00
parent a84b1019f1
commit 4c2af4415c
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/light-ui.js
View File

@ -109,7 +109,7 @@ light.colorPickers = function () {
}); });
light.rgb.init(); light.rgb.init();
light.kelvin.init(); light.kelvin.init();
light.cmy.init(); //light.cmy.init();
}; };
light.set = function (rgb, callback) { //rgb = [0,0,0] light.set = function (rgb, callback) { //rgb = [0,0,0]
'use strict'; 'use strict';

10
app/lib/seq-ui.js
View File

@ -74,10 +74,10 @@ seq.run = function () {
log.info('Sequence completed in ' + humanizeDuration(timeEnd), 'SEQUENCE', true); log.info('Sequence completed in ' + humanizeDuration(timeEnd), 'SEQUENCE', true);
} }
capture.report = ipcRenderer.sendSync('transfer', { action: 'end'}); //capture.report = ipcRenderer.sendSync('transfer', { action: 'end'});
if (capture.active) { //if (capture.active) {
alert(capture.report); //alert(capture.report);
} //}
gui.notify('Sequence done!', (mcopy.state.sequence.arr.length * mcopy.loop) + ' actions completed in ' + humanizeDuration(timeEnd)); gui.notify('Sequence done!', (mcopy.state.sequence.arr.length * mcopy.loop) + ' actions completed in ' + humanizeDuration(timeEnd));
//clear gui //clear gui
$('.row input').removeClass('h'); $('.row input').removeClass('h');
@ -108,7 +108,7 @@ seq.init = function (start) {
} }
seq.stop(false); seq.stop(false);
seq.i = start; seq.i = start;
ipcRenderer.sendSync('transfer', { action: 'start'}); //ipcRenderer.sendSync('transfer', { action: 'start'});
seq.run(); seq.run();
}; };
seq.stats = function () { seq.stats = function () {

5
app/main.js
View File

@ -343,11 +343,10 @@ cam.end = function (cmd, id, ms) {
}; };
log.file = function () { log.file = function () {
const platform = process.platform
let logPath = `/var/log/mcopy/` let logPath = `/var/log/mcopy/`
if (platform === 'darwin') { if (process.platform === 'darwin') {
} else if (platform === 'win32') { } else if (process.platform === 'win32') {
} }