Changeset 29980 for main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/game-on.js

Timestamp:

2015-06-15T21:12:16+12:00 (9 years ago)

Author:

davidb

Message:

Further changes as a result of preparing the final submission of the DLfM workshop paper

File:

• main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/game-on.js (modified) (4 diffs)

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/game-on.js

@@ -223 +223 @@
             var base_ctime = track_block.baseCTime;
             
+            var track_fill = track_block.fill;
+            var track_fillbackground = track_block.fillBackground;
+
             var block_events = track_block.events;
             
             var block_min_midi_pitch = num_midi_pitches-1;
             var block_max_midi_pitch = 0;
-
+            
             var block_events_len = block_events.length; 
             for (var ne=0; ne<block_events_len; ne++) {
@@ -244 +247 @@
             //rect.attr({stroke:"none", strokeWidth:0.2, fill:"#2E52A4"});
             //rect.attr({stroke:"black",fill:"#2E52A4"});
-            rect.attr({"stroke":"black","stroke-width":0.25, "fill":"#2E52A4"});
+            var fill = note_event.fill || track_fill || "#2E52A4";
+            rect.attr({"stroke":"black","stroke-width":0.25, "fill":fill});
             go_top_level_group.push(rect);
 
@@ -259 +263 @@
             var last_event = block_events[block_events_len-1];
             var last_note_off = last_event.midiNoteOff;
-            var block_duration = (base_ctime + last_note_off)/1000.0;
-
+            var block_duration = (base_ctime + last_note_off)/1000.0
+;
             var block_x_org = (base_ctime/total_duration) * go_paper_x_dim;
             var block_x_dim = (block_duration/total_duration) * go_paper_x_dim;
@@ -269 +273 @@
             if (gs.xsltParams.interface_name != "respooled") {
             var block_rect = goPaper.rect(block_x_org-1,block_y_org-1,block_x_dim+2,block_y_dim+2); // fudge factor!
-            block_rect.attr({"stroke":"none", "stroke-width":0, "fill":"rgba(46, 82, 164, 0.5)"});
+            var fillbackground = track_fillbackground || "rgba(46, 82, 164, 0.5)";
+            block_rect.attr({"stroke":"none", "stroke-width":0, "fill":fillbackground});
             
             var block_tip = track_block.name;