mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-29 00:26:10 +03:00
Code Issues Projects Releases Wiki Activity

Consistent height for pages (m2)

Browse Source
This commit is contained in:
Ian Gilman 2015-01-13 16:15:40 -08:00
parent e37564e58c
commit 0c63f35de1
2 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/demo/m2/README.md
View File

@ -1,6 +1,5 @@
# To Do # To Do
* Consistent height for all pages (rather than width)
* Make sure adjacent pages aren't visible * Make sure adjacent pages aren't visible
* Thumbs hover and active state (SVG overlay?) * Thumbs hover and active state (SVG overlay?)
* Resize on window resize * Resize on window resize

73
test/demo/m2/js/main.js
View File

@ -327,6 +327,7 @@
if (this.mode === 'thumbs') { if (this.mode === 'thumbs') {
layoutConfig.columns = Math.floor(viewerWidth / 150); layoutConfig.columns = Math.floor(viewerWidth / 150);
layoutConfig.buffer = this.bigBuffer; layoutConfig.buffer = this.bigBuffer;
layoutConfig.sameWidth = true;
} else if (this.mode === 'scroll') { } else if (this.mode === 'scroll') {
layoutConfig.buffer = this.pageBuffer; layoutConfig.buffer = this.pageBuffer;
} else if (this.mode === 'book') { } else if (this.mode === 'book') {
@ -344,43 +345,58 @@
var count = this.viewer.world.getItemCount(); var count = this.viewer.world.getItemCount();
var x = 0; var x = 0;
var y = 0; var y = 0;
var points = []; var offset = new OpenSeadragon.Point();
var rowHeight = 0;
var item; var item, box;
for (var i = 0; i < count; i++) { for (var i = 0; i < count; i++) {
item = this.viewer.world.getItemAt(i);
points.push(new OpenSeadragon.Point(x, y));
if (layoutConfig.columns && i % layoutConfig.columns === layoutConfig.columns - 1) {
x = 0;
y += item.getBounds().height + layoutConfig.buffer;
} else {
if (!layoutConfig.book || i % 2 === 0) {
x += layoutConfig.buffer;
}
x += 1;
}
}
var tl = this.viewer.world.getItemAt(this.page).getBounds().getTopLeft();
var offset = tl.minus(points[this.page]);
var box, pos;
for (i = 0; i < count; i++) {
item = this.viewer.world.getItemAt(i); item = this.viewer.world.getItemAt(i);
box = item.getBounds(); box = item.getBounds();
pos = points[i].plus(offset);
box.x = pos.x; if (i === this.page) {
box.y = pos.y; offset = box.getTopLeft().minus(new OpenSeadragon.Point(x, y));
}
box.x = x;
box.y = y;
if (layoutConfig.sameWidth) {
box.height = box.height / box.width;
box.width = 1;
} else {
box.width = box.width / box.height;
box.height = 1;
}
rowHeight = Math.max(rowHeight, box.height);
layout.specs.push({ layout.specs.push({
item: item, item: item,
bounds: box bounds: box
}); });
if (layout.bounds) { if (layoutConfig.columns && i % layoutConfig.columns === layoutConfig.columns - 1) {
layout.bounds = layout.bounds.union(box); x = 0;
y += rowHeight + layoutConfig.buffer;
rowHeight = 0;
} else { } else {
layout.bounds = box.clone(); if (!layoutConfig.book || i % 2 === 0) {
x += layoutConfig.buffer;
}
x += box.width;
}
}
var pos, spec;
for (i = 0; i < count; i++) {
spec = layout.specs[i];
pos = spec.bounds.getTopLeft().plus(offset);
spec.bounds.x = pos.x;
spec.bounds.y = pos.y;
if (layout.bounds) {
layout.bounds = layout.bounds.union(spec.bounds);
} else {
layout.bounds = spec.bounds.clone();
} }
} }
@ -394,6 +410,7 @@
for (var i = 0; i < layout.specs.length; i++) { for (var i = 0; i < layout.specs.length; i++) {
spec = layout.specs[i]; spec = layout.specs[i];
spec.item.setPosition(spec.bounds.getTopLeft()); spec.item.setPosition(spec.bounds.getTopLeft());
spec.item.setWidth(spec.bounds.width);
} }
}, },