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

Add viewport.js to test.html so tests get run. Use built-in Point functions. Add a helper function to get a random number.

Browse Source
This commit is contained in:
nein09 2014-10-09 16:58:45 -07:00
parent 119ff4226d
commit e8d4c00c5f
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/test.html
View File

@ -31,5 +31,6 @@
<script src="/test/layers.js"></script> <script src="/test/layers.js"></script>
<script src="/test/overlays.js"></script> <script src="/test/overlays.js"></script>
<script src="/test/controls.js"></script> <script src="/test/controls.js"></script>
<script src="/test/viewport.js"></script>
</body> </body>
</html> </html>

32
test/viewport.js
View File

@ -23,6 +23,10 @@
viewer = null; viewer = null;
} }
}); });
// helper
var getRandom = function(min, max){
return min + Math.floor(Math.random() * (max - min + 1));
}
// ---------- // ----------
/* /*
@ -47,14 +51,14 @@
viewer.removeHandler('open', openHandler); viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
var orig_x = Math.floor(Math.random() * 10000); var orig_x = getRandom(500, 10000);
var orig_y = Math.floor(Math.random() * 10000); var orig_y = getRandom(500, 10000);
var orig = new OpenSeadragon.Point(orig_x, orig_y); var orig = new OpenSeadragon.Point(orig_x, orig_y);
// why does the math work this way?
var expected = new OpenSeadragon.Point((orig_x / 500) + 20, (orig_x / 500) + 20); // 500 is the viewport container size; there's 20 px of padding (I think)
var expected = orig.divide(500).plus( new OpenSeadragon.Point(20, 20) );
var actual = viewport.windowToViewportCoordinates(orig); var actual = viewport.windowToViewportCoordinates(orig);
equal(actual.x, expected.x, "x coordinate for " + orig_x); ok(actual.equals(expected), "Coordinates converted correctly for " + orig);
equal(actual.y, expected.y, "y coordinate for " + orig_y);
start(); start();
}; };
@ -67,14 +71,14 @@
viewer.removeHandler('open', openHandler); viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
var orig_x = Math.floor(Math.random() * 1000); var orig_x = getRandom(0, 1000);
var orig_y = Math.floor(Math.random() * 1000); var orig_y = getRandom(0, 1000);
var orig = new OpenSeadragon.Point(orig_x, orig_y); var orig = new OpenSeadragon.Point(orig_x, orig_y);
// why does the math work this way?
var expected = new OpenSeadragon.Point((orig_x - 20) * 500, (orig_y -20) * 500); // 500 is the viewport container size; there's 20 px of padding (I think)
var expected = orig.minus( new OpenSeadragon.Point(20, 20) ).times(500);
var actual = viewport.viewportToWindowCoordinates(orig); var actual = viewport.viewportToWindowCoordinates(orig);
equal(actual.x, expected.x, "x coordinate for " + orig_x); ok(actual.equals(expected), "Coordinates converted correctly for " + orig);
equal(actual.y, expected.y, "y coordinate for " + orig_y);
start(); start();
}; };
@ -87,7 +91,7 @@
viewer.removeHandler('open', openHandler); viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
var orig = Math.floor(Math.random() * 4); var orig = getRandom(0, 4);
var expected = orig / 2; // because the container is 500 x 500 var expected = orig / 2; // because the container is 500 x 500
var actual = viewport.viewportToImageZoom(orig); var actual = viewport.viewportToImageZoom(orig);
equal(expected, actual, "Expected " + expected + ", got " + actual); equal(expected, actual, "Expected " + expected + ", got " + actual);
@ -103,7 +107,7 @@
viewer.removeHandler('open', openHandler); viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
var orig = Math.floor(Math.random() * 4); var orig = getRandom(0, 4);
var expected = orig * 2; // because the container is 500 x 500 var expected = orig * 2; // because the container is 500 x 500
var actual = viewport.imageToViewportZoom(orig); var actual = viewport.imageToViewportZoom(orig);
equal(expected, actual, "Expected " + expected + ", got " + actual); equal(expected, actual, "Expected " + expected + ", got " + actual);