+ <% }else if(cue.paused){ %>
+ 
+
<% }else if(cue.loaded){ %>
@@ -79,7 +83,7 @@
<% if(cue.preWait){ %>
-
+
<% }else{ %>
@@ -87,9 +91,9 @@
<% } %>
-
- <% if(cue.duration || (cue.type=="Group" && cue.mode==3)){ %>
-
+ <% let cueTypesWithAction = ["Audio", "Mic", "Video", "Camera", "Text", "Light", "Fade", "Network", "MIDI File", "Timecode", "Wait"]; %>
+ <% if((cue.type=="Group" && cue.groupMode==3) || cueTypesWithAction.indexOf(cue.type)>=0){ %>
+
<% }else{ %>
@@ -99,7 +103,7 @@
<% if(cue.postWait){ %>
-
+
<% }else{ %>
@@ -124,6 +128,9 @@
<%
function prettyFormatTime(seconds){
+ if(!seconds){
+ return "00:00.00";
+ }
var startIndex = 14;
if(seconds>=3600){
startIndex = 11;
@@ -131,4 +138,40 @@
var string = new Date(seconds * 1000).toISOString()
return string.substring(startIndex, string.length-2)
}
+
+ function elapsedTime(def, value, type, cue){
+
+ if(type=="action" && cue.paused){
+ value-=cue.preWait;
+ }
+
+ let border, fill;
+ if(cue.paused){
+ border = "#f6e737";
+ fill = "rgba(255, 240, 60, 0.7)";
+ }else{
+ border = "#48ba41";
+ fill = "rgba(0, 200, 50, 0.5)";
+ }
+
+
+ if(value>0){
+ let percent = value/def*100;
+ let bg = "background: black; background: linear-gradient(90deg, "+fill+" "+percent+"%, transparent "+percent+"%);";
+
+ if(cue.paused){
+ bg+= "outline-color: "+border+";";
+ bg+= "color: white;";
+ }
+
+ return ""+prettyFormatTime(Math.min(def, value))+"";
+
+ }else if(type=="postWait" || type=="action"){
+ return ""+prettyFormatTime(def)+"";
+
+ }else{
+ return prettyFormatTime(def);
+
+ }
+ }
%>
\ No newline at end of file
diff --git a/plugins/qlab/cuelist.ejs b/plugins/qlab/cuelist.ejs
index 72ca72b..4c85c70 100644
--- a/plugins/qlab/cuelist.ejs
+++ b/plugins/qlab/cuelist.ejs
@@ -42,7 +42,7 @@
function displayCueRow(q){
let html = "";
- html+= rowTemplate({cue: allCues[q.uniqueID], allCues: allCues});
+ html+= rowTemplate({cue: allCues[q.uniqueID], allCues: allCues, workspace: workspace});
if(q.cues){
q.cues.forEach(q =>{
diff --git a/plugins/qlab/qlab.js b/plugins/qlab/main.js
similarity index 57%
rename from plugins/qlab/qlab.js
rename to plugins/qlab/main.js
index 3bfcad4..ae638f3 100644
--- a/plugins/qlab/qlab.js
+++ b/plugins/qlab/main.js
@@ -1,13 +1,19 @@
let _ = require('lodash');
+const fs = require('fs');
+
+let lastElapsedUpdate = Date.now();
exports.defaultName = 'QLab 4';
exports.connectionType = 'osc';
+exports.heartbeatInterval = 50;
+exports.heartbeatTimeout = 2000;
exports.searchOptions = {
type: 'Bonjour',
bonjourName: 'qlab',
};
exports.ready = function (device) {
+ device.send(`/version`);
device.send('/workspaces');
};
@@ -17,16 +23,17 @@ exports.data = function (device, oscData) {
osc.shift();
let data;
-
//console.log(address)
- if(match(osc, ["reply", "version"])){ // heartbeat response
+ if(match(osc, ["reply", "version"])){
+
+ let json = JSON.parse(oscData.args[0]);
+ device.data.version = json.data;
this.deviceInfoUpdate(device, 'status', 'ok');
-
}else if(match(osc, ["reply", "workspaces"])){
let json = JSON.parse(oscData.args[0]);
@@ -71,7 +78,9 @@ exports.data = function (device, oscData) {
addChildrenToWorkspace(workspace, ql);
});
+ console.log("total device draw 2");
device.draw();
+
setTimeout(function(){
json.data.forEach(ql => {
@@ -87,14 +96,16 @@ exports.data = function (device, oscData) {
let json = JSON.parse(oscData.args[0]);
let workspace = device.data.workspaces[json.workspace_id];
let cue_id = osc[2];
+ let cue = workspace.cues[cue_id];
- workspace.cueLists[cue_id].cues = json.data;
- addChildrenToWorkspace(workspace, workspace.cueLists[cue_id]);
+ if(!_.isEqual(cue.cues, json.data)){
+ workspace.cueLists[cue_id].cues = json.data;
+ addChildrenToWorkspace(workspace, workspace.cueLists[cue_id]);
- device.draw();
-
- getValuesForKeys(device, json.workspace_id, workspace.cues[cue_id]);
+ device.draw();
+ getValuesForKeys(device, json.workspace_id, cue);
+ }
}else if(match(osc, ["reply", "cue_id", "*", "valuesForKeys"])){
@@ -118,6 +129,7 @@ exports.data = function (device, oscData) {
cue.running = cueValues.isRunning;
cue.loaded = cueValues.isLoaded;
cue.flagged = cueValues.isFlagged;
+ cue.paused = cueValues.isPaused;
cue.type = cueValues.type;
cue.cues = cueValues.children;
cue.preWait = cueValues.preWait;
@@ -130,6 +142,9 @@ exports.data = function (device, oscData) {
cue.cartRows = cueValues.cartRows;
cue.cartColumns = cueValues.cartColumns;
cue.cartPosition = cueValues.cartPosition;
+ cue.preWaitElapsed = cueValues.preWaitElapsed;
+ cue.actionElapsed = cueValues.actionElapsed;
+ cue.postWaitElapsed = cueValues.postWaitElapsed;
let nestedGroupModes = [];
let nestedGroupPosition = [0];
@@ -147,9 +162,46 @@ exports.data = function (device, oscData) {
cue.nestedGroupModes = nestedGroupModes;
cue.nestedGroupPosition = nestedGroupPosition;
+ //console.log("draw "+cue.number)
+
device.update("updateCueData", {cue: cue, allCues: workspace.cues, workspace: workspace});
+ }else if(match(osc, ["reply", "cue_id", "*", "preWaitElapsed"])){
+
+ let json = JSON.parse(oscData.args[0]);
+ let workspace = device.data.workspaces[json.workspace_id];
+ let cue = workspace.cues[osc[2]];
+
+ cue.preWaitElapsed = json.data;
+ lastElapsedUpdate = Date.now();
+
+ device.update("updateCueData", {cue: cue, allCues: workspace.cues, workspace: workspace});
+
+
+ }else if(match(osc, ["reply", "cue_id", "*", "actionElapsed"])){
+
+ let json = JSON.parse(oscData.args[0]);
+ let workspace = device.data.workspaces[json.workspace_id];
+ let cue = workspace.cues[osc[2]];
+
+ cue.actionElapsed = json.data;
+ lastElapsedUpdate = Date.now();
+
+ device.update("updateCueData", {cue: cue, allCues: workspace.cues, workspace: workspace});
+
+
+ }else if(match(osc, ["reply", "cue_id", "*", "postWaitElapsed"])){
+
+ let json = JSON.parse(oscData.args[0]);
+ let workspace = device.data.workspaces[json.workspace_id];
+ let cue = workspace.cues[osc[2]];
+
+ cue.postWaitElapsed = json.data;
+ lastElapsedUpdate = Date.now();
+
+ device.update("updateCueData", {cue: cue, allCues: workspace.cues, workspace: workspace});
+
}else if(match(osc, ["update", "workspace", "*", "cue_id", "*"])){
@@ -157,17 +209,19 @@ exports.data = function (device, oscData) {
let cueLists = Object.keys(workspace.cueLists);
let cue_id = osc[4];
- if(cueLists.includes(cue_id)){
- device.send(`/workspace/${workspace.uniqueID}/cue_id/${cue_id}/children`);
- }
+ if(cue_id!="[root group of cue lists"){
+ if(cueLists.includes(cue_id)){
+ device.send(`/workspace/${workspace.uniqueID}/cue_id/${cue_id}/children`);
+ }
- device.send(`/workspace/${osc[2]}/cue_id/${cue_id}/valuesForKeys`, [
- {type: 's', value: valuesForKeysString}
- ]);
+ device.send(`/workspace/${osc[2]}/cue_id/${cue_id}/valuesForKeys`, [
+ {type: 's', value: valuesForKeysString}
+ ]);
+
+ }
}else if(match(osc, ["update", "workspace", "*"])){
- // nothing here yet
// occurs when cue lists are reordered or a list is deleted
device.send(`/workspace/${osc[2]}/cueLists`);
@@ -180,8 +234,11 @@ exports.data = function (device, oscData) {
let workspace = device.data.workspaces[osc[2]];
let cue = workspace.cues[oscData.args[0]];
+ workspace.playbackPosition = oscData.args[0] ? cue.uniqueID : "";
- if(cue) device.update("updatePlaybackPosition", {cue: cue});
+ if(cue){
+ device.update("updatePlaybackPosition", {cue: cue});
+ }
}else{
console.log(address)
@@ -191,10 +248,57 @@ exports.data = function (device, oscData) {
};
+
+let cueTemplate = _.template(fs.readFileSync(`./plugins/qlab/cue.ejs`));
+let tileTemplate = _.template(fs.readFileSync(`./plugins/qlab/tile.ejs`));
+let cartTemplate = _.template(fs.readFileSync(`./plugins/qlab/cart.ejs`));
+let listTemplate = _.template(fs.readFileSync(`./plugins/qlab/cuelist.ejs`));
+
+exports.update = function(device, doc, updateType, data){
+
+ if(updateType=="updateCueData"){
+ $elem = doc.getElementById(data.cue.uniqueID);
+
+ if($elem){
+
+ if(data.cue.type=="Cue List"){
+ $elem.outerHTML = '
-
-
-<%
- const fs = require('fs');
- let _ = require('lodash');
-
- let cueTemplate = _.template(fs.readFileSync(`./plugins/qlab/cue.ejs`));
- let tileTemplate = _.template(fs.readFileSync(`./plugins/qlab/tile.ejs`));
- let cartTemplate = _.template(fs.readFileSync(`./plugins/qlab/cart.ejs`));
- let listTemplate = _.template(fs.readFileSync(`./plugins/qlab/cuelist.ejs`));
-
-%>
-
-
-
-<%
- for(const workspace_id in data.workspaces){
- const workspace = data.workspaces[workspace_id];
-
- for(const cueList_id in workspace.cueLists){
- const ql = workspace.cueLists[cueList_id];
-%>
-
-
-
- <% if(ql.type=="Cue List"){ %>
-
- <%= listTemplate({cueList: ql, allCues: workspace.cues, rowTemplate: cueTemplate}) %>
-
- <% }else if(ql.type=="Cart"){ %>
-
- <%= cartTemplate({cueList: ql, allCues: workspace.cues, tileTemplate: tileTemplate}) %>
-
-
- <% } %>
-
-
-
-<% }} %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/qlab/qlab.css b/plugins/qlab/styles.css
similarity index 97%
rename from plugins/qlab/qlab.css
rename to plugins/qlab/styles.css
index ef8da5f..ebab570 100644
--- a/plugins/qlab/qlab.css
+++ b/plugins/qlab/styles.css
@@ -22,21 +22,21 @@ th.no-border {
}
td {
- padding: 0px;
+ padding: -1px;
height: 25px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
td img {
- padding-top: 4px;
+ padding-top: 2px;
}
tr:nth-child(even) {
- background: #2c2c2c;
+ background: #323232;
}
tr:nth-child(odd) {
- background: #323232;
+ background: #2c2c2c;
}
tr:nth-child(even).q-red {
@@ -169,6 +169,14 @@ tr.playback-position .q-gray-text {
.q-gray-text {
color: #424242;
}
+.q-time-elapsed {
+ margin: 0px 2px;
+ outline: #49c042 1px solid;
+ line-height: 18px;
+}
+
+
+
.cart{
position: relative;
diff --git a/plugins/qlab/template.ejs b/plugins/qlab/template.ejs
new file mode 100644
index 0000000..427cb58
--- /dev/null
+++ b/plugins/qlab/template.ejs
@@ -0,0 +1,45 @@
+
+
+
+<%
+ const fs = require('fs');
+ let _ = require('lodash');
+
+ let cueTemplate = _.template(fs.readFileSync(`./plugins/qlab/cue.ejs`));
+ let tileTemplate = _.template(fs.readFileSync(`./plugins/qlab/tile.ejs`));
+ let cartTemplate = _.template(fs.readFileSync(`./plugins/qlab/cart.ejs`));
+ let listTemplate = _.template(fs.readFileSync(`./plugins/qlab/cuelist.ejs`));
+
+%>
+
+
+
+<%
+ for(const workspace_id in data.workspaces){
+ const workspace = data.workspaces[workspace_id];
+
+ for(const cueList_id in workspace.cueLists){
+ const ql = workspace.cueLists[cueList_id];
+%>
+
+
+
+ <% if(ql.type=="Cue List"){ %>
+
+ <%= listTemplate({cueList: ql, allCues: workspace.cues, rowTemplate: cueTemplate, workspace: workspace}) %>
+
+ <% }else if(ql.type=="Cart"){ %>
+
+ <%= cartTemplate({cueList: ql, allCues: workspace.cues, tileTemplate: tileTemplate}) %>
+
+
+ <% } %>
+
+
+
+<% }} %>
+
+
+
diff --git a/plugins/watchout/watchout.js b/plugins/watchout/main.js
similarity index 100%
rename from plugins/watchout/watchout.js
rename to plugins/watchout/main.js
diff --git a/plugins/watchout/watchout.css b/plugins/watchout/styles.css
similarity index 100%
rename from plugins/watchout/watchout.css
rename to plugins/watchout/styles.css
diff --git a/plugins/watchout/watchout.html b/plugins/watchout/template.ejs
similarity index 100%
rename from plugins/watchout/watchout.html
rename to plugins/watchout/template.ejs
diff --git a/plugins/x32/x32.js b/plugins/x32/main.js
similarity index 100%
rename from plugins/x32/x32.js
rename to plugins/x32/main.js
diff --git a/plugins/x32/x32.css b/plugins/x32/styles.css
similarity index 100%
rename from plugins/x32/x32.css
rename to plugins/x32/styles.css
diff --git a/plugins/x32/x32.html b/plugins/x32/template.ejs
similarity index 100%
rename from plugins/x32/x32.html
rename to plugins/x32/template.ejs
diff --git a/plugins/xair/xair.js b/plugins/xair/main.js
similarity index 100%
rename from plugins/xair/xair.js
rename to plugins/xair/main.js
diff --git a/plugins/xair/xair.css b/plugins/xair/styles.css
similarity index 100%
rename from plugins/xair/xair.css
rename to plugins/xair/styles.css
diff --git a/plugins/xair/xair.html b/plugins/xair/template.ejs
similarity index 100%
rename from plugins/xair/xair.html
rename to plugins/xair/template.ejs