mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 14:46:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into collections

Browse Source
This commit is contained in:
Ian Gilman 2014-08-08 11:32:14 -07:00
commit 82637d95a5
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -12,6 +12,7 @@ OPENSEADRAGON CHANGELOG
* Added fitBoundsWithConstraints() to the viewport (#423) * Added fitBoundsWithConstraints() to the viewport (#423)
* Fixed MouseTracker cross-browser issues with tracking pointers over and out of the tracked element (pull request #448, fix for #152, #404, #420, and #427) * Fixed MouseTracker cross-browser issues with tracking pointers over and out of the tracked element (pull request #448, fix for #152, #404, #420, and #427)
* Fixed incorrect flick direction after image is rotated (#452) * Fixed incorrect flick direction after image is rotated (#452)
* Debug mode now works with rotate images (#453)
1.1.1: 1.1.1:

13
src/drawer.js
View File

@ -1181,12 +1181,24 @@ function drawDebugInfo( drawer, tile, count, i ){
drawer.context.font = 'small-caps bold 13px ariel'; drawer.context.font = 'small-caps bold 13px ariel';
drawer.context.strokeStyle = drawer.debugGridColor; drawer.context.strokeStyle = drawer.debugGridColor;
drawer.context.fillStyle = drawer.debugGridColor; drawer.context.fillStyle = drawer.debugGridColor;
offsetForRotation( tile, drawer.canvas, drawer.context, drawer.viewport.degrees );
drawer.context.strokeRect( drawer.context.strokeRect(
tile.position.x, tile.position.x,
tile.position.y, tile.position.y,
tile.size.x, tile.size.x,
tile.size.y tile.size.y
); );
var tileCenterX = tile.position.x + (tile.size.x / 2);
var tileCenterY = tile.position.y + (tile.size.y / 2);
// Rotate the text the right way around.
drawer.context.translate( tileCenterX, tileCenterY );
drawer.context.rotate( Math.PI / 180 * -drawer.viewport.degrees );
drawer.context.translate( -tileCenterX, -tileCenterY );
if( tile.x === 0 && tile.y === 0 ){ if( tile.x === 0 && tile.y === 0 ){
drawer.context.fillText( drawer.context.fillText(
"Zoom: " + drawer.viewport.getZoom(), "Zoom: " + drawer.viewport.getZoom(),
@ -1229,6 +1241,7 @@ function drawDebugInfo( drawer, tile, count, i ){
tile.position.x + 10, tile.position.x + 10,
tile.position.y + 70 tile.position.y + 70
); );
restoreRotationChanges( tile, drawer.canvas, drawer.context );
drawer.context.restore(); drawer.context.restore();
} }
} }