mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-01-19 17:21:50 +03:00
Code Issues Projects Releases Wiki Activity

Checkpoint. Some more cleanup and simplification. Starting to convert nav click to pixel-based. Starting to get props to target that

Browse Source
This commit is contained in:
houseofyin 2013-03-31 11:10:31 -04:00
parent 591b5b380d
commit b1809d4c49
2 changed files with 6 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/navigator.js
View File

@ -178,46 +178,20 @@ QUnit.config.autostart = false;
}(); }();
var simulateNavigatorClick = function(viewer, locationX, locationY) { var simulateNavigatorClick = function(viewer, locationX, locationY) {
var maxContentWidth = 1;
var maxContentHeight = 1/viewer.source.aspectRatio;
if (locationX === undefined) {
locationX = maxContentWidth/2;
}
if (locationY === undefined) {
locationY = maxContentHeight/2;
}
locationX = Math.min(maxContentWidth, Math.max(0, locationX));
locationY = Math.min(maxContentHeight, Math.max(0, locationY));
var $canvas = $(viewer.element).find('.openseadragon-canvas'); var $canvas = $(viewer.element).find('.openseadragon-canvas');
var offset = $canvas.offset(); var offset = $canvas.offset();
var event = { var event = {
clientX: offset.left + Math.floor($canvas.width() * locationX), clientX: offset.left + locationX,
clientY: offset.top + Math.floor($canvas.height() * locationY) clientY: offset.top + locationY
}; };
$canvas $canvas
.simulate('mouseover', event) .simulate('mouseover', event)
.simulate('mousedown', event) .simulate('mousedown', event)
.simulate('mouseup', event); .simulate('mouseup', event);
}(); };
var simulateNavigatorDrag = function(viewer, distanceX, distanceY) { var simulateNavigatorDrag = function(viewer, distanceX, distanceY) {
var maxContentWidth = 1;
var maxContentHeight = 1/viewer.source.aspectRatio;
if (distanceX === undefined) {
distanceX = maxContentWidth/4;
}
if (distanceY === undefined) {
distanceY = maxContentHeight/4;
}
distanceX = Math.min(maxContentWidth, Math.max(maxContentWidth * -1, distanceX));
distanceY = Math.min(maxContentHeight, Math.max(maxContentHeight * -1, distanceY));
var $canvas = $(viewer.element).find('.displayregion'); var $canvas = $(viewer.element).find('.displayregion');
var event = { var event = {
dx: Math.floor($canvas.width() * distanceX), dx: Math.floor($canvas.width() * distanceX),
@ -226,7 +200,7 @@ QUnit.config.autostart = false;
$canvas $canvas
.simulate('drag', event); .simulate('drag', event);
}(); };
var clickOnNavigator = function(theContentCorner) var clickOnNavigator = function(theContentCorner)
{ {
@ -252,7 +226,7 @@ QUnit.config.autostart = false;
xPos = 1; xPos = 1;
yPos = 1; yPos = 1;
} }
Util.simulateNavigatorClick(viewer.navigator, xPos, yPos); simulateNavigatorClick(viewer.navigator, xPos, yPos);
}; };
var dragNavigatorBackToCenter = function() var dragNavigatorBackToCenter = function()
@ -260,7 +234,7 @@ QUnit.config.autostart = false;
var start = viewer.viewport.getBounds().getTopLeft(); var start = viewer.viewport.getBounds().getTopLeft();
var target = new OpenSeadragon.Point(0.5,1/viewer.source.aspectRatio/2); var target = new OpenSeadragon.Point(0.5,1/viewer.source.aspectRatio/2);
var delta = target.minus(start); var delta = target.minus(start);
Util.simulateNavigatorDrag(viewer.navigator, delta.x, delta.y); simulateNavigatorDrag(viewer.navigator, delta.x, delta.y);
}; };
var assessNavigatorViewerPlacement = function (seadragonProperties, testProperties) { var assessNavigatorViewerPlacement = function (seadragonProperties, testProperties) {

52
test/util.js
View File

@ -28,60 +28,8 @@
.simulate('mouseover', event) .simulate('mouseover', event)
.simulate('mousedown', event) .simulate('mousedown', event)
.simulate('mouseup', event); .simulate('mouseup', event);
},
simulateNavigatorClick: function(viewer, locationX, locationY) {
var maxContentWidth = 1;
var maxContentHeight = 1/viewer.source.aspectRatio;
if (locationX === undefined) {
locationX = maxContentWidth/2;
} }
if (locationY === undefined) {
locationY = maxContentHeight/2;
}
locationX = Math.min(maxContentWidth, Math.max(0, locationX));
locationY = Math.min(maxContentHeight, Math.max(0, locationY));
var $canvas = $(viewer.element).find('.openseadragon-canvas');
var offset = $canvas.offset();
var event = {
clientX: offset.left + Math.floor($canvas.width() * locationX),
clientY: offset.top + Math.floor($canvas.height() * locationY)
};
$canvas
.simulate('mouseover', event)
.simulate('mousedown', event)
.simulate('mouseup', event);
},
simulateNavigatorDrag: function(viewer, distanceX, distanceY) {
var maxContentWidth = 1;
var maxContentHeight = 1/viewer.source.aspectRatio;
if (distanceX === undefined) {
distanceX = maxContentWidth/4;
}
if (distanceY === undefined) {
distanceY = maxContentHeight/4;
}
distanceX = Math.min(maxContentWidth, Math.max(maxContentWidth * -1, distanceX));
distanceY = Math.min(maxContentHeight, Math.max(maxContentHeight * -1, distanceY));
var $canvas = $(viewer.element).find('.displayregion');
var event = {
dx: Math.floor($canvas.width() * distanceX),
dy: Math.floor($canvas.height() * distanceY)
};
$canvas
.simulate('drag', event);
}
}; };
})(); })();