From 83c9fba8763838b16a3d9ae751b7962293ef5df6 Mon Sep 17 00:00:00 2001
From: Matt <sixteenmillimeter@riseup.net>
Date: Mon, 18 Apr 2016 23:44:51 -0400
Subject: [PATCH] Block UI with overlay until devices are ready

---
 app/main.js      | 12 ++++++++-
 app/src/index.js | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/app/main.js b/app/main.js
index 4ed65b0..5ba99a1 100644
--- a/app/main.js
+++ b/app/main.js
@@ -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;
 	});
diff --git a/app/src/index.js b/app/src/index.js
index 02b4a2e..5de6e6d 100644
--- a/app/src/index.js
+++ b/app/src/index.js
@@ -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();