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

Rename worldContentSize to contentSizeNoRotate.

Browse Source
This commit is contained in:
Antoine Vandecreme 2016-02-17 18:08:26 -05:00
parent 0725645344
commit 015b1ca266
1 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/viewport.js
View File

@ -134,14 +134,9 @@ $.Viewport = function( options ) {
this._oldCenterY = this.centerSpringY.current.value; this._oldCenterY = this.centerSpringY.current.value;
this._oldZoom = this.zoomSpring.current.value; this._oldZoom = this.zoomSpring.current.value;
//TODO: is it useful? this._setContentBounds(new $.Rect(0, 0, 1, 1), 1);
if (this.contentSize) {
this.resetContentSize(this.contentSize);
} else {
this._setContentBounds(new $.Rect(0, 0, 1, 1), 1);
}
this.goHome( true ); this.goHome(true);
this.update(); this.update();
}; };
@ -164,27 +159,26 @@ $.Viewport.prototype = {
return this; return this;
}, },
/** // deprecated
* Updates the viewport's content bounds and constraints.
* This function is deprecated and shouldn't be called.
* @function
* @param {OpenSeadragon.Rect} bounds - the new bounds in viewport coordinates
* @param {Number} contentFactor - how many content units per viewport unit
* @fires OpenSeadragon.Viewer.event:reset-size
*/
setHomeBounds: function(bounds, contentFactor) { setHomeBounds: function(bounds, contentFactor) {
$.console.error("[Viewport.setHomeBounds] this function is deprecated; The content bounds should not be set manually."); $.console.error("[Viewport.setHomeBounds] this function is deprecated; The content bounds should not be set manually.");
this._setContentBounds(bounds, contentFactor); this._setContentBounds(bounds, contentFactor);
}, },
// Set the viewport's content bounds
// @param {OpenSeadragon.Rect} bounds - the new bounds in viewport coordinates
// without rotation
// @param {Number} contentFactor - how many content units per viewport unit
// @fires OpenSeadragon.Viewer.event:reset-size
// @private
_setContentBounds: function(bounds, contentFactor) { _setContentBounds: function(bounds, contentFactor) {
$.console.assert(bounds, "[Viewport._setContentBounds] bounds is required"); $.console.assert(bounds, "[Viewport._setContentBounds] bounds is required");
$.console.assert(bounds instanceof $.Rect, "[Viewport._setContentBounds] bounds must be an OpenSeadragon.Rect"); $.console.assert(bounds instanceof $.Rect, "[Viewport._setContentBounds] bounds must be an OpenSeadragon.Rect");
$.console.assert(bounds.width > 0, "[Viewport._setContentBounds] bounds.width must be greater than 0"); $.console.assert(bounds.width > 0, "[Viewport._setContentBounds] bounds.width must be greater than 0");
$.console.assert(bounds.height > 0, "[Viewport._setContentBounds] bounds.height must be greater than 0"); $.console.assert(bounds.height > 0, "[Viewport._setContentBounds] bounds.height must be greater than 0");
this._worldContentBounds = bounds.clone(); this._contentBoundsNoRotate = bounds.clone();
this._worldContentSize = this._worldContentBounds.getSize().times( this._contentSizeNoRotate = this._contentBoundsNoRotate.getSize().times(
contentFactor); contentFactor);
this._contentBounds = bounds.rotate(this.degrees).getBoundingBox(); this._contentBounds = bounds.rotate(this.degrees).getBoundingBox();
@ -208,9 +202,9 @@ $.Viewport.prototype = {
* @property {?Object} userData - Arbitrary subscriber-defined object. * @property {?Object} userData - Arbitrary subscriber-defined object.
*/ */
this.viewer.raiseEvent('reset-size', { this.viewer.raiseEvent('reset-size', {
contentSize: this._worldContentSize.clone(), contentSize: this._contentSizeNoRotate.clone(),
contentFactor: contentFactor, contentFactor: contentFactor,
homeBounds: this._worldContentBounds.clone(), homeBounds: this._contentBoundsNoRotate.clone(),
contentBounds: this._contentBounds.clone() contentBounds: this._contentBounds.clone()
}); });
} }
@ -466,11 +460,11 @@ $.Viewport.prototype = {
} else { } else {
var dx = 0; var dx = 0;
var thresholdLeft = newBounds.x + (newBounds.width - horizontalThreshold); var thresholdLeft = newBounds.x + (newBounds.width - horizontalThreshold);
if (this._worldContentBounds.x > thresholdLeft) { if (this._contentBoundsNoRotate.x > thresholdLeft) {
dx = this._worldContentBounds.x - thresholdLeft; dx = this._contentBoundsNoRotate.x - thresholdLeft;
} }
var contentRight = this._worldContentBounds.x + this._worldContentBounds.width; var contentRight = this._contentBoundsNoRotate.x + this._contentBoundsNoRotate.width;
var thresholdRight = newBounds.x + horizontalThreshold; var thresholdRight = newBounds.x + horizontalThreshold;
if (contentRight < thresholdRight) { if (contentRight < thresholdRight) {
var newDx = contentRight - thresholdRight; var newDx = contentRight - thresholdRight;
@ -488,11 +482,11 @@ $.Viewport.prototype = {
} else { } else {
var dy = 0; var dy = 0;
var thresholdTop = newBounds.y + (newBounds.height - verticalThreshold); var thresholdTop = newBounds.y + (newBounds.height - verticalThreshold);
if (this._worldContentBounds.y > thresholdTop) { if (this._contentBoundsNoRotate.y > thresholdTop) {
dy = this._worldContentBounds.y - thresholdTop; dy = this._contentBoundsNoRotate.y - thresholdTop;
} }
var contentBottom = this._worldContentBounds.y + this._worldContentBounds.height; var contentBottom = this._contentBoundsNoRotate.y + this._contentBoundsNoRotate.height;
var thresholdBottom = newBounds.y + verticalThreshold; var thresholdBottom = newBounds.y + verticalThreshold;
if (contentBottom < thresholdBottom) { if (contentBottom < thresholdBottom) {
var newDy = contentBottom - thresholdBottom; var newDy = contentBottom - thresholdBottom;
@ -1068,10 +1062,10 @@ $.Viewport.prototype = {
// private // private
_viewportToImageDelta: function( viewerX, viewerY ) { _viewportToImageDelta: function( viewerX, viewerY ) {
var scale = this._worldContentBounds.width; var scale = this._contentBoundsNoRotate.width;
return new $.Point( return new $.Point(
viewerX * this._worldContentSize.x / scale, viewerX * this._contentSizeNoRotate.x / scale,
viewerY * this._worldContentSize.x / scale); viewerY * this._contentSizeNoRotate.x / scale);
}, },
/** /**
@ -1096,16 +1090,16 @@ $.Viewport.prototype = {
} }
return this._viewportToImageDelta( return this._viewportToImageDelta(
viewerX - this._worldContentBounds.x, viewerX - this._contentBoundsNoRotate.x,
viewerY - this._worldContentBounds.y); viewerY - this._contentBoundsNoRotate.y);
}, },
// private // private
_imageToViewportDelta: function( imageX, imageY ) { _imageToViewportDelta: function( imageX, imageY ) {
var scale = this._worldContentBounds.width; var scale = this._contentBoundsNoRotate.width;
return new $.Point( return new $.Point(
imageX / this._worldContentSize.x * scale, imageX / this._contentSizeNoRotate.x * scale,
imageY / this._worldContentSize.x * scale); imageY / this._contentSizeNoRotate.x * scale);
}, },
/** /**
@ -1130,8 +1124,8 @@ $.Viewport.prototype = {
} }
var point = this._imageToViewportDelta(imageX, imageY); var point = this._imageToViewportDelta(imageX, imageY);
point.x += this._worldContentBounds.x; point.x += this._contentBoundsNoRotate.x;
point.y += this._worldContentBounds.y; point.y += this._contentBoundsNoRotate.y;
return point; return point;
}, },
@ -1307,9 +1301,9 @@ $.Viewport.prototype = {
$.console.error('[Viewport.viewportToImageZoom] is not accurate with multi-image.'); $.console.error('[Viewport.viewportToImageZoom] is not accurate with multi-image.');
} }
var imageWidth = this._worldContentSize.x; var imageWidth = this._contentSizeNoRotate.x;
var containerWidth = this._containerInnerSize.x; var containerWidth = this._containerInnerSize.x;
var scale = this._worldContentBounds.width; var scale = this._contentBoundsNoRotate.width;
var viewportToImageZoomRatio = (containerWidth / imageWidth) * scale; var viewportToImageZoomRatio = (containerWidth / imageWidth) * scale;
return viewportZoom * viewportToImageZoomRatio; return viewportZoom * viewportToImageZoomRatio;
}, },
@ -1331,9 +1325,9 @@ $.Viewport.prototype = {
$.console.error('[Viewport.imageToViewportZoom] is not accurate with multi-image.'); $.console.error('[Viewport.imageToViewportZoom] is not accurate with multi-image.');
} }
var imageWidth = this._worldContentSize.x; var imageWidth = this._contentSizeNoRotate.x;
var containerWidth = this._containerInnerSize.x; var containerWidth = this._containerInnerSize.x;
var scale = this._worldContentBounds.width; var scale = this._contentBoundsNoRotate.width;
var viewportToImageZoomRatio = (imageWidth / containerWidth) / scale; var viewportToImageZoomRatio = (imageWidth / containerWidth) / scale;
return imageZoom * viewportToImageZoomRatio; return imageZoom * viewportToImageZoomRatio;
} }