Fixed segment visibility check

bbc · Aug 10, 2017 · b8c6557 · b8c6557
1 parent 5717a5a
commit b8c6557
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/src/main/markers/shapes/wave.js b/src/main/markers/shapes/wave.js
@@ -37,6 +37,7 @@ define([
             view.frameOffset,
             waveformData.at_time(segment.startTime),
             waveformData.at_time(segment.endTime),
+            view.width,
             view.height
           );
 

diff --git a/src/main/markers/waveform.segments.js b/src/main/markers/waveform.segments.js
@@ -169,8 +169,8 @@ define([
     var frameStartOffset = waveformZoomView.frameOffset;
     var frameEndOffset   = waveformZoomView.frameOffset + waveformZoomView.width;
 
-    if (zoomEndOffset > frameStartOffset || zoomStartOffset < frameEndOffset) {
-      // Segment is visible
+    if (zoomStartOffset < frameEndOffset && zoomStartOffset < zoomEndOffset) {
+      // Segment is visible - see http://wiki.c2.com/?TestIfDateRangesOverlap
       var startPixel = zoomStartOffset - frameStartOffset;
       var endPixel   = zoomEndOffset   - frameStartOffset;
 

diff --git a/src/main/views/waveform.overview.js b/src/main/views/waveform.overview.js
@@ -125,6 +125,7 @@ define([
           self.frameOffset,
           0,
           self.width,
+          self.width,
           self.height
         );
 

diff --git a/src/main/views/waveform.zoomview.js b/src/main/views/waveform.zoomview.js
@@ -312,6 +312,7 @@ define([
           self.frameOffset,
           self.frameOffset,
           self.frameOffset + self.width,
+          self.width,
           self.height
         );
 

diff --git a/src/main/waveform/waveform.mixins.js b/src/main/waveform/waveform.mixins.js
@@ -257,10 +257,21 @@ define(['konva'], function(Konva) {
    * @param  {Int} frameOffset
    * @param  {Int} startPixels
    * @param  {Int} endPixels
+   * @param  {Int} width The width of the waveform area, in pixels
    * @param  {Int} height The height of the waveform area, in pixels
    */
 
-  function drawWaveform(context, waveformData, frameOffset, startPixels, endPixels, height) {
+  function drawWaveform(context, waveformData, frameOffset, startPixels, endPixels, width, height) {
+    if (startPixels < frameOffset) {
+      startPixels = frameOffset;
+    }
+
+    var limit = frameOffset + width;
+
+    if (endPixels > limit) {
+      endPixels = limit;
+    }
+
     var y = interpolateHeightGenerator(height);
     var adapter = waveformData.adapter;
     var x, val;