Changeset 37247

Timestamp:

2023-02-01T23:06:48+13:00 (8 months ago)

Author:

davidb

Message:

Debug and hard-wired fixes added in for demo to Roger

File:

• gs3-extensions/mars-src/trunk/src/wavesurfer-renderer/drawer.spectrummulticanvas.js (modified) (7 diffs)

gs3-extensions/mars-src/trunk/src/wavesurfer-renderer/drawer.spectrummulticanvas.js

@@ -302 +302 @@
     //console.log("**** createAVProgressTimelineData");
     var canvas_width = this.canvases[0].wave.width;
-    //console.log("**** canvas width = " + canvas_width);
+    console.log("**** canvas width = " + canvas_width);
+    console.log("**** width = " + this.width);
+    
+    if (canvas_width != 1045) {
+        console.log("!!!! overriding canvas width to be: 1045");
+        canvas_width = 1045;
+    }
 
     //console.log("     arousal_val = " + JSON.stringify(arousal_vals));
@@ -332 +338 @@
     }
     const total_duration = t;
-    //console.log("***              n = " + n);
-    //console.log("*** total duration = " + total_duration);
+    console.log("***              n = " + n);
+    console.log("*** total duration = " + total_duration);
     
     this.timeline_steps[n] = total_duration;
@@ -371 +377 @@
 
         var local_ts = 0;
-        //console.log("*** start_ts = " + start_ts +  ", end_ts = " + end_ts + " (ts_diff = " + ts_diff +")");
-        //console.log("*** start_arousal = " + start_arousal +  ", end_arousal = " + end_arousal);
-        //console.log("*** norm_start_arousal = " + norm_start_arousal +  ", norm_end_arousal = " + norm_end_arousal);
+        console.log("*** start_ts = " + start_ts +  ", end_ts = " + end_ts + " (ts_diff = " + ts_diff +")");
+        console.log("*** start_arousal = " + start_arousal +  ", end_arousal = " + end_arousal);
+        console.log("*** norm_start_arousal = " + norm_start_arousal +  ", norm_end_arousal = " + norm_end_arousal);
         
         for (var ts=start_ts; ts<end_ts; ts++) {
@@ -392 +398 @@
     }
 
+    console.log(this.arousal_progress_timeline);
     //console.log(this);
     console.log("Generated interpolated AV progress timeline");
@@ -699 +706 @@
     }
     
+    var pixel_ratio = this.params.pixelRatio
     var floor_position = Math.floor(position);
-
+    //var scaled_floor_position = Math.floor(position * pixel_ratio);
+    console.log("position = " + position);
+    //console.log("scaled_floor_position = " + scaled_floor_position);
+
+    var canvas_width = this.canvases[0].wave.width;
+    console.log("updateProgress(): canvas_width = " + canvas_width + " (not currently used in this fn)");
+    
     if (this.params.renderWave == 1) {
         super.updateProgress(position);
@@ -706 +720 @@
     else {
         
-        var canvas_width = this.canvases[0].wave.width;
+        //var scaled_canvas_width = canvas_width * pixel_ratio;
+        
         // ****
         //console.log("position = " + position + "/" + canvas_width);
@@ -743 +758 @@
     var valence_val = this.valence_progress_timeline[floor_position];
 
-    //console.log("*** arousal_val [" + floor_position + "]" + " = " + arousal_val);
+    console.log("*** arousal_val [" + floor_position + "]" + " = " + arousal_val);
 
     var arousal_val_3dp = Math.round(arousal_val*1000)/1000;