Commit graph

478 commits

Author SHA1 Message Date
cskwg
520f6dcc90 Merge 77a3ef881b into f412d07237 2013-06-13 09:49:16 -07:00
iangilman
f412d07237 Merge pull request #121 from houseofyin/issue37-navigator
Issue37 navigator / Issue101 navigator follow-up / Issue102 navigator default
2013-06-13 09:39:27 -07:00
houseofyin
1833f85232 Implemented fix for a test failure that shows up on Firefox in some situtions 2013-06-12 15:06:17 -04:00
houseofyin
af1f1b64af Removing the navigator demo files now that we have reasonable tests and examples for the navigator 2013-06-11 14:36:39 -04:00
houseofyin
e9587808ec Tweaked how the deprecated API element has handled 2013-06-11 14:35:45 -04:00
cskwg
77a3ef881b Update navigator.js
Changed style.opacity back to its previous value.
2013-06-11 20:34:21 +02:00
cskwg
9d246af681 Update tilesource.js
Added a comment for virtualMode
2013-06-11 20:22:49 +02:00
cskwg
3e69ad323e Update tilesource.js 2013-06-11 21:20:44 +03:00
cskwg
a1e876447b Update drawer.js
Removes the commented code.
2013-06-11 20:15:21 +02:00
Ian Gilman
29f3d80249 Making the basic demo a little more useful for debugging 2013-06-10 17:23:09 -07:00
iangilman
395a238df2 Merge pull request #122 from Ventero/drawhtmlperformance
Improve performance of Tile#drawHTML.
2013-06-10 17:19:21 -07:00
cskwg
25f62cee4b Update tile.js
Added the code required to implement virtual images and computed tiles.

The important parts are the call to "this.cacheTile" and the "rendered" handling.

The "rendered" handling makes it possible to modify a tile after it has been loaded.
The starting point is the method "fixTile" (drawer.js), this makes it possible to modify a tile.
For performance reasons it always generates a canvas context, no DOM image.
So the extra "rendered" if-statement is required to detect this.
There is no performance problem, because the image would have been converted to a canvas context anyway.

The "cacheTile" method is used by one or more invisible instances of OpenSeadragon to collect tiles.
These are then processed and accumulated to build the virtual image.
They are stored within the TILE_CACHE and the tileMatrix of the visible instance of OpenSeadragon.
This visible instance is the one which displays the virtual image.
Some changes were required in drawer.js (loadTile) to support this.

The following code is required to force appropriate painting and updating for the virtual image:

        //
        updateDrawer: function ( drawer, tile, target ) {
            try {
                var newtile = drawer.tilesMatrix[tile.level][tile.x][tile.y];
                newtile.image = target;
                newtile.loading = false;
                newtile.loaded = true;
                drawer.updateAgain = true;
                drawer.lastDrawn.push( newtile );
            } catch ( ex ) {
                console.log( ex );
            }
        },

And that method must be called for the viewer and the navigator:

                            mi.updateDrawer( osdMain.drawer, tile, target );
                            mi.updateDrawer( osdMain.navigator.drawer, tile, target );
2013-06-10 12:11:37 +03:00
cskwg
affc770b71 Update navigator.js
Only modified the transparency to make the Navigator completely opaque.
2013-06-10 11:55:21 +03:00
cskwg
4d5ccb2007 Update drawer.js
Added fixTile. This makes it possible to modify a tile after it has been loaded.
Besides that, modified some logging statements to make them more compatible.
2013-06-10 11:53:51 +03:00
cskwg
8464be164d Update viewer.js
only added a comment related to performance.
2013-06-10 11:51:48 +03:00
cskwg
1e5b9b98e0 Update openseadragon.js
modified console to make it easy to break into the debugger when errors happen.
2013-06-10 11:50:45 +03:00
houseofyin
9edd6ec131 Updated to turn on the navigator, since the navigator is no longer on my default 2013-06-08 12:03:51 -04:00
houseofyin
867e6de85a Fixed a test that would fail if not scrolled to the top. Improved test speed. Changed some variables to better echo corresponding variables in the application code 2013-06-07 10:25:26 -04:00
houseofyin
8a3ec97596 Implemented and documented fallback behavior 2013-06-07 10:24:12 -04:00
Ventero
a18f0e0efb Improve performance of Tile#drawHTML.
By specifying the tile size in absolute pixel values instead of
percentages, we can save the call to $.getElementSize.
2013-06-03 20:09:42 +02:00
houseofyin
7a8ebd7d4c More reasonable handling of the navigator when interacting outside the bounds of the display region 2013-06-02 22:32:29 -04:00
houseofyin
dc7bc6920c Updating the documentation 2013-06-01 16:09:04 -04:00
houseofyin
aca25d1979 Speeding up the tets 2013-06-01 16:08:23 -04:00
houseofyin
3e24be12e0 Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator 2013-06-01 14:12:04 -04:00
houseofyin
e36f7ed414 Trying to remove the selector element 2013-06-01 14:11:56 -04:00
Ian Gilman
c1f0b384c8 Added pull number to changelog item 2013-05-31 09:04:32 -07:00
Ian Gilman
9c60b28ec3 Merge branch 'master' of github.com:robhobbes/openseadragon into robhobbes-master
Fixed Conflicts:
	changelog.txt
2013-05-31 09:01:14 -07:00
Robert Hickman
699a5dd101 Adding documentation about navPrevNextWrap. 2013-05-30 12:46:54 -06:00
Ian Gilman
a551922537 Update changelog for recent fixes 2013-05-30 10:03:37 -07:00
Ian Gilman
498d972ef8 Removed changelog recommendation from readme as per discussion in #90 2013-05-30 10:03:25 -07:00
iangilman
b754ea834f Merge pull request #112 from openseadragon/blur
Fixed blendTile()-related blurriness issue (for #95)
2013-05-30 09:24:30 -07:00
iangilman
481cbef2bf Merge pull request #115 from Ventero/navigatortilesource
Don't load the tile source again when creating a navigator.
2013-05-30 09:22:57 -07:00
Ventero
b66dd7bed0 Don't load the tile source again when creating a navigator.
Previously, when showNavigator was set to true when creating the
viewer, the navigator would unnecessarily load and parse the tile
source, even though a fully parsed object already exists.
2013-05-30 02:53:53 +02:00
Robert Hickman
b5d977d593 Adding an option that allows the previous and next buttons to wrap around past the end or beginning images. 2013-05-29 17:10:45 -06:00
Ian Gilman
1d51b72785 Fixed blendTile()-related blurriness issue
We were setting drawer.updateAgain to the result of each blendTile(),
which meant it was keeping only the last result. Instead we should have
been only setting it to true if blendTile returned true, but never
setting it to false. Fixed.
2013-05-29 11:18:25 -07:00
iangilman
96d8cae6e2 Merge pull request #110 from dsteinbrunner/patch-2
domn to down typo fixes
2013-05-28 14:48:28 -07:00
David Steinbrunner
91da6af392 domn to down typo fixes 2013-05-28 17:34:20 -04:00
Ian Gilman
b7eb78a57a Additional doc comments for setControlsEnabled() 2013-05-28 13:54:13 -07:00
iangilman
c08724caa1 Merge pull request #108 from dsteinbrunner/patch-1
Correction to setControlsEnabled function name in comments
2013-05-28 13:50:42 -07:00
David Steinbrunner
7330b4a726 Correction to setControlsEnabled function name in comments 2013-05-28 17:36:09 -03:00
houseofyin
6385b0a296 Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator 2013-05-26 21:17:01 -04:00
houseofyin
f632d98730 Working on follow-up on the initial pull request. Changing the default navigator display property, and starting work on the docs 2013-05-26 21:16:56 -04:00
iangilman
e5187e4864 Merge pull request #104 from openseadragon/raf
Our requestAnimationFrame no longer changes the global window object
2013-05-24 09:17:59 -07:00
Ian Gilman
8e37633c49 Whitespace nits 2013-05-24 09:17:26 -07:00
Ian Gilman
1c60f90ee5 Tests for requestAnimationFrame and cancelAnimationFrame 2013-05-23 09:48:53 -07:00
Ian Gilman
8f53c564da Our requestAnimationFrame no longer changes the global window object 2013-05-23 09:48:38 -07:00
iangilman
86a908a4de Merge pull request #103 from acdha/paranoid-requestanimationframe-polyfill
Paranoid requestAnimationFrame for antique Firefox
2013-05-23 09:25:21 -07:00
Chris Adams
568d6a1c6b Paranoid requestAnimationFrame for antique Firefox
Very old versions of Firefox - e.g. Firefox 7 - have
window.requestAnimationFrame but not cancelAnimationFrame. This is a
very old release so the easiest fix is simply to check for both of the
functions which we intend to call and fall back on traditional behaviour
if both aren't present.
2013-05-23 10:17:41 -04:00
Ian Gilman
673f881d52 Minor fixes to basic demo 2013-05-21 11:06:03 -07:00
Ian Gilman
e4993700af Added test for makeAjaxRequest 2013-05-21 10:39:23 -07:00