stagehacks/Cue-View
1
0
Fork 0
mirror of https://github.com/stagehacks/Cue-View.git synced 2026-08-04 21:37:46 +00:00
Code Issues Packages Projects Releases 9 Wiki Activity

Merge pull request #17 from stagehacks/qlab-groupfix

Browse Source 
Qlab groupfix
This commit is contained in:
sparks-alec
2022-11-30 03:33:48 -05:00
committed by GitHub
parent 5d69d05b85 6a01863ea6
commit 413374f633
4 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/qlab/cue.ejs
+20 -15
View File
@@ -29,26 +29,31 @@
<td><center><%= cue.number || "&nbsp;" %></center></td>
<% for(let i=0; i<cue.nestedGroupModes.length; i++){ %>
<% if(cue.cues && cue.cues.length==0 && i==cue.nestedGroupModes.length-1){ %>
<td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft gBot gTop group-arrow"></td>
<% }else if(cue.cues && i==cue.nestedGroupModes.length-1){ %>
<td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft gTop group-arrow"></td>
<% for(let i=cue.nestedGroupModes.length; i>0; i--){ %>
<% }else if(cue.nestedGroupPosition[i]<=0){ %>
<% if(i<cue.nestedGroupModes.length-1){ %>
<td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft gBot"></td>
<% if(cue.type=="Group" && i==1 && cue.cues.length==0){ %>
<td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft gTop gBot group-arrow"></td>
<% }else{ %>
<td class="gMode-<%= cue.nestedGroupModes[i] %> gBot"></td>
<% }else if(cue.type=="Group" && i==1){ %>
<td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft gTop group-arrow"></td>
<% } %>
<% }else if(cue.nestedGroupPosition[i-1]==0 && cue.nestedGroupPosition[i-2]==0){ %>
<td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft gBot"></td>
<% }else if(i<cue.nestedGroupModes.length-1){ %>
<td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft"></td>
<% }else if(i==1 && cue.nestedGroupPosition[i]==0){ %>
<td class="gMode-<%= cue.nestedGroupModes[i] %> gBot"></td>
<% }else{ %>
<td class="gMode-<%= cue.nestedGroupModes[i] %>"></td>
<% }else{ %>
<td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft"></td>
<% } %>
<% } %>
<% } %>
@@ -67,10 +72,10 @@
<% } %>
<% }else if(cue.nestedGroupPosition[1]==0){ %>
<td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[1] %> gBot gRight"><%= cue.listName %></td>
<td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[cue.nestedGroupModes.length-1] %> gBot gRight"><%= cue.listName %></td>
<% }else{ %>
<td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[1] %> gRight"><%= cue.listName %></td>
<td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[cue.nestedGroupModes.length-1] %> gRight"><%= cue.listName %></td>
<% } %>
plugins/qlab/img/new_group_arrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

plugins/qlab/main.js
+23 -4
View File
@@ -140,19 +140,38 @@ exports.data = function data(_device, oscData) {
cue.postWaitElapsed = cueValues.postWaitElapsed;
const nestedGroupModes = [];
const nestedGroupPosition = [0];
const nestedGroupPosition = [];
let obj = cue;
let sum = 0;
if(obj.cues){
sum+=obj.cues.length;
}
while(obj.parent !== "[root group of cue lists]"){
nestedGroupModes.push(obj.groupMode);
let pos = _.findIndex(workspace.cues[obj.parent].cues, {uniqueID: obj.uniqueID});
pos = Math.abs(pos - workspace.cues[obj.parent].cues.length) - 1;
nestedGroupPosition.push(pos)
pos = Math.abs(pos - workspace.cues[obj.parent].cues.length)-1;
if(obj.cues === undefined){
sum += pos;
}
nestedGroupPosition.unshift(sum);
if(obj.cues){
sum+=pos;
nestedGroupModes.unshift(obj.groupMode);
}else{
nestedGroupModes.unshift(workspace.cues[obj.parent].groupMode);
}
obj = workspace.cues[obj.parent];
}
cue.nestedGroupModes = nestedGroupModes;
cue.nestedGroupPosition = nestedGroupPosition;
plugins/qlab/styles.css
+1 -1
View File
@@ -157,7 +157,7 @@ tr.playback-position .q-gray-text {
}
.group-arrow {
width: 13px;
background-image: url('img/arrow-down.png');
background-image: url('img/new_group_arrow.png');
background-position: center;
background-repeat: no-repeat;
}