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

Block UI with overlay until devices are ready

This commit is contained in:
Matt 2016-04-18 23:44:51 -04:00
parent c6627308b0
commit 83c9fba876
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/main.js
View File

@ -61,6 +61,7 @@ var enumerateDevices = function (err, devices) {
arduino.fakeConnect('camera', function () {
log.info('Connected to fake CAMERA device', 'SERIAL', true, true);
});
devicesReady('fake', 'fake');
} else {
log.info('Found ' + devices.length + ' USB devices', 'SERIAL', true, true);
distinguishDevices(devices);
@ -106,6 +107,7 @@ var distinguishDevices = function (devices) {
if (devices.length === 1) {
arduino.fakeConnect('camera', function () {
log.info('Connected to fake CAMERA device', 'SERIAL', true, true);
devicesReady(devices[0], 'fake');
});
}
} else if (type === 'camera') {
@ -115,6 +117,7 @@ var distinguishDevices = function (devices) {
if (devices.length === 1) {
arduino.fakeConnect('projector', function () {
log.info('Connected to fake PROJECTOR device', 'SERIAL', true, true);
devicesReady('fake', devices[0]);
});
}
}
@ -128,10 +131,12 @@ var distinguishDevices = function (devices) {
if (type === 'projector') {
arduino.connect('projector', devices[1], false, function () {
log.info('Connected to ' + devices[1] + ' as PROJECTOR', 'SERIAL', true, true);
devicesReady(devices[1], devices[0]);
});
} else if (type === 'camera') {
arduino.connect('camera', devices[1], false, function () {
log.info('Connected to ' + devices[1] + ' as CAMERA', 'SERIAL', true, true);
devicesReady(devices[0], devices[1]);
});
}
});
@ -139,6 +144,11 @@ var distinguishDevices = function (devices) {
distinguishDevice(devices[0], distinguishOne);
};
var devicesReady = function (camera, projector) {
'use strict';
mainWindow.webContents.send('ready', {camera: camera, projector: projector });
};
var createMenu = function () {
var template = [
{
@ -277,7 +287,7 @@ var createWindow = function () {
minHeight : 600
});
mainWindow.loadURL('file://' + __dirname + '/index.html');
mainWindow.webContents.openDevTools();
//mainWindow.webContents.openDevTools();
mainWindow.on('closed', function() {
mainWindow = null;
});

63
app/src/index.js
View File

@ -959,7 +959,47 @@ gui.updateState = function () {
$('#seq_cam_count').val(cpos).change();
$('#seq_proj_count').val(ppos).change();
$('#seq_cam_count_2').val(cpos).change();
$('#seq_proj_count_2').val(ppos).change();
};
gui.spinner = function (state) {
var cfg = {
lines: 11, // The number of lines to draw
length: 15, // The length of each line
width: 7, // The line thickness
radius: 20, // The radius of the inner circle
corners: 1, // Corner roundness (0..1)
rotate: 0, // The rotation offset
direction: 1, // 1: clockwise, -1: counterclockwise
color: '#F2F2F1', // #rgb or #rrggbb or array of colors
speed: 1, // Rounds per second
trail: 60, // Afterglow percentage
shadow: true, // Whether to render a shadow
hwaccel: true, // Whether to use hardware acceleration
className: 'spinner', // The CSS class to assign to the spinner
zIndex: 2e9, // The z-index (defaults to 2000000000)
top: '50%', // Top position relative to parent
left: '50%' // Left position relative to parent
},
target,
spinner;
if (state) {
target = document.getElementById('spinner');
spinner = new Spinner(cfg).spin(target);
} else {
$('#spinner').hide();
$('#psinner').empty();
}
};
gui.overlay = function (state) {
if (state) {
$('#overlay').show();
} else {
$('#overlay').hide();
}
};
gui.info = function (title, message) {
'use strict';
var config = {
@ -1249,11 +1289,34 @@ nav.change = function (id) {
}
};
var devices = {};
devices.init = function () {
'use strict';
devices.listen();
gui.overlay(true);
gui.spinner(true);
};
devices.listen = function () {
'use strict';
ipcRenderer.on('ready', function (event, arg) {
//console.log(arg.camera);
//console.log(arg.projector);
devices.ready();
return event.returnValue = true;
});
};
devices.ready = function () {
'use strict';
gui.spinner(false);
gui.overlay(false);
};
var init = function () {
'use strict';
nav.init();
gui.grid.init();
log.init();
devices.init();
light.init();
proj.init();
cam.init();