mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-18 07:43:13 +03:00
Code Issues Projects Releases Wiki Activity

Refactored to replace parallel arrays with an object

Browse Source
This commit is contained in:
houseofyin 2013-04-02 14:09:49 -04:00
parent 6b97ab4424
commit 50a9cecd35
1 changed files with 172 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
test/navigator.js
View File

@ -23,8 +23,7 @@ QUnit.config.autostart = false;
start(); start();
}); });
var resetTestVariables = function() var resetTestVariables = function () {
{
if (viewer != null) { if (viewer != null) {
viewer.close(); viewer.close();
} }
@ -39,8 +38,7 @@ QUnit.config.autostart = false;
heightOfViewerContentOnNavigator = null; heightOfViewerContentOnNavigator = null;
}; };
var resetDom = function() var resetDom = function () {
{
if ($('#exampleNavigator').is(':ui-dialog')) { if ($('#exampleNavigator').is(':ui-dialog')) {
$('#exampleNavigator').dialog('destroy'); $('#exampleNavigator').dialog('destroy');
} }
@ -68,36 +66,28 @@ QUnit.config.autostart = false;
assessNumericValueWithSomeVariance(expectedY, navigator.offset().top, 4, ' Navigator y position'); assessNumericValueWithSomeVariance(expectedY, navigator.offset().top, 4, ' Navigator y position');
}; };
var navigatorRegionBoundsInPoints = function () var navigatorRegionBoundsInPoints = function () {
{
var regionBoundsInPoints; var regionBoundsInPoints;
if (navigator === null) if (navigator === null) {
{
maxHeightFactor = 1; maxHeightFactor = 1;
navigator = $(".navigator"); navigator = $(".navigator");
navigatorAspectRatio = navigator.height() / navigator.width(); navigatorAspectRatio = navigator.height() / navigator.width();
leftScalingFactor = navigatorAspectRatio * viewer.source.aspectRatio; leftScalingFactor = navigatorAspectRatio * viewer.source.aspectRatio;
if (viewer.source.aspectRatio < 1) if (viewer.source.aspectRatio < 1) {
{ if (viewer.source.aspectRatio < navigatorAspectRatio) {
if (viewer.source.aspectRatio < navigatorAspectRatio)
{
maxHeightFactor = viewer.source.aspectRatio * navigatorAspectRatio; maxHeightFactor = viewer.source.aspectRatio * navigatorAspectRatio;
} }
else else {
{
maxHeightFactor = viewer.source.aspectRatio; maxHeightFactor = viewer.source.aspectRatio;
} }
spaceFromLeftEdgeOfViewerToContentStart = ((1 / maxHeightFactor) - 1) / 2 * maxHeightFactor * navigator.width(); spaceFromLeftEdgeOfViewerToContentStart = ((1 / maxHeightFactor) - 1) / 2 * maxHeightFactor * navigator.width();
spaceFromTopEdgeOfViewerToContentStart = 0; spaceFromTopEdgeOfViewerToContentStart = 0;
} }
else else {
{ if (viewer.source.aspectRatio < navigatorAspectRatio) {
if (viewer.source.aspectRatio < navigatorAspectRatio)
{
spaceFromTopEdgeOfViewerToContentStart = (navigatorAspectRatio - (1 / viewer.source.aspectRatio)) / 2 / navigatorAspectRatio * navigator.height(); spaceFromTopEdgeOfViewerToContentStart = (navigatorAspectRatio - (1 / viewer.source.aspectRatio)) / 2 / navigatorAspectRatio * navigator.height();
} }
else else {
{
spaceFromTopEdgeOfViewerToContentStart = (navigatorAspectRatio - (1 / viewer.source.aspectRatio)) / 2 / navigatorAspectRatio * navigator.height(); spaceFromTopEdgeOfViewerToContentStart = (navigatorAspectRatio - (1 / viewer.source.aspectRatio)) / 2 / navigatorAspectRatio * navigator.height();
leftScalingFactor = 1; leftScalingFactor = 1;
} }
@ -131,8 +121,7 @@ QUnit.config.autostart = false;
// return function () { // return function () {
var currentDisplayRegionLeft; var currentDisplayRegionLeft;
var currentDisplayWidth; var currentDisplayWidth;
if (displayRegion === null) if (displayRegion === null) {
{
displayRegion = $(".displayregion"); displayRegion = $(".displayregion");
} }
var viewerAndNavigatorDisplayReady = false; var viewerAndNavigatorDisplayReady = false;
@ -141,8 +130,7 @@ QUnit.config.autostart = false;
lastDisplayRegionLeft = null; lastDisplayRegionLeft = null;
lastDisplayWidth = null; lastDisplayWidth = null;
} }
try try {
{
currentDisplayRegionLeft = displayRegion.position().left; currentDisplayRegionLeft = displayRegion.position().left;
currentDisplayWidth = displayRegion.width(); currentDisplayWidth = displayRegion.width();
viewerAndNavigatorDisplayReady = viewer.drawer !== null && viewerAndNavigatorDisplayReady = viewer.drawer !== null &&
@ -154,17 +142,17 @@ QUnit.config.autostart = false;
equalsWithSomeVariance(viewer.viewport.getBounds(true).y, viewer.viewport.getBounds().y, .0001) && equalsWithSomeVariance(viewer.viewport.getBounds(true).y, viewer.viewport.getBounds().y, .0001) &&
equalsWithSomeVariance(viewer.viewport.getBounds(true).width, viewer.viewport.getBounds().width, .0001); equalsWithSomeVariance(viewer.viewport.getBounds(true).width, viewer.viewport.getBounds().width, .0001);
} }
catch(err) catch (err) {
{
//Ignore. Subsequent code will try again shortly //Ignore. Subsequent code will try again shortly
} }
if (( !viewerAndNavigatorDisplayReady) && count < 50) { if (( !viewerAndNavigatorDisplayReady) && count < 50) {
count++; count++;
setTimeout(function () {waitForViewer(handler, count, currentDisplayRegionLeft, currentDisplayWidth);}, 100) setTimeout(function () {
waitForViewer(handler, count, currentDisplayRegionLeft, currentDisplayWidth);
}, 100)
} }
else { else {
if (count === 40) if (count === 40) {
{
console.log("waitForViewer:" + console.log("waitForViewer:" +
viewer.drawer + ":" + viewer.drawer.needsUpdate() + ":" + viewer.drawer + ":" + viewer.drawer.needsUpdate() + ":" +
viewerAndNavigatorDisplayReady + ":" + viewerAndNavigatorDisplayReady + ":" +
@ -206,47 +194,37 @@ QUnit.config.autostart = false;
.simulate('drag', event); .simulate('drag', event);
}; };
var assessViewerInCorner = function(theContentCorner) var assessViewerInCorner = function (theContentCorner) {
{ return function () {
return function()
{
var expectedXCoordinate, expecteYCoordinate; var expectedXCoordinate, expecteYCoordinate;
if (theContentCorner === "TOPLEFT") if (theContentCorner === "TOPLEFT") {
{
expectedXCoordinate = 0; expectedXCoordinate = 0;
expecteYCoordinate = 0; expecteYCoordinate = 0;
} }
else if (theContentCorner === "TOPRIGHT") else if (theContentCorner === "TOPRIGHT") {
{
expectedXCoordinate = 1 - viewer.viewport.getBounds().width; expectedXCoordinate = 1 - viewer.viewport.getBounds().width;
expecteYCoordinate = 0; expecteYCoordinate = 0;
} }
else if (theContentCorner === "BOTTOMRIGHT") else if (theContentCorner === "BOTTOMRIGHT") {
{
expectedXCoordinate = 1 - viewer.viewport.getBounds().width; expectedXCoordinate = 1 - viewer.viewport.getBounds().width;
expecteYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height; expecteYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height;
} }
else if (theContentCorner === "BOTTOMLEFT") else if (theContentCorner === "BOTTOMLEFT") {
{
expectedXCoordinate = 0; expectedXCoordinate = 0;
expecteYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height; expecteYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height;
} }
if (viewer.viewport.getBounds().width < 1) if (viewer.viewport.getBounds().width < 1) {
{
assessNumericValueWithSomeVariance(expectedXCoordinate, viewer.viewport.getBounds().x, .04, ' Viewer at ' + theContentCorner + ', x coord'); assessNumericValueWithSomeVariance(expectedXCoordinate, viewer.viewport.getBounds().x, .04, ' Viewer at ' + theContentCorner + ', x coord');
} }
if (viewer.viewport.getBounds().height < 1/viewer.source.aspectRatio) if (viewer.viewport.getBounds().height < 1 / viewer.source.aspectRatio) {
{
assessNumericValueWithSomeVariance(expecteYCoordinate, viewer.viewport.getBounds().y, .04, ' Viewer at ' + theContentCorner + ', y coord'); assessNumericValueWithSomeVariance(expecteYCoordinate, viewer.viewport.getBounds().y, .04, ' Viewer at ' + theContentCorner + ', y coord');
} }
} }
}; };
var assessViewerInCenter = function() var assessViewerInCenter = function () {
{
var yPositionVariance = .04; var yPositionVariance = .04;
if (viewer.source.aspectRatio < 1) if (viewer.source.aspectRatio < 1) {
{
yPositionVariance = yPositionVariance / viewer.source.aspectRatio; yPositionVariance = yPositionVariance / viewer.source.aspectRatio;
} }
assessNumericValueWithSomeVariance(1 / viewer.source.aspectRatio / 2, viewer.viewport.getCenter().y, yPositionVariance, ' Viewer at center, y coord'); assessNumericValueWithSomeVariance(1 / viewer.source.aspectRatio / 2, viewer.viewport.getCenter().y, yPositionVariance, ' Viewer at center, y coord');
@ -254,28 +232,22 @@ QUnit.config.autostart = false;
}; };
var clickOnNavigator = function(theContentCorner) var clickOnNavigator = function (theContentCorner) {
{ return function () {
return function()
{
var xPos, yPos; var xPos, yPos;
if (theContentCorner === "TOPLEFT") if (theContentCorner === "TOPLEFT") {
{
xPos = spaceFromLeftEdgeOfViewerToContentStart; xPos = spaceFromLeftEdgeOfViewerToContentStart;
yPos = spaceFromTopEdgeOfViewerToContentStart; yPos = spaceFromTopEdgeOfViewerToContentStart;
} }
else if (theContentCorner === "TOPRIGHT") else if (theContentCorner === "TOPRIGHT") {
{
xPos = spaceFromLeftEdgeOfViewerToContentStart + widthOfViewerContentOnNavigator; xPos = spaceFromLeftEdgeOfViewerToContentStart + widthOfViewerContentOnNavigator;
yPos = spaceFromTopEdgeOfViewerToContentStart; yPos = spaceFromTopEdgeOfViewerToContentStart;
} }
else if (theContentCorner === "BOTTOMRIGHT") else if (theContentCorner === "BOTTOMRIGHT") {
{
xPos = spaceFromLeftEdgeOfViewerToContentStart + widthOfViewerContentOnNavigator; xPos = spaceFromLeftEdgeOfViewerToContentStart + widthOfViewerContentOnNavigator;
yPos = spaceFromTopEdgeOfViewerToContentStart + heightOfViewerContentOnNavigator; yPos = spaceFromTopEdgeOfViewerToContentStart + heightOfViewerContentOnNavigator;
} }
else if (theContentCorner === "BOTTOMLEFT") else if (theContentCorner === "BOTTOMLEFT") {
{
xPos = spaceFromLeftEdgeOfViewerToContentStart; xPos = spaceFromLeftEdgeOfViewerToContentStart;
yPos = spaceFromTopEdgeOfViewerToContentStart + heightOfViewerContentOnNavigator; yPos = spaceFromTopEdgeOfViewerToContentStart + heightOfViewerContentOnNavigator;
} }
@ -283,14 +255,12 @@ QUnit.config.autostart = false;
} }
}; };
var dragNavigatorBackToCenter = function() var dragNavigatorBackToCenter = function () {
{
var start = viewer.viewport.getBounds().getTopLeft(); var start = viewer.viewport.getBounds().getTopLeft();
var target = new OpenSeadragon.Point(0.5 - viewer.viewport.getBounds().width / 2, var target = new OpenSeadragon.Point(0.5 - viewer.viewport.getBounds().width / 2,
1 / viewer.source.aspectRatio / 2 - viewer.viewport.getBounds().height / 2); 1 / viewer.source.aspectRatio / 2 - viewer.viewport.getBounds().height / 2);
var delta = target.minus(start); var delta = target.minus(start);
if (viewer.source.aspectRatio < 1) if (viewer.source.aspectRatio < 1) {
{
{ {
delta.y = delta.y * viewer.source.aspectRatio; delta.y = delta.y * viewer.source.aspectRatio;
} }
@ -302,34 +272,43 @@ QUnit.config.autostart = false;
seadragonProperties.visibilityRatio = 1; seadragonProperties.visibilityRatio = 1;
viewer = OpenSeadragon(seadragonProperties); viewer = OpenSeadragon(seadragonProperties);
var navigatorInteractionOperations = [ clickOnNavigator("TOPRIGHT"),dragNavigatorBackToCenter, var navigatorOperationScenarios = [
clickOnNavigator("BOTTOMLEFT"),dragNavigatorBackToCenter, {interactionOperation:clickOnNavigator("TOPRIGHT"),
clickOnNavigator("BOTTOMRIGHT"),dragNavigatorBackToCenter, assessmentOperation:assessViewerInCorner("TOPRIGHT"),
clickOnNavigator("TOPLEFT"),dragNavigatorBackToCenter ]; assessmentMessage:"After click on navigator on top right" },
var navigatorAssessmentOperations = [assessViewerInCorner("TOPRIGHT"),assessViewerInCenter, {interactionOperation:dragNavigatorBackToCenter,
assessViewerInCorner("BOTTOMLEFT"),assessViewerInCenter, assessmentOperation:assessViewerInCenter,
assessViewerInCorner("BOTTOMRIGHT"),assessViewerInCenter, assessmentMessage:"After drag on navigator from top right" },
assessViewerInCorner("TOPLEFT"),assessViewerInCenter]; {interactionOperation:clickOnNavigator("BOTTOMLEFT"),
assessmentOperation:assessViewerInCorner("BOTTOMLEFT"),
assessmentMessage:"After click on navigator on bottom left" },
{interactionOperation:dragNavigatorBackToCenter,
assessmentOperation:assessViewerInCenter,
assessmentMessage:"After drag on navigator from bottom left" },
{interactionOperation:clickOnNavigator("BOTTOMRIGHT"),
assessmentOperation:assessViewerInCorner("BOTTOMRIGHT"),
assessmentMessage:"After click on navigator on bottom right" },
{interactionOperation:dragNavigatorBackToCenter,
assessmentOperation:assessViewerInCenter,
assessmentMessage:"After drag on navigator from bottom right" },
{interactionOperation:clickOnNavigator("TOPLEFT"),
assessmentOperation:assessViewerInCorner("TOPLEFT"),
assessmentMessage:"After click on navigator on top left" },
{interactionOperation:dragNavigatorBackToCenter,
assessmentOperation:assessViewerInCenter,
assessmentMessage:"After drag on navigator from top left" }
];
var navigatorAssessmentMessages = ["After click on navigator on top right","After drag on navigator from top right", var assessNavigatorOperationAndTakeNextStep = function (step) {
"After click on navigator on bottom left","After drag on navigator from bottom left", return function () {
"After click on navigator on bottom right","After drag on navigator from bottom right",
"After click on navigator on top right","After drag on navigator from top right"];
var assessNavigatorOperationAndTakeNextStep = function(step)
{
return function()
{
var nextStep = step + 1; var nextStep = step + 1;
assessNavigatorDisplayRegionAndMainViewerState(navigatorAssessmentMessages[step]); assessNavigatorDisplayRegionAndMainViewerState(navigatorOperationScenarios[step].assessmentMessage);
navigatorAssessmentOperations[step](); navigatorOperationScenarios[step].assessmentOperation();
if (step === navigatorInteractionOperations.length-1) if (step === navigatorOperationScenarios.length - 1) {
{
start(); start();
} }
else else {
{ navigatorOperationScenarios[nextStep].interactionOperation();
navigatorInteractionOperations[nextStep]();
waitForViewer(assessNavigatorOperationAndTakeNextStep(nextStep)); waitForViewer(assessNavigatorOperationAndTakeNextStep(nextStep));
} }
}; };
@ -337,7 +316,7 @@ QUnit.config.autostart = false;
var assessAfterDragOnViewer = function () { var assessAfterDragOnViewer = function () {
assessNavigatorDisplayRegionAndMainViewerState("After pan"); assessNavigatorDisplayRegionAndMainViewerState("After pan");
navigatorInteractionOperations[0](); navigatorOperationScenarios[0].interactionOperation();
waitForViewer(assessNavigatorOperationAndTakeNextStep(0)); waitForViewer(assessNavigatorOperationAndTakeNextStep(0));
}; };