Updating patterns for two-point data

audiogram/index.js

@@ -132,9 +132,6 @@ Audiogram.prototype.render = function(cb) {
     q.defer(this.trimAudio.bind(this), this.settings.start || 0, this.settings.end);
   }
 
-  // Get the audio's duration for computing number of frames
-  q.defer(this.probe.bind(this));
-
   // Get the audio waveform data
   q.defer(this.getWaveform.bind(this));
 

audiogram/waveform.js

@@ -77,7 +77,7 @@ function processSamples(samples, numFrames, samplesPerFrame) {
 
   });
 
-  // Scale up to -1 or 1
+  // Scale up to -1 / 1
   var adjustment = 1 / Math.max(Math.abs(min), Math.abs(max));
 
   var adjusted = unadjusted.map(function(frame){

renderer/patterns.js

@@ -36,13 +36,13 @@ function curve(interpolator) {
 
     var top = data.map(function(d,i){
 
-      return [x(i), baseline - height(d)];
+      return [x(i), baseline - height(d[1])];
 
     });
 
     var bottom = data.map(function(d,i){
 
-      return [x(i), baseline + height(d)];
+      return [x(i), baseline + height(-d[0])];
 
     }).reverse();
 
@@ -90,16 +90,17 @@ function bars(round) {
 
     data.forEach(function(val, i){
 
-      var h = height(val),
-          x = barX(i);
+      var h = height(-val[0]) + height(val[1]),
+          x = barX(i),
+          y = baseline - height(val[1]);
 
-      context.fillRect(x, baseline - h, barWidth, h * 2);
+      context.fillRect(x, y, barWidth, h);
 
       if (round) {
         context.beginPath();
-        context.arc(x + barWidth / 2, baseline - h, barWidth / 2, 0, 2 * Math.PI);
-        context.moveTo(x + barWidth / 2, baseline + h);
-        context.arc(x + barWidth / 2, baseline + h, barWidth / 2, 0, 2 * Math.PI);
+        context.arc(x + barWidth / 2, y, barWidth / 2, 0, 2 * Math.PI);
+        context.moveTo(x + barWidth / 2, y + h);
+        context.arc(x + barWidth / 2, y + h, barWidth / 2, 0, 2 * Math.PI);
         context.fill();
       }
 
@@ -132,7 +133,7 @@ function bricks(rainbow) {
 
     data.forEach(function(val, i){
 
-      var bricks = Math.max(1, Math.floor(height(val) / (brickHeight + brickGap))),
+      var bricks = Math.max(1, Math.floor(height(val[1]) / (brickHeight + brickGap))),
           x = barX(i);
 
       d3.range(bricks).forEach(function(b){