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 #1524 from jil24/master

Browse Source 
Adds option to set rotation increment for nav buttons and keyboard
This commit is contained in:
Ian Gilman 2018-08-22 09:24:25 -07:00 committed by GitHub
commit 144befb44c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openseadragon.js
View File

@ -271,6 +271,9 @@
* events between different devices, causing the faster devices to slow down enough to make the zoom control
* more manageable.
*
* @property {Number} [rotationIncrement=90]
* The number of degrees to rotate right or left when the rotate buttons or keyboard shortcuts are activated.
*
* @property {Number} [pixelsPerWheelLine=40]
* For pixel-resolution scrolling devices, the number of pixels equal to one scroll line.
*
@ -1137,6 +1140,7 @@ function OpenSeadragon( options ){
autoResize: true,
preserveImageSizeOnResize: false, // requires autoResize=true
minScrollDeltaTime: 50,
rotationIncrement: 90,
//DEFAULT CONTROL SETTINGS
showSequenceControl: true, //SEQUENCE

27
src/viewer.js
View File

@ -2640,19 +2640,19 @@ function onCanvasKeyPress( event ) {
this.viewport.applyConstraints();
}
return false;
case 114: //r - 90 degrees clockwise rotation
case 114: //r - clockwise rotation
if(this.viewport.flipped){
this.viewport.setRotation(this.viewport.degrees - 90);
this.viewport.setRotation($.positiveModulo(this.viewport.degrees - this.rotationIncrement, 360));
} else{
this.viewport.setRotation(this.viewport.degrees + 90);
this.viewport.setRotation($.positiveModulo(this.viewport.degrees + this.rotationIncrement, 360));
}
this.viewport.applyConstraints();
return false;
case 82: //R - 90 degrees counterclockwise rotation
case 82: //R - counterclockwise rotation
if(this.viewport.flipped){
this.viewport.setRotation(this.viewport.degrees + 90);
this.viewport.setRotation($.positiveModulo(this.viewport.degrees + this.rotationIncrement, 360));
} else{
this.viewport.setRotation(this.viewport.degrees - 90);
this.viewport.setRotation($.positiveModulo(this.viewport.degrees - this.rotationIncrement, 360));
}
this.viewport.applyConstraints();
return false;
@ -3490,38 +3490,31 @@ function onFullScreen() {
}
}
/**
* Note: The current rotation feature is limited to 90 degree turns.
*/
function onRotateLeft() {
if ( this.viewport ) {
var currRotation = this.viewport.getRotation();
if ( this.viewport.flipped ){
currRotation = $.positiveModulo(currRotation + 90, 360);
currRotation = $.positiveModulo(currRotation + this.rotationIncrement, 360);
} else {
currRotation = $.positiveModulo(currRotation - 90, 360);
currRotation = $.positiveModulo(currRotation - this.rotationIncrement, 360);
}
this.viewport.setRotation(currRotation);
}
}
/**
* Note: The current rotation feature is limited to 90 degree turns.
*/
function onRotateRight() {
if ( this.viewport ) {
var currRotation = this.viewport.getRotation();
if ( this.viewport.flipped ){
currRotation = $.positiveModulo(currRotation - 90, 360);
currRotation = $.positiveModulo(currRotation - this.rotationIncrement, 360);
} else {
currRotation = $.positiveModulo(currRotation + 90, 360);
currRotation = $.positiveModulo(currRotation + this.rotationIncrement, 360);
}
this.viewport.setRotation(currRotation);
}
}
/**
* Note: When pressed flip control button
*/