Changeset 29897 for main/trunk/model-sites-dev/respooled

Timestamp:

2015-05-19T00:02:41+12:00 (9 years ago)

Author:

davidb

Message:

Boxing now drawn around blocks of recorded track

File:

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

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

@@ -30 +30 @@
 
     if (gs.xsltParams.interface_name == "respooled") {
-    go_top_level_group.translate(group_x_scale*go_paper_y_dim, go_paper_y_dim+(gameOnCurrentTimeYPos * group_x_scale * Math.abs(group_y_scale)));
+    //go_top_level_group.translate(group_x_scale*go_paper_y_dim, go_paper_y_dim+(gameOnCurrentTimeYPos * group_x_scale * Math.abs(group_y_scale)));
+    go_top_level_group.translate(group_x_trans, go_paper_y_dim+(gameOnCurrentTimeYPos * group_x_scale * Math.abs(group_y_scale)));
     }
 
@@ -112 +113 @@
     }
 
+    
     // Process each block within the track
     for (var b=0; b<track.length; b++) {
@@ -188 +190 @@
         if (track != null) {
 
-
         var midi_stats = computeMidiStats(track);
         console.log("*** midi stats = " + JSON.stringify(midi_stats));
@@ -199 +200 @@
         }
 
-
-        // calculate range of midi pitches present
-/*
-        for (var b=0; b<track.length; b++) {
-            var track_block = track[b];
-            var base_ctime = track_block.baseCTime;
-            var block_events = track_block.events;
-
-            for (var ne=0; ne<block_events.length; ne++) {
-            var midi_pitch = block_events[ne].midiPitch;
-            if (midi_pitch < min_midi_pitch) {
-                min_midi_pitch = midi_pitch;
-            }
-            if (midi_pitch > max_midi_pitch) {
-                max_midi_pitch = midi_pitch;
-            }
-            }
-        }
-*/
-
         }
     }
@@ -226 +207 @@
     var midi_range = Math.max(4,raw_midi_range); 
     
-    console.log("*** midi_range = " + midi_range);
+    //console.log("*** midi_range = " + midi_range);
 
     var midi_y_dim_spacing = go_paper_y_dim / midi_range;
@@ -244 +225 @@
             var block_events = track_block.events;
             
-            for (var ne=0; ne<block_events.length; ne++) {
+            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++) {
             
             var note_event = block_events[ne];
-            
+            var midi_pitch = note_event.midiPitch;
+
             var startPercTime = (base_ctime + note_event.startCurrentTime)/total_duration;
             var rx_org = startPercTime * go_paper_x_dim;
@@ -260 +246 @@
             rect.attr({"stroke":"black","stroke-width":0.25, "fill":"#2E52A4"});
             go_top_level_group.push(rect);
+
+            if (midi_pitch < block_min_midi_pitch) {
+                block_min_midi_pitch = midi_pitch;
+            }
+            if (midi_pitch > block_max_midi_pitch) {
+                block_max_midi_pitch = midi_pitch;
+            }
             }
+
+            var block_midi_range = block_max_midi_pitch - block_min_midi_pitch + 1;
+
+            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_x_org = (base_ctime/total_duration) * go_paper_x_dim;
+            var block_x_dim = (block_duration/total_duration) * go_paper_x_dim;
+
+            var block_y_org = go_paper_y_dim - ((block_max_midi_pitch - min_midi_pitch) * midi_y_dim_spacing) - midi_y_dim_spacing;
+            var block_y_dim = midi_y_dim_spacing * (block_midi_range);
+
+            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)"});
+            go_top_level_group.push(block_rect);
+
         }
         }
@@ -285 +295 @@
     group_rotate  = 90.0;
 
-    group_x_trans = group_x_scale * go_paper_y_dim;
+    group_x_trans = 15 + group_x_scale * go_paper_y_dim;
     group_y_trans = go_paper_y_dim;
     }