Skip to content

Dev fixbounds #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Dev fixbounds #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
def0574
potential fix for bounds()
ffd8 Nov 12, 2018
c45b94c
Slight fix for page()
ffd8 Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions basil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3365,33 +3365,33 @@ pub.bounds = function (obj) {

return {"width": w,
"height": h,
"left": x1 + currOriginX,
"right": x2 + currOriginX,
"top": y1 + currOriginY,
"bottom": y2 + currOriginY,
"baseline": baseline + currOriginY,
"xHeight": xHeight + currOriginY};
"left": x1 - currOriginX,
"right": x2 - currOriginX,
"top": y1 - currOriginY,
"bottom": y2 - currOriginY,
"baseline": baseline - currOriginY,
"xHeight": xHeight - currOriginY};
} else {
// is it a pageItem?
if (obj.hasOwnProperty("geometricBounds")) {
var geometricBounds = obj.geometricBounds; // [y1, x1, y2, x2]
x1 = geometricBounds[1] + currOriginX;
y1 = geometricBounds[0] + currOriginY;
x2 = geometricBounds[3] + currOriginX;
y2 = geometricBounds[2] + currOriginY;
x1 = geometricBounds[1] - currOriginX;
y1 = geometricBounds[0] - currOriginY;
x2 = geometricBounds[3] - currOriginX;
y2 = geometricBounds[2] - currOriginY;
w = x2 - x1;
h = y2 - y1;
return {"width": w, "height": h, "left": x1, "right": x2, "top": y1, "bottom": y2};
}
// everything else e.g. page, spread
else if (obj.hasOwnProperty("bounds")) {
var bounds = obj.bounds; // [y1, x1, y2, x2]
x1 = bounds[1] + currOriginX;
y1 = bounds[0] + currOriginY;
x2 = bounds[3] + currOriginX;
y2 = bounds[2] + currOriginY;
w = x2 - x1;
h = y2 - y1;
x1 = bounds[1] - currOriginX;
y1 = bounds[0] - currOriginY;
x2 = bounds[3] - currOriginX;
y2 = bounds[2] - currOriginY;
w = x2 - x1 - currOriginX;
h = y2 - y1 - currOriginX;
return {"width": w, "height": h, "left": x1, "right": x2, "top": y1, "bottom": y2};
}
// no idea what that might be, give up
Expand Down
32 changes: 16 additions & 16 deletions src/includes/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,33 +861,33 @@ pub.bounds = function (obj) {

return {"width": w,
"height": h,
"left": x1 + currOriginX,
"right": x2 + currOriginX,
"top": y1 + currOriginY,
"bottom": y2 + currOriginY,
"baseline": baseline + currOriginY,
"xHeight": xHeight + currOriginY};
"left": x1 - currOriginX,
"right": x2 - currOriginX,
"top": y1 - currOriginY,
"bottom": y2 - currOriginY,
"baseline": baseline - currOriginY,
"xHeight": xHeight - currOriginY};
} else {
// is it a pageItem?
if (obj.hasOwnProperty("geometricBounds")) {
var geometricBounds = obj.geometricBounds; // [y1, x1, y2, x2]
x1 = geometricBounds[1] + currOriginX;
y1 = geometricBounds[0] + currOriginY;
x2 = geometricBounds[3] + currOriginX;
y2 = geometricBounds[2] + currOriginY;
x1 = geometricBounds[1] - currOriginX;
y1 = geometricBounds[0] - currOriginY;
x2 = geometricBounds[3] - currOriginX;
y2 = geometricBounds[2] - currOriginY;
w = x2 - x1;
h = y2 - y1;
return {"width": w, "height": h, "left": x1, "right": x2, "top": y1, "bottom": y2};
}
// everything else e.g. page, spread
else if (obj.hasOwnProperty("bounds")) {
var bounds = obj.bounds; // [y1, x1, y2, x2]
x1 = bounds[1] + currOriginX;
y1 = bounds[0] + currOriginY;
x2 = bounds[3] + currOriginX;
y2 = bounds[2] + currOriginY;
w = x2 - x1;
h = y2 - y1;
x1 = bounds[1] - currOriginX;
y1 = bounds[0] - currOriginY;
x2 = bounds[3] - currOriginX;
y2 = bounds[2] - currOriginY;
w = x2 - x1 - currOriginX;
h = y2 - y1 - currOriginX;
return {"width": w, "height": h, "left": x1, "right": x2, "top": y1, "bottom": y2};
}
// no idea what that might be, give up
Expand Down