DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 13:00:08 +00:00
Code

clean js; all position are now in scaled coordiante system

Browse Source
This commit is contained in:
Lu Wang 2013-11-16 06:52:29 +08:00
parent 6e61ee5d19
commit 920b693a06
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
share/pdf2htmlEX.js.in
View File

@ -244,6 +244,7 @@ function Viewer(config) {
Viewer.prototype = { Viewer.prototype = {
scale : 1, scale : 1,
// index of the active page (most visible one)
cur_page_idx : 0, cur_page_idx : 0,
init_before_loading_content : function() { init_before_loading_content : function() {
@ -656,13 +657,13 @@ Viewer.prototype = {
fit_width : function () { fit_width : function () {
var page_idx = this.cur_page_idx; var page_idx = this.cur_page_idx;
this.rescale(this.container.clientWidth / this.pages[page_idx].width(), false); this.rescale(this.container.clientWidth / this.pages[page_idx].width(), false);
this.scroll_to(page_idx, [0,0]); this.scroll_to(page_idx);
}, },
fit_height : function () { fit_height : function () {
var page_idx = this.cur_page_idx; var page_idx = this.cur_page_idx;
this.rescale(this.container.clientHeight / this.pages[page_idx].height(), false); this.rescale(this.container.clientHeight / this.pages[page_idx].height(), false);
this.scroll_to(page_idx, [0,0]); this.scroll_to(page_idx);
}, },
/** /**
* @param{Node} ele * @param{Node} ele
@ -727,21 +728,23 @@ Viewer.prototype = {
// cur_page might be undefined, e.g. from Outline // cur_page might be undefined, e.g. from Outline
var cur_page = src_page || this.pages[this.cur_page_idx]; var cur_page = src_page || this.pages[this.cur_page_idx];
// TODO: view_position is now in scaled coordination system, but we need in unscaled system
var cur_pos = cur_page.view_position(); var cur_pos = cur_page.view_position();
//get the coordinates in default user system
cur_pos = transform(cur_page.ictm, [cur_pos[0], cur_page.height()-cur_pos[1]]); cur_pos = transform(cur_page.ictm, [cur_pos[0], cur_page.height()-cur_pos[1]]);
var pos = [0,0];
var zoom = this.scale; var zoom = this.scale;
var pos = [0,0];
var upside_down = true; var upside_down = true;
var ok = false; var ok = false;
// position specified in `detail` are in the raw coordinate system of the page (unscaled)
var scale = this.scale;
// TODO: fitb* // TODO: fitb*
// TODO: BBox // TODO: BBox
switch(detail[1]) { switch(detail[1]) {
case 'XYZ': case 'XYZ':
pos = [(detail[2] === null) ? cur_pos[0] : detail[2] pos = [ (detail[2] === null) ? cur_pos[0] : detail[2] * scale
,(detail[3] === null) ? cur_pos[1] : detail[3]]; , (detail[3] === null) ? cur_pos[1] : detail[3] * scale ];
zoom = detail[4]; zoom = detail[4];
if ((zoom === null) || (zoom === 0)) if ((zoom === null) || (zoom === 0))
zoom = this.scale; zoom = this.scale;
@ -754,18 +757,18 @@ Viewer.prototype = {
break; break;
case 'FitH': case 'FitH':
case 'FitBH': case 'FitBH':
pos = [0, (detail[2] === null) ? cur_pos[1] : detail[2]]; pos = [0, (detail[2] === null) ? cur_pos[1] : detail[2] * scale];
ok = true; ok = true;
break; break;
case 'FitV': case 'FitV':
case 'FitBV': case 'FitBV':
pos = [(detail[2] === null) ? cur_pos[0] : detail[2], 0]; pos = [(detail[2] === null) ? cur_pos[0] : detail[2] * scale, 0];
ok = true; ok = true;
break; break;
case 'FitR': case 'FitR':
/* locate the top-left corner of the rectangle */ /* locate the top-left corner of the rectangle */
// TODO // TODO
pos = [detail[2], detail[5]]; pos = [detail[2] * scale, detail[5] * scale];
upside_down = false; upside_down = false;
ok = true; ok = true;
break; break;
@ -777,6 +780,7 @@ Viewer.prototype = {
this.rescale(zoom, false); this.rescale(zoom, false);
var self = this; var self = this;
/** /**
* page should of type Page * page should of type Page
@ -785,7 +789,7 @@ Viewer.prototype = {
var transform_and_scroll = function(page) { var transform_and_scroll = function(page) {
pos = transform(page.ctm, pos); pos = transform(page.ctm, pos);
if (upside_down) { if (upside_down) {
pos[1] = page.original_height - pos[1]; pos[1] = page.height() - pos[1];
} }
self.scroll_to(target_page_idx, pos); self.scroll_to(target_page_idx, pos);
}; };
@ -799,13 +803,13 @@ Viewer.prototype = {
this.load_page(target_page_idx, undefined, transform_and_scroll); this.load_page(target_page_idx, undefined, transform_and_scroll);
// In the meantime page gets loaded, scroll approximately position for maximum responsiveness. // In the meantime page gets loaded, scroll approximately position for maximum responsiveness.
this.scroll_to(target_page_idx, [0,0]); this.scroll_to(target_page_idx);
} }
}, },
/** /**
* @param{number} page_idx * @param{number} page_idx
* @param{Array.<number>=} pos [x,y] in UNSCALED COORDINATION, where (0,0) is the top-left corner * @param{Array.<number>=} pos [x,y] where (0,0) is the top-left corner
*/ */
scroll_to : function(page_idx, pos) { scroll_to : function(page_idx, pos) {
var pl = this.pages; var pl = this.pages;
@ -817,9 +821,8 @@ Viewer.prototype = {
pos = [0,0]; pos = [0,0];
var container = this.container; var container = this.container;
var scale = this.scale; container.scrollLeft += pos[0] - cur_target_pos[0];
container.scrollLeft += pos[0] * scale - cur_target_pos[0]; container.scrollTop += pos[1] - cur_target_pos[1];
container.scrollTop += pos[1] * scale - cur_target_pos[1];
} }
}; };