mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-22 13:16:10 +03:00
First attempt at removing duplicated code
I've created _applyBoundaryConstraints() and _fitBounds() to remove duplicated code.
This commit is contained in:
Henri Astre
parent
48aded3824
commit
e67f6b4003
369
src/viewport.js
369
src/viewport.js
@ -320,178 +320,14 @@ $.Viewport.prototype = /** @lends OpenSeadragon.Viewport.prototype */{
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* @function
|
|
||||||
* @return {OpenSeadragon.Viewport} Chainable.
|
|
||||||
* @fires OpenSeadragon.Viewer.event:constrain
|
|
||||||
*/
|
|
||||||
applyConstraints: function( immediately ) {
|
|
||||||
var actualZoom = this.getZoom(),
|
|
||||||
constrainedZoom = Math.max(
|
|
||||||
Math.min( actualZoom, this.getMaxZoom() ),
|
|
||||||
this.getMinZoom()
|
|
||||||
),
|
|
||||||
bounds,
|
|
||||||
horizontalThreshold,
|
|
||||||
verticalThreshold,
|
|
||||||
left,
|
|
||||||
right,
|
|
||||||
top,
|
|
||||||
bottom,
|
|
||||||
dx = 0,
|
|
||||||
dy = 0;
|
|
||||||
|
|
||||||
if ( actualZoom != constrainedZoom ) {
|
|
||||||
this.zoomTo( constrainedZoom, this.zoomPoint, immediately );
|
|
||||||
}
|
|
||||||
|
|
||||||
bounds = this.getBounds();
|
|
||||||
|
|
||||||
horizontalThreshold = this.visibilityRatio * bounds.width;
|
|
||||||
verticalThreshold = this.visibilityRatio * bounds.height;
|
|
||||||
|
|
||||||
left = bounds.x + bounds.width;
|
|
||||||
right = 1 - bounds.x;
|
|
||||||
top = bounds.y + bounds.height;
|
|
||||||
bottom = this.contentAspectY - bounds.y;
|
|
||||||
|
|
||||||
if ( this.wrapHorizontal ) {
|
|
||||||
//do nothing
|
|
||||||
} else {
|
|
||||||
if ( left < horizontalThreshold ) {
|
|
||||||
dx = horizontalThreshold - left;
|
|
||||||
}
|
|
||||||
if ( right < horizontalThreshold ) {
|
|
||||||
dx = dx ?
|
|
||||||
( dx + right - horizontalThreshold ) / 2 :
|
|
||||||
( right - horizontalThreshold );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( this.wrapVertical ) {
|
|
||||||
//do nothing
|
|
||||||
} else {
|
|
||||||
if ( top < verticalThreshold ) {
|
|
||||||
dy = ( verticalThreshold - top );
|
|
||||||
}
|
|
||||||
if ( bottom < verticalThreshold ) {
|
|
||||||
dy = dy ?
|
|
||||||
( dy + bottom - verticalThreshold ) / 2 :
|
|
||||||
( bottom - verticalThreshold );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( dx || dy || immediately ) {
|
|
||||||
bounds.x += dx;
|
|
||||||
bounds.y += dy;
|
|
||||||
if( bounds.width > 1 ){
|
|
||||||
bounds.x = 0.5 - bounds.width/2;
|
|
||||||
}
|
|
||||||
if( bounds.height > this.contentAspectY ){
|
|
||||||
bounds.y = this.contentAspectY/2 - bounds.height/2;
|
|
||||||
}
|
|
||||||
this.fitBounds( bounds, immediately );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( this.viewer ){
|
|
||||||
/**
|
|
||||||
* Raised when the viewport constraints are applied (see {@link OpenSeadragon.Viewport#applyConstraints}).
|
|
||||||
*
|
|
||||||
* @event constrain
|
|
||||||
* @memberof OpenSeadragon.Viewer
|
|
||||||
* @type {object}
|
|
||||||
* @property {OpenSeadragon.Viewer} eventSource - A reference to the Viewer which raised this event.
|
|
||||||
* @property {Boolean} immediately
|
|
||||||
* @property {?Object} userData - Arbitrary subscriber-defined object.
|
|
||||||
*/
|
|
||||||
this.viewer.raiseEvent( 'constrain', {
|
|
||||||
immediately: immediately
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @function
|
|
||||||
* @param {Boolean} immediately
|
|
||||||
*/
|
|
||||||
ensureVisible: function( immediately ) {
|
|
||||||
return this.applyConstraints( immediately );
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @function
|
* @function
|
||||||
* @param {OpenSeadragon.Rect} bounds
|
* @param {OpenSeadragon.Rect} bounds
|
||||||
* @param {Boolean} immediately
|
* @param {Boolean} immediately
|
||||||
* @return {OpenSeadragon.Viewport} Chainable.
|
* @return {OpenSeadragon.Rect} constrained bounds.
|
||||||
*/
|
*/
|
||||||
fitBounds: function( bounds, immediately ) {
|
_applyBoundaryConstraints: function( bounds, immediately ) {
|
||||||
var aspect = this.getAspectRatio(),
|
var horizontalThreshold,
|
||||||
center = bounds.getCenter(),
|
|
||||||
newBounds = new $.Rect(
|
|
||||||
bounds.x,
|
|
||||||
bounds.y,
|
|
||||||
bounds.width,
|
|
||||||
bounds.height
|
|
||||||
),
|
|
||||||
oldBounds,
|
|
||||||
oldZoom,
|
|
||||||
newZoom,
|
|
||||||
referencePoint;
|
|
||||||
|
|
||||||
if ( newBounds.getAspectRatio() >= aspect ) {
|
|
||||||
newBounds.height = bounds.width / aspect;
|
|
||||||
newBounds.y = center.y - newBounds.height / 2;
|
|
||||||
} else {
|
|
||||||
newBounds.width = bounds.height * aspect;
|
|
||||||
newBounds.x = center.x - newBounds.width / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.panTo( this.getCenter( true ), true );
|
|
||||||
this.zoomTo( this.getZoom( true ), null, true );
|
|
||||||
|
|
||||||
oldBounds = this.getBounds();
|
|
||||||
oldZoom = this.getZoom();
|
|
||||||
newZoom = 1.0 / newBounds.width;
|
|
||||||
if ( newZoom == oldZoom || newBounds.width == oldBounds.width ) {
|
|
||||||
return this.panTo( center, immediately );
|
|
||||||
}
|
|
||||||
|
|
||||||
referencePoint = oldBounds.getTopLeft().times(
|
|
||||||
this.containerSize.x / oldBounds.width
|
|
||||||
).minus(
|
|
||||||
newBounds.getTopLeft().times(
|
|
||||||
this.containerSize.x / newBounds.width
|
|
||||||
)
|
|
||||||
).divide(
|
|
||||||
this.containerSize.x / oldBounds.width -
|
|
||||||
this.containerSize.x / newBounds.width
|
|
||||||
);
|
|
||||||
|
|
||||||
return this.zoomTo( newZoom, referencePoint, immediately );
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @function
|
|
||||||
* @param {OpenSeadragon.Rect} bounds
|
|
||||||
* @param {Boolean} immediately
|
|
||||||
* @return {OpenSeadragon.Viewport} Chainable.
|
|
||||||
*/
|
|
||||||
fitBoundsWithConstraints: function( bounds, immediately ) {
|
|
||||||
var aspect = this.getAspectRatio(),
|
|
||||||
center = bounds.getCenter(),
|
|
||||||
newBounds = new $.Rect(
|
|
||||||
bounds.x,
|
|
||||||
bounds.y,
|
|
||||||
bounds.width,
|
|
||||||
bounds.height
|
|
||||||
),
|
|
||||||
oldBounds,
|
|
||||||
oldZoom,
|
|
||||||
newZoom,
|
|
||||||
referencePoint,
|
|
||||||
horizontalThreshold,
|
|
||||||
verticalThreshold,
|
verticalThreshold,
|
||||||
left,
|
left,
|
||||||
right,
|
right,
|
||||||
@ -499,38 +335,13 @@ $.Viewport.prototype = /** @lends OpenSeadragon.Viewport.prototype */{
|
|||||||
bottom,
|
bottom,
|
||||||
dx = 0,
|
dx = 0,
|
||||||
dy = 0,
|
dy = 0,
|
||||||
newBoundsAspectRatio;
|
newBounds = new $.Rect(
|
||||||
|
bounds.x,
|
||||||
if ( newBounds.getAspectRatio() >= aspect ) {
|
bounds.y,
|
||||||
newBounds.height = bounds.width / aspect;
|
bounds.width,
|
||||||
newBounds.y = center.y - newBounds.height / 2;
|
bounds.height
|
||||||
} else {
|
|
||||||
newBounds.width = bounds.height * aspect;
|
|
||||||
newBounds.x = center.x - newBounds.width / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
newBoundsAspectRatio = newBounds.getAspectRatio();
|
|
||||||
|
|
||||||
this.panTo( this.getCenter( true ), true );
|
|
||||||
this.zoomTo( this.getZoom( true ), null, true );
|
|
||||||
|
|
||||||
oldBounds = this.getBounds();
|
|
||||||
oldZoom = this.getZoom();
|
|
||||||
newZoom = 1.0 / newBounds.width;
|
|
||||||
|
|
||||||
var newConstrainedZoom = Math.max(
|
|
||||||
Math.min(newZoom, this.getMaxZoom() ),
|
|
||||||
this.getMinZoom()
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (newZoom !== newConstrainedZoom) {
|
|
||||||
newZoom = newConstrainedZoom;
|
|
||||||
newBounds.width = 1.0 / newZoom;
|
|
||||||
newBounds.x = center.x - newBounds.width / 2;
|
|
||||||
newBounds.height = newBounds.width / newBoundsAspectRatio;
|
|
||||||
newBounds.y = center.y - newBounds.height / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
horizontalThreshold = this.visibilityRatio * newBounds.width;
|
horizontalThreshold = this.visibilityRatio * newBounds.width;
|
||||||
verticalThreshold = this.visibilityRatio * newBounds.height;
|
verticalThreshold = this.visibilityRatio * newBounds.height;
|
||||||
|
|
||||||
@ -565,7 +376,7 @@ $.Viewport.prototype = /** @lends OpenSeadragon.Viewport.prototype */{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( dx || dy ) {
|
if ( dx || dy || immediately ) {
|
||||||
newBounds.x += dx;
|
newBounds.x += dx;
|
||||||
newBounds.y += dy;
|
newBounds.y += dy;
|
||||||
if( newBounds.width > 1 ){
|
if( newBounds.width > 1 ){
|
||||||
@ -576,8 +387,142 @@ $.Viewport.prototype = /** @lends OpenSeadragon.Viewport.prototype */{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return newBounds;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @function
|
||||||
|
* @return {OpenSeadragon.Viewport} Chainable.
|
||||||
|
* @fires OpenSeadragon.Viewer.event:constrain
|
||||||
|
*/
|
||||||
|
applyConstraints: function( immediately ) {
|
||||||
|
var actualZoom = this.getZoom(),
|
||||||
|
constrainedZoom = Math.max(
|
||||||
|
Math.min( actualZoom, this.getMaxZoom() ),
|
||||||
|
this.getMinZoom()
|
||||||
|
),
|
||||||
|
bounds,
|
||||||
|
constrainedBounds;
|
||||||
|
|
||||||
|
if ( actualZoom != constrainedZoom ) {
|
||||||
|
this.zoomTo( constrainedZoom, this.zoomPoint, immediately );
|
||||||
|
}
|
||||||
|
|
||||||
|
bounds = this.getBounds();
|
||||||
|
|
||||||
|
constrainedBounds = this._applyBoundaryConstraints( bounds, immediately );
|
||||||
|
|
||||||
|
if ( bounds.x !== constrainedBounds.x || bounds.y !== constrainedBounds.y || immediately ){
|
||||||
|
this.fitBounds( constrainedBounds, immediately );
|
||||||
|
}
|
||||||
|
|
||||||
|
if( this.viewer ){
|
||||||
|
/**
|
||||||
|
* Raised when the viewport constraints are applied (see {@link OpenSeadragon.Viewport#applyConstraints}).
|
||||||
|
*
|
||||||
|
* @event constrain
|
||||||
|
* @memberof OpenSeadragon.Viewer
|
||||||
|
* @type {object}
|
||||||
|
* @property {OpenSeadragon.Viewer} eventSource - A reference to the Viewer which raised this event.
|
||||||
|
* @property {Boolean} immediately
|
||||||
|
* @property {?Object} userData - Arbitrary subscriber-defined object.
|
||||||
|
*/
|
||||||
|
this.viewer.raiseEvent( 'constrain', {
|
||||||
|
immediately: immediately
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @function
|
||||||
|
* @param {Boolean} immediately
|
||||||
|
*/
|
||||||
|
ensureVisible: function( immediately ) {
|
||||||
|
return this.applyConstraints( immediately );
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @function
|
||||||
|
* @param {OpenSeadragon.Rect} bounds
|
||||||
|
* @param {Object} options (immediately=null, constraints=false)
|
||||||
|
* @return {OpenSeadragon.Viewport} Chainable.
|
||||||
|
*/
|
||||||
|
_fitBounds: function( bounds, options ) {
|
||||||
|
var newOptions = options || {};
|
||||||
|
var immediately = newOptions.immediately || null;
|
||||||
|
var constraints = newOptions.constraints || false;
|
||||||
|
|
||||||
|
var aspect = this.getAspectRatio(),
|
||||||
|
center = bounds.getCenter(),
|
||||||
|
newBounds = new $.Rect(
|
||||||
|
bounds.x,
|
||||||
|
bounds.y,
|
||||||
|
bounds.width,
|
||||||
|
bounds.height
|
||||||
|
),
|
||||||
|
oldBounds,
|
||||||
|
oldZoom,
|
||||||
|
newZoom,
|
||||||
|
referencePoint,
|
||||||
|
newBoundsAspectRatio,
|
||||||
|
newConstrainedZoom;
|
||||||
|
|
||||||
|
if ( newBounds.getAspectRatio() >= aspect ) {
|
||||||
|
newBounds.height = bounds.width / aspect;
|
||||||
|
newBounds.y = center.y - newBounds.height / 2;
|
||||||
|
} else {
|
||||||
|
newBounds.width = bounds.height * aspect;
|
||||||
|
newBounds.x = center.x - newBounds.width / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( constraints ) {
|
||||||
|
newBoundsAspectRatio = newBounds.getAspectRatio();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.panTo( this.getCenter( true ), true );
|
||||||
|
this.zoomTo( this.getZoom( true ), null, true );
|
||||||
|
|
||||||
|
oldBounds = this.getBounds();
|
||||||
|
oldZoom = this.getZoom();
|
||||||
|
newZoom = 1.0 / newBounds.width;
|
||||||
|
|
||||||
|
if ( constraints ) {
|
||||||
|
newConstrainedZoom = Math.max(
|
||||||
|
Math.min(newZoom, this.getMaxZoom() ),
|
||||||
|
this.getMinZoom()
|
||||||
|
);
|
||||||
|
|
||||||
|
if (newZoom !== newConstrainedZoom) {
|
||||||
|
newZoom = newConstrainedZoom;
|
||||||
|
newBounds.width = 1.0 / newZoom;
|
||||||
|
newBounds.x = center.x - newBounds.width / 2;
|
||||||
|
newBounds.height = newBounds.width / newBoundsAspectRatio;
|
||||||
|
newBounds.y = center.y - newBounds.height / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
newBounds = this._applyBoundaryConstraints( newBounds, immediately );
|
||||||
|
|
||||||
|
if( this.viewer ){
|
||||||
|
/**
|
||||||
|
* Raised when the viewport constraints are applied (see {@link OpenSeadragon.Viewport#applyConstraints}).
|
||||||
|
*
|
||||||
|
* @event constrain
|
||||||
|
* @memberof OpenSeadragon.Viewer
|
||||||
|
* @type {object}
|
||||||
|
* @property {OpenSeadragon.Viewer} eventSource - A reference to the Viewer which raised this event.
|
||||||
|
* @property {Boolean} immediately
|
||||||
|
* @property {?Object} userData - Arbitrary subscriber-defined object.
|
||||||
|
*/
|
||||||
|
this.viewer.raiseEvent( 'constrain', {
|
||||||
|
immediately: immediately
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ( newZoom == oldZoom || newBounds.width == oldBounds.width ) {
|
if ( newZoom == oldZoom || newBounds.width == oldBounds.width ) {
|
||||||
return this.panTo( newBounds.getCenter(), immediately );
|
return this.panTo( constraints ? newBounds.getCenter() : center, immediately );
|
||||||
}
|
}
|
||||||
|
|
||||||
referencePoint = oldBounds.getTopLeft().times(
|
referencePoint = oldBounds.getTopLeft().times(
|
||||||
@ -594,6 +539,32 @@ $.Viewport.prototype = /** @lends OpenSeadragon.Viewport.prototype */{
|
|||||||
return this.zoomTo( newZoom, referencePoint, immediately );
|
return this.zoomTo( newZoom, referencePoint, immediately );
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @function
|
||||||
|
* @param {OpenSeadragon.Rect} bounds
|
||||||
|
* @param {Boolean} immediately
|
||||||
|
* @return {OpenSeadragon.Viewport} Chainable.
|
||||||
|
*/
|
||||||
|
fitBounds: function( bounds, immediately ) {
|
||||||
|
return this._fitBounds( bounds, {
|
||||||
|
immediately: immediately,
|
||||||
|
constraints: false
|
||||||
|
} );
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @function
|
||||||
|
* @param {OpenSeadragon.Rect} bounds
|
||||||
|
* @param {Boolean} immediately
|
||||||
|
* @return {OpenSeadragon.Viewport} Chainable.
|
||||||
|
*/
|
||||||
|
fitBoundsWithConstraints: function( bounds, immediately ) {
|
||||||
|
return this._fitBounds( bounds, {
|
||||||
|
immediately: immediately,
|
||||||
|
constraints: true
|
||||||
|
} );
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @function
|
* @function
|
||||||
* @param {Boolean} immediately
|
* @param {Boolean} immediately
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user