Commit Graph

242 Commits

Author SHA1 Message Date
thejohnhoffer
3eee34a0f2 count tiledImage._tilesLoading 2016-11-04 17:37:48 -04:00
thejohnhoffer
cf5825d1fa better underscores in preload term handling 2016-11-04 10:03:41 -04:00
thejohnhoffer
2915ee09c5 correct logic for call to _updateViewport 2016-11-04 09:26:34 -04:00
thejohnhoffer
9548ad6a27 using the strict === comparison 2016-11-04 09:24:08 -04:00
thejohnhoffer
171591a7a3 new opacity flag 2016-11-04 09:21:04 -04:00
thejohnhoffer
c402a7bfdd underscores to preload 2016-11-04 09:11:46 -04:00
thejohnhoffer
0a44585457 documentation of opacity and preload relations 2016-11-03 22:39:00 -04:00
thejohnhoffer
3fc1948a44 setting booleans the shortest way 2016-11-03 17:12:44 -04:00
thejohnhoffer
1baf086e1b setting booleans the easy way 2016-11-03 17:11:22 -04:00
thejohnhoffer
bac2cab8e9 document tiledImage.preload 2016-11-02 20:45:33 -04:00
Antoine Vandecreme
10dd723637 Remove reliance on getTileAtPoint for wrapping 2016-11-01 21:43:50 +01:00
Edminsson
04eafa9275 Edge smoothing and IE8 #1063 2016-10-31 09:25:13 +01:00
Ian Gilman
eb8b9ccd50 Merge pull request #1006 from avandecreme/master
Tiled image rotation
2016-10-26 09:58:12 -07:00
Antoine Vandecreme
4b48717010 Rollback sketchCanvas scaling when tiled image rotated 2016-10-25 21:41:42 +02:00
Antoine Vandecreme
5ac1502ccd Take pixelDensityRatio into account when rotating 2016-10-24 22:03:31 +02:00
Antoine Vandecreme
b992d54572 Fix jshint error 2016-10-24 21:34:29 +02:00
Antoine Vandecreme
a9b60057ea Fix wrapping. 2016-10-23 22:25:16 +02:00
Antoine Vandecreme
77310b0229 Remove TODO 2016-10-23 18:25:14 +02:00
Antoine Vandecreme
5bfccec7a3 Disable tile edge smoothing with tiled image rotation 2016-10-23 17:45:39 +02:00
Antoine Vandecreme
2821c8f67b Partialy fix edge smoothing. 2016-10-06 22:18:32 +02:00
Ryan Lester
0d4e17b627 Use the squared distance when comparing tiles.
This drops a Math.sqrt calculation from every tile iterated over while
drawing, improving performance.
2016-09-05 19:09:44 -04:00
Antoine Vandecreme
62c96ebad7 Add clip-change event. 2016-08-28 14:39:14 +02:00
Antoine Vandecreme
33332bf774 Set rotation around center and fix typo. 2016-08-28 13:39:26 +02:00
Antoine Vandecreme
eaddc1c33b Merge branch 'master' of https://github.com/openseadragon/openseadragon 2016-08-28 12:14:49 +02:00
Antoine Vandecreme
2e3f57401f Fix tiles missing with rotation + rotate around center 2016-08-28 12:10:35 +02:00
Simon Green
198e5b3461 Fix #1013
tiledImage. _needsDraw flag was only being set to true once the tile had been loaded which effectively made the initial tile loading sequential
2016-08-25 13:44:12 -06:00
Antoine Vandecreme
f0cb707ff2 Improve code readability 2016-08-21 19:24:40 +02:00
Antoine Vandecreme
9e69462405 Merge branch 'master' of https://github.com/openseadragon/openseadragon 2016-08-21 13:16:38 +02:00
Antoine Vandecreme
a9f5e7ec73 Add unit test and fix code review comments. 2016-08-21 12:54:33 +02:00
Antoine Vandecreme
65b59c08d6 First draft of tiled image rotation. 2016-08-17 15:43:08 +02:00
Ian Gilman
23b955c6b4 Updated with improved API 2016-08-10 10:35:08 -07:00
Ian Gilman
03b2a86a9d Merge branch 'master' into loaded 2016-08-10 09:49:59 -07:00
VoidVolker
2bcc1aa0f4 [=] Wrap fix for #555
1. Fix for horizontal and vertical wrap. Problem was in
`getTileAtPoint`: it was working only for points inside viewer - thanks
to @avandecreme for finding this.
2. Was small bug in not rendering top row and left column - after scroll
there are empty space and need some time for rendering.
2016-07-29 01:33:48 +03:00
plougsgaard
b3a10aca3b Introduce variable iOSDevice that disables 8c4fcc9 when running on an iOS device. 2016-06-17 16:37:30 +02:00
Antoine Vandecreme
352bfbc3a5 Avoid loading clipped out tiles. Fix #889. 2016-05-13 15:18:37 -04:00
Ian Gilman
c5fc9a6922 Merge pull request #934 from avandecreme/fitBounds
Take rotation into account in viewport getBounds and fitBounds methods
2016-05-13 11:21:40 -07:00
Antoine Vandecreme
521e020b9a Viewport getBounds and fitBounds methods now take rotation into account. Fix #924 2016-05-04 22:26:33 -04:00
Antoine Vandecreme
cac7052bf8 Take pixelDensityRatio into account. 2016-04-28 11:26:09 -04:00
Antoine Vandecreme
684029bc79 Optimize sketch canvas clearing and blending. 2016-04-27 11:08:44 -04:00
Antoine Vandecreme
9e68f6c27b Fix home bounds with clipping. Fix #891 2016-04-05 17:51:50 -04:00
Antoine Vandecreme
a52f4cadc5 Fix TiledImage.fitBounds with clipping. 2016-03-24 11:48:29 -04:00
Antoine Vandecreme
3cacc8edcf Add fitBounds option to TiledImage constructor. 2016-03-22 16:41:28 -04:00
Antoine Vandecreme
9c461824b3 Update OpenSeadragon.Placement to be serializable. 2016-03-22 15:50:48 -04:00
Antoine Vandecreme
e4fca14c33 Add TiledImage.fitInBounds method. 2016-03-21 16:11:50 -04:00
Antoine Vandecreme
963986d187 Add missing parenthesis. 2016-02-24 19:53:35 -05:00
Antoine Vandecreme
d18485844d Fix crash and improve tests.. 2016-02-24 19:48:11 -05:00
Antoine Vandecreme
7e3320c167 Fix transparent images clearing the images in backgroumd. Fix #849 2016-02-23 19:37:41 -05:00
Alexey Tikhonov
0737ba1a83 update to new coding style 2016-02-23 20:47:16 +03:00
Alexey Tikhonov
f51658f0af don't draw tiles with opacity 0, see #806 2016-02-23 20:42:21 +03:00
Ian Gilman
f1cdf90653 Added "fully-loaded" event to TiledImage 2016-02-05 09:14:43 -08:00
Antoine Vandecreme
33021ac24f Merge. 2016-01-23 18:49:58 -05:00
Antoine Vandecreme
c639dd5123 Fix edge smoothing with rotation. 2016-01-23 18:40:53 -05:00
Ian Gilman
0a61e160dd Merge pull request #814 from informatics-isi-edu/master
adding setting of globalCompositeOperation for tiledImage
2016-01-21 09:07:29 -08:00
Mei-Hui Su
69cce5770c simplify the checks on compositeOperation 2016-01-20 09:48:15 -08:00
Mei-Hui Su
91ecd80a4f Add check for null compositeOperation option when setting useSketch 2016-01-20 09:14:10 -08:00
Mei-Hui Su
c214e2f0c4 change option compositeOperation default to null instead of 'source-over' 2016-01-19 14:17:52 -08:00
Scott Lewis
404e952711 escape HTML in documentation 2016-01-19 14:23:29 -07:00
Mei-Hui Su
e89d1f4c97 fix couple of typos 2016-01-14 12:42:02 -08:00
Mei-Hui Su
3cfe8ecac2 Merge https://github.com/openseadragon/openseadragon 2016-01-14 12:32:54 -08:00
Mei-Hui Su
087507c823 1) update according to comments from openseadragon's 2016-01-07 12:47:17 -08:00
Mei-Hui Su
ea833a780c Update to allow setting of globalCompositeOperation when
html <canvas> is used to process multiple tiledImages to blend
is a specific way.
(special handling,
   when compositeOperation is 'source-over' and opacity is 1,
   useSketch is false, otherwise useSketch is true
)
Valid values are 'source-atop', 'source-in', 'source-out',
  'destination-over', 'destination-atop', 'destination-in',
  'destination-out', 'lighter', 'copy' or 'xor'
http://www.w3schools.com/tags/canvas_globalcompositeoperation.asp
2016-01-06 07:58:36 -08:00
Antoine Vandecreme
ebbf4ea4a0 Rename scale functions with NoRotate suffix. 2015-12-22 18:19:22 -05:00
Antoine Vandecreme
764d8f6f2c Fix crash in debug mode when tile is missing. 2015-12-16 17:40:28 -05:00
Antoine Vandecreme
52f8ad6aa2 Fix coordinates conversion with rotation. 2015-12-11 19:07:23 -05:00
Petar Petrov
7406727090 Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-11-16 16:44:31 +02:00
Ian Gilman
b3b1a32717 Merge pull request #760 from avandecreme/imagetilesource
Add ImageTileSource. Fix #467
2015-11-11 10:32:09 -08:00
Petar Petrov
7eda39c9a9 fixed edge smoothing to work with clipping and placeholderFillRect - #755 2015-11-05 16:31:13 +02:00
Petar Petrov
515c15bf98 various fixes for edge smoothing - #755 2015-11-05 16:19:56 +02:00
Petar Petrov
8c4fcc9ca9 tile edge smoothing at high zoom - #755 2015-11-04 17:04:50 +02:00
Antoine Vandecreme
37ca9235f8 Avoid using data urls in ImageTileSource. 2015-11-02 19:42:14 -05:00
Ian Gilman
671379e1c3 * Fixed an issue with TiledImage setPosition/setWidth/setHeight not reliably triggering a redraw (#720) 2015-10-29 13:42:45 -07:00
Ian Gilman
0003b1c193 Merge pull request #727 from TMUND/toni
Fixed placeholderFillStyle flicker
2015-09-16 09:34:46 -07:00
Toni Munder
a2ee81d7cb Fixed some code 2015-09-15 20:52:44 -07:00
Ian Gilman
aa83e019fd Changelog for #715 and #725 2015-09-15 10:31:43 -07:00
Toni Munder
484ae63db1 Made some changes to flickering code 2015-09-14 20:45:52 -07:00
Grant Echols
4b3bfcb703 Cleaned up comments and renamed the event as per Ian's request to 'tile-load-failed' 2015-09-14 15:25:30 -06:00
Toni Munder
561d091005 Code for flickering tile 2015-09-13 19:20:34 -07:00
Grant Echols
dd8baa1639 Added 'tile-open-failed' event to notify the app when a tile fails to load.
This can happen when the image has authentication or other restrictions.
2015-09-11 14:25:20 -06:00
Conner Wingard
b687332c9e Fix merge conflict in upstream changelog.txt 2015-07-14 16:46:47 -04:00
Grant Echols
5539487814 Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 15:07:00 -06:00
Grant Echols
9629f47c2c Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 15:06:00 -06:00
Grant Echols
8b71876c37 Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 14:57:15 -06:00
Conner Wingard
827fe4e836 Deprecate TileSource.getTileSize(), add TileSource.getTileWidth() and TileSource.getTileHeight() 2015-06-29 13:42:09 -04:00
Conner Wingard
7e950fda2b Add support for viewing custom tile sources with non-square tiles 2015-06-26 14:17:40 -04:00
Ian Gilman
6ffc81760c Merge pull request #662 from avandecreme/coordinates
Add coordinates conversion methods to TiledImage.
2015-06-19 13:13:12 -07:00
Antoine Vandecreme
584daea732 Doc and test messages fix. 2015-06-11 10:59:32 -04:00
Antoine Vandecreme
d5c431b1cd Integrate Ian's comments. 2015-06-03 14:40:20 -04:00
Antoine Vandecreme
aa021d87c0 Add coordinates conversion methods to TiledImage. 2015-06-02 16:41:37 -04:00
Antoine Vandecreme
be657c0b3d Add getCompletionCallback method. 2015-06-02 12:59:38 -04:00
Antoine Vandecreme
4c1d0f9a4c Fix Ian's comments. 2015-06-02 11:35:59 -04:00
Antoine Vandecreme
eda47e6fc0 Add tile-loaded event. 2015-05-29 15:10:47 -04:00
Antoine Vandecreme
2538f2023c Move tile caching code inside tilecache.js. 2015-05-29 11:49:58 -04:00
Antoine Vandecreme
dd07771415 Fix drawer.clear 2015-04-22 18:30:49 -04:00
Antoine Vandecreme
9d053c545b Fix Ian's comments. 2015-04-20 19:25:36 -04:00
Antoine Vandecreme
44395662d1 Add opacity support. 2015-04-19 16:10:37 -04:00
Philip Giuliani
0d056145a3 💄 Rename to drawRectangle 2015-04-15 18:31:56 +02:00
Philip Giuliani
21d32b59f5 Pass tiledImage and context to the placeholderFillStyle function 2015-04-15 13:32:41 +02:00
Philip Giuliani
6b1580824a Remove contextSaved 2015-04-14 19:43:41 +02:00
Philip Giuliani
6677953d87 Save and restore inside of the drawer 2015-04-13 19:05:23 +02:00
Philip Giuliani
3ce7024e97 Revert to usedClip 2015-04-13 19:02:04 +02:00
Philip Giuliani
f8503bd6ac Add placeholderFillStyle option to tiledImage 2015-04-10 14:31:08 +02:00
Philip Giuliani
5958c50d62 Update tiledImage to use the new function of the drawer 2015-04-09 19:57:55 +02:00
Philip Giuliani
da819ac15a Add possibility to draw gradients and images 2015-04-09 14:25:07 +02:00
Philip Giuliani
4523454ff1 Add option to define the fillStyle of the placeholder 2015-04-09 13:44:55 +02:00
Philip Giuliani
50e46b104e Extract rect calculation 2015-04-08 21:45:38 +02:00
Philip Giuliani
6778533642 Call drawPlaceholder when no tiles are drawn 2015-04-08 20:14:13 +02:00
Ian Gilman
e433863f09 Test for clip feature 2015-03-20 10:09:33 -07:00
Ian Gilman
c27f68640f Docs for clip feature, as well as get and set 2015-03-19 16:38:52 -07:00
Ian Gilman
e1d36ffb14 First version of clip feature 2015-03-18 10:03:44 -07:00
Philip Giuliani
6bf3b8d7d4 Set loading to false when job is aborted 2015-03-03 09:29:31 +01:00
Ian Gilman
1e8731a2ba Merge branch 'collections' into m2
Fixed Conflicts:
	changelog.txt
2015-02-04 09:35:20 -08:00
Wesley Fok
832ba62df0 Remove unneeded $.console.log calls 2015-01-30 16:03:45 -05:00
Wesley Fok
28ddf5a809 Backed out old coordinate translation modifications, moving pixel density check to rendering code 2015-01-30 15:46:52 -05:00
unknown
3402d33088 WIP basic high pixel density support re: openseadragon/openseadragon#541 2015-01-29 11:19:49 -05:00
Ian Gilman
897a237807 Added viewport-change event; fixed spring reset 2015-01-20 11:23:34 -08:00
Ian Gilman
09e494091e More fixes for tiledImage animation 2014-12-02 13:17:56 -08:00
Ian Gilman
6a7f56d858 tiledImage bounds animation now works 2014-12-02 11:44:02 -08:00
Ian Gilman
4e788473b0 image springs start 2014-11-24 17:47:16 -08:00
Ian Gilman
bf9ccd5458 tile-drawing event now includes tiledImage 2014-11-24 13:25:20 -08:00
Ian Gilman
2de44c752d Using "viewport coordinates" instead of "world coordinates" 2014-11-24 11:59:06 -08:00
Ian Gilman
66517dab8d Coordinate conversion rounding errors were causing test breakages; fixed 2014-11-24 11:46:33 -08:00
Ian Gilman
d5c345970c Coordinate conversion functions for TiledImage 2014-11-21 16:32:04 -08:00
Ian Gilman
2336b81618 TiledImage update events now include which tiled image 2014-11-20 16:41:43 -08:00
Ian Gilman
3449ba1961 tiledImage tests 2014-11-18 17:12:15 -08:00
Ian Gilman
1ed80b0d27 Docs and naming changes for collection mode 2014-11-12 16:31:46 -08:00
Ian Gilman
c4c17db045 Supporting collectionTileSize and collectionTileMargin 2014-11-12 15:48:38 -08:00
Ian Gilman
56ddf8c9c3 First steps for collection mode 2014-11-11 17:14:48 -08:00
Ian Gilman
30a1005fb8 Merge branch 'master' into merger
fixed Conflicts:
	src/drawer.js
2014-11-07 17:13:48 -08:00
Ian Gilman
b5a9116a0b Fixed rotation with multiple images 2014-11-05 16:39:35 -08:00
Ian Gilman
a9c9478752 Wraparound now works for images of other widths than 1 2014-11-05 15:24:31 -08:00
Ian Gilman
e52e2fef34 Improved docs 2014-11-05 14:48:37 -08:00
Ian Gilman
8641279890 Better tile caching for duplicate images 2014-11-05 13:48:27 -08:00
Ian Gilman
d346d165f8 Updated documentation 2014-11-04 11:53:39 -08:00
Ian Gilman
2a7f48ef60 Cleanup and docs for margins 2014-10-16 15:19:05 -07:00
Ian Gilman
2d8652046a First stab at margins 2014-10-16 14:00:07 -07:00
Ian Gilman
5a1a41428b Merge branch 'master' into collections
fixed Conflicts:
	src/drawer.js
2014-08-26 11:53:03 -07:00
Ian Gilman
1f13d1f909 Moved update-viewport event 2014-08-19 15:43:36 -07:00
Ian Gilman
8efad6f3a0 Fixed home/constraints for multi-image. 2014-08-18 16:04:49 -07:00
Ian Gilman
2ee59635fa World.getHomeBounds() 2014-08-12 16:04:55 -07:00
Ian Gilman
45b7118732 Further cleanup 2014-08-11 17:04:20 -07:00
Ian Gilman
dbb60c0ab2 Splitting drawer into drawer/tileCache/tiledImage; adding World 2014-08-06 13:48:18 -07:00
Ian Gilman
973ef29d66 Copied drawer.js to tiledImage.js 2014-08-06 13:38:56 -07:00