correction for recent change which computed a highestLevel for drawer with max instead of min operation

This commit is contained in:
thatcher 2013-02-09 12:21:51 -05:00
parent 26f83e283a
commit 3f20018c75
4 changed files with 10 additions and 5 deletions

View File

@ -6,7 +6,7 @@
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 9 BUILD_MINOR: 9
BUILD_ID: 101 BUILD_ID: 102
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

View File

@ -1,7 +1,7 @@
/*globals OpenSeadragon */ /*globals OpenSeadragon */
/** /**
* @version OpenSeadragon 0.9.101 * @version OpenSeadragon 0.9.102
* *
* @fileOverview * @fileOverview
* <h2> * <h2>
@ -8840,7 +8840,7 @@ function updateViewport( drawer ) {
Math.log( 2 ) Math.log( 2 )
) )
), ),
highestLevel = Math.max( highestLevel = Math.min(
Math.abs(drawer.source.maxLevel), Math.abs(drawer.source.maxLevel),
Math.abs(Math.floor( Math.abs(Math.floor(
Math.log( zeroRatioC / drawer.minPixelRatio ) / Math.log( zeroRatioC / drawer.minPixelRatio ) /

View File

@ -365,7 +365,7 @@ function updateViewport( drawer ) {
Math.log( 2 ) Math.log( 2 )
) )
), ),
highestLevel = Math.max( highestLevel = Math.min(
Math.abs(drawer.source.maxLevel), Math.abs(drawer.source.maxLevel),
Math.abs(Math.floor( Math.abs(Math.floor(
Math.log( zeroRatioC / drawer.minPixelRatio ) / Math.log( zeroRatioC / drawer.minPixelRatio ) /

View File

@ -100,6 +100,7 @@ OpenSeadragon({
... ...
});</pre> });</pre>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var viewer = OpenSeadragon({ var viewer = OpenSeadragon({
id: "example-2row-tilesource-collection", id: "example-2row-tilesource-collection",
@ -111,6 +112,7 @@ OpenSeadragon({
collectionTileSize: 1024, collectionTileSize: 1024,
collectionTileMargin: 256, collectionTileMargin: 256,
//collectionLayout: 'vertical', //collectionLayout: 'vertical',
//panVertical: false, //panVertical: false,
//panHorizontal: false, //panHorizontal: false,
@ -166,6 +168,7 @@ OpenSeadragon({
... ...
});</pre> });</pre>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var viewer = OpenSeadragon({ var viewer = OpenSeadragon({
id: "example-2column-tilesource-collection", id: "example-2column-tilesource-collection",
@ -175,13 +178,15 @@ OpenSeadragon({
collectionMode: true, collectionMode: true,
collectionRows: 2, collectionRows: 2,
collectionTileSize: 1024, collectionTileSize: 1024,
collectionTileMargin: 512, collectionTileMargin: 256,
collectionLayout: 'vertical', collectionLayout: 'vertical',
//panVertical: false, //panVertical: false,
//panHorizontal: false, //panHorizontal: false,
//defaultZoomLevel: 1, //defaultZoomLevel: 1,
/*The wrap options can be fun to give a sense of infinite results*/ /*The wrap options can be fun to give a sense of infinite results*/
//wrapHorizontal: true, //wrapHorizontal: true,
//wrapVertical: true, //wrapVertical: true,