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

Merge pull request #1271 from jetic83/master

Browse Source 
different colors for different tiled images in debug mode.
This commit is contained in:
Ian Gilman 2017-08-01 13:07:22 -07:00 committed by GitHub
commit 8d2d0552a2
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/drawer.js
View File

@ -69,7 +69,7 @@ $.Drawer = function( options ) {
this.viewer = options.viewer; this.viewer = options.viewer;
this.viewport = options.viewport; this.viewport = options.viewport;
this.debugGridColor = options.debugGridColor || $.DEFAULT_SETTINGS.debugGridColor; this.debugGridColor = typeof options.debugGridColor === 'string' ? [options.debugGridColor] : options.debugGridColor || $.DEFAULT_SETTINGS.debugGridColor;
if (options.opacity) { if (options.opacity) {
$.console.error( "[Drawer] options.opacity is no longer accepted; set the opacity on the TiledImage instead" ); $.console.error( "[Drawer] options.opacity is no longer accepted; set the opacity on the TiledImage instead" );
} }
@ -490,12 +490,13 @@ $.Drawer.prototype = {
return; return;
} }
var colorIndex = this.viewer.world.getIndexOfItem(tiledImage) % this.debugGridColor.length;
var context = this.context; var context = this.context;
context.save(); context.save();
context.lineWidth = 2 * $.pixelDensityRatio; context.lineWidth = 2 * $.pixelDensityRatio;
context.font = 'small-caps bold ' + (13 * $.pixelDensityRatio) + 'px arial'; context.font = 'small-caps bold ' + (13 * $.pixelDensityRatio) + 'px arial';
context.strokeStyle = this.debugGridColor; context.strokeStyle = this.debugGridColor[colorIndex];
context.fillStyle = this.debugGridColor; context.fillStyle = this.debugGridColor[colorIndex];
if ( this.viewport.degrees !== 0 ) { if ( this.viewport.degrees !== 0 ) {
this._offsetForRotation({degrees: this.viewport.degrees}); this._offsetForRotation({degrees: this.viewport.degrees});
@ -581,8 +582,8 @@ $.Drawer.prototype = {
var context = this.context; var context = this.context;
context.save(); context.save();
context.lineWidth = 2 * $.pixelDensityRatio; context.lineWidth = 2 * $.pixelDensityRatio;
context.strokeStyle = this.debugGridColor; context.strokeStyle = this.debugGridColor[0];
context.fillStyle = this.debugGridColor; context.fillStyle = this.debugGridColor[0];
context.strokeRect( context.strokeRect(
rect.x * $.pixelDensityRatio, rect.x * $.pixelDensityRatio,

6
src/openseadragon.js
View File

@ -159,7 +159,9 @@
* @property {Boolean} [debugMode=false] * @property {Boolean} [debugMode=false]
* TODO: provide an in-screen panel providing event detail feedback. * TODO: provide an in-screen panel providing event detail feedback.
* *
* @property {String} [debugGridColor='#437AB2'] * @property {String} [debugGridColor=['#437AB2', '#1B9E77', '#D95F02', '#7570B3', '#E7298A', '#66A61E', '#E6AB02', '#A6761D', '#666666']]
* The colors of grids in debug mode. Each tiled image's grid uses a consecutive color.
* If there are more tiled images than provided colors, the color vector is recycled.
* *
* @property {Number} [blendTime=0] * @property {Number} [blendTime=0]
* Specifies the duration of animation as higher or lower level tiles are * Specifies the duration of animation as higher or lower level tiles are
@ -1207,7 +1209,7 @@ function OpenSeadragon( options ){
//DEVELOPER SETTINGS //DEVELOPER SETTINGS
debugMode: false, debugMode: false,
debugGridColor: '#437AB2' debugGridColor: ['#437AB2', '#1B9E77', '#D95F02', '#7570B3', '#E7298A', '#66A61E', '#E6AB02', '#A6761D', '#666666']
}, },