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

implemented rotation about a pivot point in viewport coordinates

Browse Source
This commit is contained in:
Tom 2022-11-11 22:15:52 -05:00
parent ed66c2d151
commit 51807a77f0
3 changed files with 12580 additions and 12549 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "openseadragon", "name": "openseadragon",
"version": "3.0.0", "version": "3.1.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "openseadragon", "name": "openseadragon",
"version": "3.0.0", "version": "3.1.0",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"devDependencies": { "devDependencies": {
"grunt": "^1.4.1", "grunt": "^1.4.1",

37
src/viewport.js
View File

@ -929,9 +929,11 @@ $.Viewport.prototype = {
* @param {Number} degrees The degrees to set the rotation to. * @param {Number} degrees The degrees to set the rotation to.
* @param {Boolean} [immediately=false] Whether to animate to the new angle * @param {Boolean} [immediately=false] Whether to animate to the new angle
* or rotate immediately. * or rotate immediately.
* @param {OpenSeadragon.Point} [pivot=false] (Optional) point in viewport coordinates
* around which the rotation should be performed. Defaults to the center of the viewport.
* @returns {OpenSeadragon.Viewport} Chainable. * @returns {OpenSeadragon.Viewport} Chainable.
*/ */
setRotation: function(degrees, immediately) { setRotation: function(degrees, immediately, pivot) {
if (!this.viewer || !this.viewer.drawer.canRotate()) { if (!this.viewer || !this.viewer.drawer.canRotate()) {
return this; return this;
} }
@ -940,8 +942,23 @@ $.Viewport.prototype = {
this.degreesSpring.isAtTargetValue()) { this.degreesSpring.isAtTargetValue()) {
return this; return this;
} }
this.rotationPivot = pivot;
if (immediately) { if (immediately) {
if(pivot){
var changeInDegrees = degrees - this._oldDegrees;
if(!changeInDegrees){
return this;
}
var delta = pivot.minus(this.getCenter());
this.centerSpringX.shiftBy(delta.x);
this.centerSpringY.shiftBy(delta.y);
this.degreesSpring.resetTo(degrees); this.degreesSpring.resetTo(degrees);
var rdelta = delta.rotate(changeInDegrees * -1).times(-1);
this.centerSpringX.shiftBy(rdelta.x);
this.centerSpringY.shiftBy(rdelta.y);
} else{
this.degreesSpring.resetTo(degrees);
}
} else { } else {
var normalizedFrom = $.positiveModulo(this.degreesSpring.current.value, 360); var normalizedFrom = $.positiveModulo(this.degreesSpring.current.value, 360);
var normalizedTo = $.positiveModulo(degrees, 360); var normalizedTo = $.positiveModulo(degrees, 360);
@ -970,9 +987,11 @@ $.Viewport.prototype = {
* @type {object} * @type {object}
* @property {OpenSeadragon.Viewer} eventSource - A reference to the Viewer which raised the event. * @property {OpenSeadragon.Viewer} eventSource - A reference to the Viewer which raised the event.
* @property {Number} degrees - The number of degrees the rotation was set to. * @property {Number} degrees - The number of degrees the rotation was set to.
* @property {Boolean} immediately - Whether the rotation happened immediately or was animated
* @property {OpenSeadragon.Point} pivot - The point in viewport coordinates around which the rotation (if any) happened
* @property {?Object} userData - Arbitrary subscriber-defined object. * @property {?Object} userData - Arbitrary subscriber-defined object.
*/ */
this.viewer.raiseEvent('rotate', {degrees: degrees}); this.viewer.raiseEvent('rotate', {degrees: degrees, immediately: !!immediately, pivot: pivot || this.getCenter()});
return this; return this;
}, },
@ -1040,7 +1059,7 @@ $.Viewport.prototype = {
}, },
/** /**
* Update the zoom and center (X and Y) springs. * Update the zoom, degrees, and center (X and Y) springs.
* @function * @function
* @returns {Boolean} True if any change has been made, false otherwise. * @returns {Boolean} True if any change has been made, false otherwise.
*/ */
@ -1053,7 +1072,19 @@ $.Viewport.prototype = {
this.centerSpringX.update(); this.centerSpringX.update();
this.centerSpringY.update(); this.centerSpringY.update();
if(this.rotationPivot && this.degreesSpring.current.value !== this.degreesSpring.target.value){
var delta = this.rotationPivot.minus(this.getCenter());
this.centerSpringX.shiftBy(delta.x);
this.centerSpringY.shiftBy(delta.y);
this.degreesSpring.update(); this.degreesSpring.update();
var changeInDegrees = this.degreesSpring.current.value - this._oldDegrees;
var rdelta = delta.rotate(changeInDegrees * -1).times(-1);
this.centerSpringX.shiftBy(rdelta.x);
this.centerSpringY.shiftBy(rdelta.y);
}
else{
this.degreesSpring.update();
}
var changed = this.centerSpringX.current.value !== this._oldCenterX || var changed = this.centerSpringX.current.value !== this._oldCenterX ||
this.centerSpringY.current.value !== this._oldCenterY || this.centerSpringY.current.value !== this._oldCenterY ||