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

Merge branch 'collections' into ian

Browse Source 
fixed Conflicts:
	src/drawer.js
This commit is contained in:
Ian Gilman 2014-08-08 11:38:13 -07:00
commit d86edff931
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

@ -378,12 +378,24 @@ $.Drawer.prototype = /** @lends OpenSeadragon.Drawer.prototype */{
this.context.font = 'small-caps bold 13px ariel'; this.context.font = 'small-caps bold 13px ariel';
this.context.strokeStyle = this.debugGridColor; this.context.strokeStyle = this.debugGridColor;
this.context.fillStyle = this.debugGridColor; this.context.fillStyle = this.debugGridColor;
this._offsetForRotation( tile, this.canvas, this.context, this.viewport.degrees );
this.context.strokeRect( this.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.
this.context.translate( tileCenterX, tileCenterY );
this.context.rotate( Math.PI / 180 * -this.viewport.degrees );
this.context.translate( -tileCenterX, -tileCenterY );
if( tile.x === 0 && tile.y === 0 ){ if( tile.x === 0 && tile.y === 0 ){
this.context.fillText( this.context.fillText(
"Zoom: " + this.viewport.getZoom(), "Zoom: " + this.viewport.getZoom(),
@ -426,6 +438,7 @@ $.Drawer.prototype = /** @lends OpenSeadragon.Drawer.prototype */{
tile.position.x + 10, tile.position.x + 10,
tile.position.y + 70 tile.position.y + 70
); );
this._restoreRotationChanges( tile, this.canvas, this.context );
this.context.restore(); this.context.restore();
} }
}, },