mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-04-18 08:31:00 +00:00
Code Issues Projects Releases Wiki Activity

Update drawer.js

Browse source 
Added fixTile. This makes it possible to modify a tile after it has been loaded.
Besides that, modified some logging statements to make them more compatible.
This commit is contained in:
cskwg 2013-06-10 11:53:51 +03:00
parent 8464be164d
commit 4d5ccb2007
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/drawer.js
View file

@ -46,10 +46,12 @@ var DEVICE_SCREEN = $.getWindowSize(),
( BROWSER == $.BROWSERS.IE && BROWSER_VERSION >= 9 )
),
USE_CANVAS = SUBPIXEL_RENDERING &&
!( DEVICE_SCREEN.x <= 400 || DEVICE_SCREEN.y <= 400 ) &&
!( navigator.appVersion.match( 'Mobile' ) ) &&
$.isFunction( document.createElement( "canvas" ).getContext );
// always use canvas when it is available.
USE_CANVAS = $.isFunction( document.createElement( "canvas" ).getContext );
//USE_CANVAS = SUBPIXEL_RENDERING &&
// !( DEVICE_SCREEN.x <= 400 || DEVICE_SCREEN.y <= 400 ) &&
// !( navigator.appVersion.match( 'Mobile' ) ) &&
// $.isFunction( document.createElement( "canvas" ).getContext );
//console.error( 'USE_CANVAS ' + USE_CANVAS );
@ -777,6 +779,10 @@ function loadTile( drawer, tile, time ) {
if( drawer.viewport.collectionMode ){
drawer.midUpdate = false;
onTileLoad( drawer, tile, time );
} else if ( drawer.source.virtualMode ) {
tile.loading = true;
tile.loaded = false;
tile.image = null;
} else {
tile.loading = drawer.loadImage(
tile.url,
@ -805,19 +811,22 @@ function onTileLoad( drawer, tile, time, image ) {
$.console.warn( "Tile load callback in middle of drawing routine." );
return;
} else if ( !image && !drawer.viewport.collectionMode ) {
$.console.log( "Tile %s failed to load: %s", tile, tile.url );
$.console.log( "Tile " + tile + " failed to load: " + tile.url );
if( !drawer.debugMode ){
tile.exists = false;
return;
}
} else if ( time < drawer.lastResetTime ) {
$.console.log( "Ignoring tile %s loaded before reset: %s", tile, tile.url );
$.console.log( "Ignoring tile " + tile + " loaded before reset: " + tile.url );
return;
}
tile.loaded = true;
tile.image = image;
// give the application an opportunity to modify the just-loaded tile.
if ( drawer.fixTile ) {
drawer.fixTile( drawer, tile );
}
insertionIndex = drawer.tilesLoaded.length;
@ -987,10 +996,7 @@ function isCovered( coverage, level, x, y ) {
*/
function setCoverage( coverage, level, x, y, covers ) {
if ( !coverage[ level ] ) {
$.console.warn(
"Setting coverage for a tile before its level's coverage has been reset: %s",
level
);
$.console.warn( "Setting coverage for a tile before its level's coverage has been reset: " + level );
return;
}
@ -1162,7 +1168,7 @@ function drawTiles( drawer, lastDrawn ){
} else {
if ( USE_CANVAS ) {
tile.drawCanvas( drawer.context );
tile.drawCanvas( drawer.context, drawer.source );
} else {
tile.drawHTML( drawer.canvas );
}