Merge branch 'master' into data_export

GMOD · Oct 1, 2012 · 97ab8f2 · 97ab8f2
2 parents 23ef2fb + 16811d3
commit 97ab8f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/release-notes.txt b/release-notes.txt
@@ -1,5 +1,9 @@
 {{$NEXT}}
 
+ * Fixed off-by-one error in Wiggle track display code: wiggle data
+   was incorrectly displayed shifted one base to the left of its
+   proper position.  Thanks to Steffi Geisen for noticing this.
+
  * Fixed bug in which reference-sequence selection box did not
    automatically update in all situations to reflect the current
    reference sequence.

diff --git a/src/JBrowse/View/Track/Wiggle.js b/src/JBrowse/View/Track/Wiggle.js
@@ -191,8 +191,8 @@ var Wiggle = declare( CanvasTrack,
                             var score = f.get('score');
                             var rTop = toY( score );
                             if( rTop <= canvasHeight ) {
-                                var rWidth = Math.ceil(( f.get('end') - f.get('start') + 1 ) * scale );
-                                var rLeft  = Math.floor(( f.get('start')-1 - leftBase ) * scale );
+                                var rWidth = Math.ceil(( f.get('end') - f.get('start') ) * scale );
+                                var rLeft  = Math.floor(( f.get('start') - leftBase ) * scale );
                                 this._updatePixelScores( pixelScores, rLeft, rWidth, score );
                                 if( rTop <= originY ) {
                                     // bar goes upward