Changeset 35193 for gs3-extensions

Timestamp:

2021-05-30T16:47:16+12:00 (3 years ago)

Author:

davidb

Message:

NaN was occuring on some computed values. This was eventually traced to the JSON retrieved via AJAX return an array of string values. Now changed to be Number format in AJAX callback

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

@@ -300 +300 @@
     createAVProgressTimelineData(arousal_vals,valence_vals, my)
     {
-    console.log("**** createAVProgressTimelineData");
+    //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("     arousal_val = " + JSON.stringify(arousal_vals));
+    //console.log("this.arousal_val = " + JSON.stringify(this.arousal_vals));
+    
     //this.arousal_vals = arousal_vals;
     //this.valence_vals = valence_vals;
@@ -310 +313 @@
     this.valence_vals.unshift(0);
 
-    this.norm_arousal_vals = this.normaliseAVVals(arousal_vals);
-    this.norm_valence_vals = this.normaliseAVVals(valence_vals);
+    this.norm_arousal_vals = this.normaliseAVVals(this.arousal_vals);
+    this.norm_valence_vals = this.normaliseAVVals(this.valence_vals);
 
     const time_slice    = 6; // 6 secs
@@ -319 +322 @@
     this.timeline_steps.unshift(0);
 
-    var num_vals = arousal_vals.length;
+    var num_vals = this.arousal_vals.length;
     var t = time_slice;
     var n = 1;
@@ -329 +332 @@
     }
     const total_duration = t;
-    console.log("*** total duration = " + total_duration);
+    //console.log("***              n = " + n);
+    //console.log("*** total duration = " + total_duration);
     
     this.timeline_steps[n] = total_duration;
+    this.arousal_vals[n] = 0;
+    this.valence_vals[n] = 0;
     this.norm_arousal_vals[n] = 0;
     this.norm_valence_vals[n] = 0;
@@ -367 +373 @@
         //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++) {
@@ -401 +408 @@
         //console.log("*** that = ");
         //console.log(that);
-        this.arousal_vals = data.arousal;
-        this.valence_vals = data.valence;
-
+        //this.arousal_vals = data.arousal.slice(); // **** slice() does array copy
+        //this.valence_vals = data.valence.slice(); // **** slice() does array copy
+
+        // The following two lines use map() to both:
+        //   convert the JSON string vals to numbers
+        //   generate a fresh array of values (rather than a shared ref) which is what we want      
+        this.arousal_vals = data.arousal.map((v) => Number(v)); 
+        this.valence_vals = data.valence.map((v) => Number(v));     
+        
         //this.createAVProgressTimelineData(arousal_vals, valence_vals, this); // **** need to pass in 'this' ??
     });
@@ -732 +745 @@
 
     if (arousal_val_3dp >= 0) {
-        arousal_val_3dp = "&nbsp;" + arousal_val_3d;
+        arousal_val_3dp = "&nbsp;" + arousal_val_3dp;
     }
 
     if (valence_val_3dp >= 0) {
-        valence_val_3dp = "&nbsp;" + valence_val_3d;
+        valence_val_3dp = "&nbsp;" + valence_val_3dp;
     }
 
     if ($('#arousal-val').length) {
-        $('#arousal-val').text(arousal_val_3dp);
+        $('#arousal-val').html(arousal_val_3dp);
     }
     if ($('#valence-val').length) {
-        $('#valence-val').text(valence_val_3dp);
+        $('#valence-val').html(valence_val_3dp);
     }