Compilation of app.js after push to modules
It’s, like, 100 lines shorter!
This commit is contained in:
Matt
parent
7313f415bf
commit
79d61c4878
548
app/js/app.js
548
app/js/app.js
|
|
@ -3049,11 +3049,12 @@ var remote = require('remote'),
|
|||
light = require('./lib/light-ui.js'),
|
||||
proj = require('./lib/proj-ui.js'),
|
||||
cam = require('./lib/cam-ui.js'),
|
||||
nav = {},
|
||||
nav = require('./lib/nav-ui.js'),
|
||||
seq = require('./lib/seq-ui.js'),
|
||||
cmd = require('./lib/cmd-ui.js'),
|
||||
gui = {},
|
||||
gui = require('./lib/gui.js'),
|
||||
log = require('./lib/log-ui.js'),
|
||||
devices = require('./lib/devices-ui.js'),
|
||||
mscript = require('./lib/mscript.js');
|
||||
//console.log(ipcRenderer.sendSync('light', { 'fuck' : true }) );
|
||||
|
||||
|
|
@ -3098,549 +3099,6 @@ mcopy.state = {
|
|||
|
||||
//mcopy.gui.updateState();
|
||||
|
||||
//GUI
|
||||
gui.fmtZero = function (val, len) {
|
||||
var raw = val,
|
||||
str = val + '',
|
||||
output = ''
|
||||
if (raw < 0) {
|
||||
output = '-' + Array(len - (str.length - 1)).join('0') + str.replace('-', '');
|
||||
} else {
|
||||
if (str.length < len) {
|
||||
output = Array(len - str.length).join('0') + str;
|
||||
} else if (str.length >= len) {
|
||||
str = parseInt(str) + '';
|
||||
output = Array(len - str.length).join('0') + str;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
};
|
||||
gui.counterFormat = function (t, normal, prevent) {
|
||||
var raw = t.value;
|
||||
t.value = gui.fmtZero(raw, 6);
|
||||
if (typeof normal !== 'undefined' && parseInt(raw) !== normal) {
|
||||
$(t).addClass('changed');
|
||||
} else {
|
||||
$(t).removeClass('changed');
|
||||
}
|
||||
if (typeof prevent === 'undefined') { prevent = false; }
|
||||
if (!prevent) {
|
||||
gui.shootGoto(t);
|
||||
}
|
||||
};
|
||||
gui.notify = function (title, message) {
|
||||
'use strict';
|
||||
notifier.notify({
|
||||
title: title,
|
||||
message: message,
|
||||
//icon: path.join(__dirname, 'coulson.jpg'), // Absolute path (doesn't work on balloons)
|
||||
sound: true, // Only Notification Center or Windows Toasters
|
||||
wait: true // Wait with callback, until user action is taken against notification
|
||||
}, function (err, response) {
|
||||
// Response is response from notification
|
||||
});
|
||||
};
|
||||
gui.shootGoto = function (t) {
|
||||
var elem = $(t),
|
||||
id = elem.attr('id').split('_'),
|
||||
val = 0,
|
||||
comp = 0,
|
||||
other = {};
|
||||
if (id[1] === 'cam') {
|
||||
comp = mcopy.state.camera.pos;
|
||||
} else if (id[1] === 'proj') {
|
||||
comp = mcopy.state.projector.pos;
|
||||
}
|
||||
if (id[0] === 'shoot') {
|
||||
other = $('#goto_' + id[1]);
|
||||
val = parseInt(elem.val()) + comp;
|
||||
other.val(val);
|
||||
gui.counterFormat(other[0], comp, true);
|
||||
//other.trigger('change');
|
||||
} else if (id[0] === 'goto'){
|
||||
other = $('#shoot_' + id[1]);
|
||||
val = parseInt(elem.val()) - comp;
|
||||
other.val(val);
|
||||
gui.counterFormat(other[0], undefined, true);
|
||||
} else {
|
||||
//ALLOW TO EXECUTE WITH NO RESULTS
|
||||
//console.log('You screwed up the markup.');
|
||||
}
|
||||
};
|
||||
gui.updateCam = function (t) {
|
||||
var val = t.value,
|
||||
change;
|
||||
if (parseInt(val) === mcopy.state.camera.pos) { return false; }
|
||||
change = confirm('Are you sure you want to set camera counter to ' + val + '?');
|
||||
if (change) {
|
||||
mcopy.state.camera.pos = parseInt(val);
|
||||
gui.updateState();
|
||||
} else {
|
||||
t.value = mcopy.state.camera.pos;
|
||||
gui.counterFormat(t);
|
||||
}
|
||||
};
|
||||
gui.updateProj = function (t) {
|
||||
var val = t.value,
|
||||
change;
|
||||
if (parseInt(val) === mcopy.state.projector.pos) { return false; }
|
||||
change = confirm('Are you sure you want to set projector counter to ' + val + '?');
|
||||
if (change) {
|
||||
mcopy.state.projector.pos = parseInt(val);
|
||||
gui.updateState();
|
||||
} else {
|
||||
t.value = mcopy.state.projector.pos;
|
||||
gui.counterFormat(t);
|
||||
}
|
||||
};
|
||||
gui.updateState = function () {
|
||||
var cpos = mcopy.state.camera.pos,
|
||||
ppos = mcopy.state.projector.pos;
|
||||
|
||||
$('#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 = {
|
||||
type : 'info',
|
||||
buttons : ['Ok'],
|
||||
title: title,
|
||||
message : message
|
||||
};
|
||||
dialog.showMessageBox(config);
|
||||
/*
|
||||
type String - Can be "none", "info", "error", "question" or "warning". On Windows, "question" displays the same icon as "info", unless you set an icon using the "icon" option.
|
||||
buttons Array - Array of texts for buttons.
|
||||
defaultId Integer - Index of the button in the buttons array which will be selected by default when the message box opens.
|
||||
title String - Title of the message box, some platforms will not show it.
|
||||
message String - Content of the message box.
|
||||
detail String - Extra information of the message.
|
||||
icon NativeImage
|
||||
cancelId Integer - The value will be returned when user cancels the dialog instead of clicking the buttons of the dialog. By default it is the index of the buttons that have "cancel" or "no" as label, or 0 if there is no such buttons. On OS X and Windows the index of "Cancel" button will always be used as cancelId, not matter whether it is already specified.
|
||||
noLink Boolean - On Windows Electron will try to figure out which one of the buttons are common buttons (like "Cancel" or "Yes"), and show the others as command links in the dialog. This can make the dialog appear in the style of modern Windows apps. If you don't like this behavior, you can set noLink to true.
|
||||
*/
|
||||
};
|
||||
gui.confirm = function () {};
|
||||
gui.warn = function (title, message) {
|
||||
'use strict';
|
||||
var config = {
|
||||
type : 'warning',
|
||||
buttons : ['Ok'],
|
||||
title: title,
|
||||
message : message
|
||||
};
|
||||
dialog.showMessageBox(config);
|
||||
};
|
||||
gui.error = function () {};
|
||||
|
||||
/******
|
||||
Mscript GUI
|
||||
*******/
|
||||
gui.mscript = {};
|
||||
gui.mscript.editor = {};
|
||||
gui.mscript.data = {};
|
||||
gui.mscript.raw = '';
|
||||
gui.mscript.init = function () {
|
||||
'use strict';
|
||||
$('#editor').val('CF 1\nPF 1');
|
||||
gui.mscript.editor = CodeMirror.fromTextArea(document.getElementById('editor'), {
|
||||
lineNumbers: true,
|
||||
mode: 'python',
|
||||
matchBrackets: true,
|
||||
theme: 'monokai'
|
||||
});
|
||||
gui.mscript.editor.setSize(null, $(window).height() - $('footer').eq(0).height() - 30);
|
||||
gui.mscript.editor.on('change', function (e) {
|
||||
var data = gui.mscript.editor.getValue(),
|
||||
output = gui.mscript.parse(data);
|
||||
});
|
||||
$(document).on('resize', function () {
|
||||
gui.mscript.editor.setSize(null, $(window).height() - $('footer').eq(0).height() - 30);
|
||||
});
|
||||
};
|
||||
gui.mscript.open = function () {
|
||||
'use strict';
|
||||
gui.mscript.editor.setSize(null, $(window).height() - $('footer').eq(0).height() - 30);
|
||||
gui.mscript.editor.refresh();
|
||||
};
|
||||
gui.mscript.update = function () {
|
||||
//ehhhhh
|
||||
$('#mscript textarea').val(mcopy.state.sequence.arr.join('\n'));
|
||||
};
|
||||
gui.mscript.parse = function (str) {
|
||||
/*var cmd = 'node mscript.js "' + str + '\n"';
|
||||
gui.mscript.raw = str;
|
||||
mcopy.exec(cmd, function (data) {
|
||||
gui.mscript.data = JSON.parse(data);
|
||||
});*/
|
||||
};
|
||||
|
||||
/*******
|
||||
* gui console
|
||||
*******/
|
||||
gui.console = {};
|
||||
gui.console.elem = {};
|
||||
gui.console.init = function () {
|
||||
'use script';
|
||||
gui.console.elem = $('#console textarea');
|
||||
gui.console.elem.on('keyup', function (e) {
|
||||
var code = e.keyCode || e.which;
|
||||
if (code === 13) {
|
||||
gui.console.exec();
|
||||
e.preventDefault();
|
||||
return false;
|
||||
}
|
||||
});
|
||||
};
|
||||
gui.console.lines = [];
|
||||
gui.console.parse = function () {
|
||||
'use strict';
|
||||
var lines = gui.console.elem.val().split('\n'),
|
||||
line = lines[lines.length - 2].replace('>', '').trim();
|
||||
gui.console.lines.push(line);
|
||||
};
|
||||
gui.console.exec = function () {
|
||||
'use strict';
|
||||
var command;
|
||||
gui.console.parse();
|
||||
command = gui.console.lines[gui.console.lines.length - 1].replace('>', '').trim();
|
||||
console.log(command);
|
||||
if (mscript.cmd.indexOf(command) !== -1) {
|
||||
if (command === 'CF') {
|
||||
cmd.cam_forward(light.color);
|
||||
} else if (cmd === 'CB') {
|
||||
cmd.cam_backward(light.color);
|
||||
}
|
||||
}
|
||||
gui.console.newLine();
|
||||
};
|
||||
gui.console.newLine = function () {
|
||||
'use strict';
|
||||
var current = gui.console.elem.val();
|
||||
current += '> ';
|
||||
gui.console.elem.val(current);
|
||||
};
|
||||
|
||||
/******
|
||||
Sequencer grid
|
||||
*******/
|
||||
gui.grid = {};
|
||||
gui.grid.swatchesElem = {};
|
||||
gui.grid.init = function () {
|
||||
'use strict';
|
||||
gui.grid.refresh();
|
||||
seq.stats();
|
||||
gui.grid.events();
|
||||
};
|
||||
|
||||
gui.grid.state = function (i) {
|
||||
'use strict';
|
||||
var elem = $('input[x=' + i + ']'),
|
||||
lightElem = $('.L' + '[x=' + i + ']');
|
||||
if (typeof mcopy.state.sequence.arr[i] !== 'undefined') {
|
||||
elem.prop('checked', false);
|
||||
$('.' + mcopy.state.sequence.arr[i] + '[x=' + i + ']').prop('checked', true);
|
||||
if (mcopy.state.sequence.arr[i] === 'CF'
|
||||
|| mcopy.state.sequence.arr[i] === 'CB') {
|
||||
lightElem.css('background', 'rgb(' + mcopy.state.sequence.light[i] + ')')
|
||||
.addClass('a')
|
||||
.prop('title', 'rgb(' + mcopy.state.sequence.light[i] + ')');
|
||||
|
||||
} else {
|
||||
lightElem.css('background', 'transparent')
|
||||
.removeClass('a')
|
||||
.prop('title', '');
|
||||
}
|
||||
} else {
|
||||
lightElem.css('background', 'transparent')
|
||||
.removeClass('a')
|
||||
.prop('title', '');
|
||||
}
|
||||
};
|
||||
gui.grid.refresh = function () {
|
||||
'use strict';
|
||||
var cmds = ['cam_forward', 'proj_forward', 'cam_backward', 'proj_backward', 'light_set', 'numbers'],
|
||||
check = '<input type="checkbox" x="xxxx" />',
|
||||
div = '<div x="xxxx"></div>',
|
||||
elem,
|
||||
width = 970 - 34 + ((940 / 24) * Math.abs(24 - mcopy.state.sequence.size));
|
||||
$('#sequence').width(width + 'px');
|
||||
for (var i = 0; i < cmds.length; i++) {
|
||||
$('#' + cmds[i]).empty();
|
||||
for (var x = 0; x < mcopy.state.sequence.size; x++) {
|
||||
if (i === cmds.length - 1) {
|
||||
elem = div.replace('xxxx', x);
|
||||
$('#' + cmds[i]).append($(elem).text(x));
|
||||
} else if (i === cmds.length - 2) {
|
||||
elem = div.replace('xxxx', x);
|
||||
$('#' + cmds[i]).append($(elem).addClass(mcopy.state.sequence.pads[cmds[i]]));
|
||||
} else {
|
||||
elem = check.replace('xxxx', x);
|
||||
$('#' + cmds[i]).append($(elem).addClass(mcopy.state.sequence.pads[cmds[i]]));
|
||||
}
|
||||
gui.grid.state(x);
|
||||
}
|
||||
}
|
||||
};
|
||||
gui.grid.click = function (t) {
|
||||
'use strict';
|
||||
var i = parseInt($(t).attr('x')),
|
||||
c;
|
||||
if ($(t).prop('checked')) {
|
||||
c = $(t).attr('class').replace('.', '');
|
||||
mcopy.state.sequence.arr[i] = c;
|
||||
if (c === 'CF'
|
||||
|| c === 'CB') {
|
||||
mcopy.state.sequence.light[i] = light.color.join(',');
|
||||
} else {
|
||||
mcopy.state.sequence.light[i] = '';
|
||||
}
|
||||
} else {
|
||||
mcopy.state.sequence.arr[i] = undefined;
|
||||
delete mcopy.state.sequence.arr[i];
|
||||
}
|
||||
gui.grid.state(i);
|
||||
seq.stats();
|
||||
};
|
||||
gui.grid.clear = function () {
|
||||
'use strict';
|
||||
var doit = confirm('Are you sure you want to clear this sequence?');
|
||||
if (doit) {
|
||||
seq.clear();
|
||||
gui.grid.refresh();
|
||||
seq.stats();
|
||||
console.log('Sequencer cleared');
|
||||
}
|
||||
};
|
||||
gui.grid.loopChange = function (t) {
|
||||
'use strict';
|
||||
var count = parseInt(t.value);
|
||||
mcopy.loop = count;
|
||||
seq.stats();
|
||||
};
|
||||
gui.grid.plus_24 = function () {
|
||||
'use strict';
|
||||
mcopy.state.sequence.size += 24;
|
||||
gui.grid.refresh();
|
||||
console.log('Sequencer expanded to ' + mcopy.state.sequence.size + ' steps');
|
||||
};
|
||||
gui.grid.setLight = function (x, rgb) {
|
||||
'use strict';
|
||||
mcopy.state.sequence.light[x] = rgb.join(',');
|
||||
gui.grid.state(x);
|
||||
};
|
||||
gui.grid.blackout = function (t) {
|
||||
var elem = $(t),
|
||||
i = elem.attr('x');
|
||||
if (typeof mcopy.state.sequence.light[i] === 'undefined') {
|
||||
return false;
|
||||
}
|
||||
if (mcopy.state.sequence.light[i] === '0,0,0') {
|
||||
gui.grid.setLight(i, light.color);
|
||||
} else {
|
||||
gui.grid.setLight(i, [0, 0, 0]);
|
||||
}
|
||||
};
|
||||
gui.grid.changeAll = function (rgb) {
|
||||
'use strict';
|
||||
var i;
|
||||
for (i = 0; i < mcopy.state.sequence.arr.length; i++) {
|
||||
if (mcopy.state.sequence.arr[i] === 'CF'
|
||||
|| mcopy.state.sequence.arr[i] === 'CB') {
|
||||
gui.grid.setLight(i, rgb);
|
||||
}
|
||||
}
|
||||
};
|
||||
gui.grid.swatches = function (x) {
|
||||
'use strict';
|
||||
var current = mcopy.state.sequence.light[x];
|
||||
gui.grid.swatchesElem = w2popup.open({
|
||||
title : 'Select Color',
|
||||
body : $('#light-swatches').html(),
|
||||
buttons : '<button id="sequencer-ok" class="btn btn-default">Ok</button> <button id="sequencer-changeall" class="btn btn-warning">Change All</button> <button id="sequencer-cancel" class="btn btn-default">Cancel</button>',
|
||||
onClose : function () {
|
||||
}
|
||||
});
|
||||
$('.w2ui-msg-body .swatch').removeClass('default set');
|
||||
$('.w2ui-msg-body .swatch[color="' + current + '"').eq(0).addClass('default set');
|
||||
|
||||
$('#sequencer-cancel').on('click', function () {
|
||||
gui.grid.swatchesElem.close();
|
||||
});
|
||||
$('#sequencer-changeall').on('click', function () {
|
||||
var doit = confirm('You sure you want to change all light settings?'),
|
||||
elem = $('.w2ui-msg-body .default'),
|
||||
rgb;
|
||||
if (doit && elem.length > 0) {
|
||||
rgb = elem.attr('color').split(',');
|
||||
gui.grid.changeAll(rgb);
|
||||
gui.grid.swatchesElem.close();
|
||||
} else if (doit && elem.length === 0) {
|
||||
gui.warn('Select Color', 'Please select a color to proceed.');
|
||||
}
|
||||
});
|
||||
$('#sequencer-ok').on('click', function () {
|
||||
var elem = $('.w2ui-msg-body .default'),
|
||||
rgb;
|
||||
if (elem.length > 0) {
|
||||
rgb = elem.attr('color').split(',');
|
||||
gui.grid.setLight(x, rgb);
|
||||
light.color = rgb;
|
||||
gui.grid.swatchesElem.close();
|
||||
} else {
|
||||
gui.warn('Select Color', 'Please select a color to proceed.');
|
||||
}
|
||||
});
|
||||
};
|
||||
gui.grid.scrollTo = function (i) {
|
||||
'use strict';
|
||||
var w = 35 + 3; //width of pad + margin
|
||||
$('#seq_scroll').scrollLeft(i * w);
|
||||
};
|
||||
gui.grid.events = function () {
|
||||
'use strict';
|
||||
$(document.body).on('click', '#sequencer input[type=checkbox]', function () {
|
||||
gui.grid.click(this);
|
||||
});
|
||||
//$(document.body).on('click', '.L', function () {
|
||||
//alert('click');
|
||||
//console.log('please dont happen');
|
||||
//});
|
||||
$(document.body).on('dblclick', '.L', function () {
|
||||
gui.grid.blackout(this);
|
||||
});
|
||||
$(document.body).on('contextmenu', '.L', function (e) {
|
||||
var x = e.target.attributes.x.value;
|
||||
setTimeout(function () {
|
||||
gui.grid.swatches(x);
|
||||
}, 300);
|
||||
e.preventDefault();
|
||||
return false;
|
||||
});
|
||||
$('#seq_scroll').on('scroll', function () {
|
||||
var i = Math.ceil($('#seq_scroll').scrollLeft() / (35 + 3));
|
||||
$('#seq_scroll_state').val(gui.fmtZero(i, 6));
|
||||
});
|
||||
$('#seq_scroll_state').on('change', function () {
|
||||
var i = parseInt($(this).val());
|
||||
$(this).val(gui.fmtZero(i, 6));
|
||||
gui.grid.scrollTo(i);
|
||||
});
|
||||
$(document.body).on('click', '.w2ui-msg-body .swatch', function () {
|
||||
var color = $(this).attr('color'),
|
||||
title = $(this).attr('title');
|
||||
if (typeof color !== 'undefined') {
|
||||
color = color.split(',');
|
||||
$('.w2ui-msg-body .swatch').removeClass('default set');
|
||||
$('#light-swatches .swatch').removeClass('default set');
|
||||
$(this).addClass('default set');
|
||||
$('#light-swatches .swatch[title="' + title + '"]').eq(0).addClass('default set');
|
||||
light.color = color;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
//NAV GUI
|
||||
nav.active = 'sequencer';
|
||||
nav.init = function () {
|
||||
'use strict';
|
||||
$('#toolbar').w2toolbar({
|
||||
name: 'toolbar',
|
||||
items: [
|
||||
{ type: 'radio', id: 'sequencer', group: '1', caption: 'Sequencer', icon: 'fa fa-th', checked: true },
|
||||
{ type: 'radio', id: 'script', group: '1', caption: 'Script', icon: 'fa fa-code' },
|
||||
{ type: 'radio', id: 'controls', group: '1', caption: 'Controls', icon: 'fa fa-tasks' },
|
||||
{ type: 'radio', id: 'light', group: '1', caption: 'Light', icon: 'mcopy-light' },
|
||||
{ type: 'spacer' },
|
||||
{ type: 'button', id: 'settings', group: '1', caption: 'Settings', icon: 'fa fa-cogs' }
|
||||
],
|
||||
onClick : function (event) {
|
||||
nav.change(event.target);
|
||||
}
|
||||
});
|
||||
};
|
||||
nav.change = function (id) {
|
||||
'use strict';
|
||||
nav.active = id;
|
||||
$('.screen').hide();
|
||||
$('#' + id).show();
|
||||
if (id === 'controls') {
|
||||
w2ui['log'].resize();
|
||||
w2ui['log'].scrollIntoView(log.count - 1);
|
||||
w2ui['log'].selectNone();
|
||||
w2ui['log'].select(log.count - 1);
|
||||
} else if (id === 'light') {
|
||||
if (w2ui['colors'].active === 'rgb') {
|
||||
light.rgb.set(light.color);
|
||||
}
|
||||
} else if (id === 'script') {
|
||||
gui.mscript.open();
|
||||
}
|
||||
};
|
||||
|
||||
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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue