Skip to content

DPI Override in ElementProperties > PptxUnitHelper #75

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
bekworks wants to merge 2 commits into
base: master
Choose a base branch
from
Open

DPI Override in ElementProperties > PptxUnitHelper #75

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
2b4ed4f
DPI settings
Apr 23, 2021
25237ef
Fixer upper
Apr 23, 2021
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: 24 additions & 8 deletions lib/element-properties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class ElementProperties {
this._y = 0;
this._cx = 0;
this._cy = 0;
this._dpi = 72;
this.options = {};
}

Expand All @@ -16,20 +17,21 @@ class ElementProperties {
this.y(this._y);
this.cx(this._cx);
this.cy(this._cy);
this.dpi(this._dpi);
}

x(val) {
if (arguments.length === 0) {
if (this.properties !== undefined) {
return PptxUnitHelper.toPixels(this.properties['a:off'][0]['$'].x);
return PptxUnitHelper.toPixels(this.properties['a:off'][0]['$'].x, this.properties['a:off'][0]['$'].dpi);
} else {
return this._x;
}
} else {
this._x = val;

if (this.properties !== undefined) {
this.properties['a:off'][0]['$'].x = PptxUnitHelper.fromPixels(val);
this.properties['a:off'][0]['$'].x = PptxUnitHelper.fromPixels(val, this._dpi);
}
}

Expand All @@ -39,15 +41,15 @@ class ElementProperties {
y(val) {
if (arguments.length === 0) {
if (this.properties !== undefined) {
return PptxUnitHelper.toPixels(this.properties['a:off'][0]['$'].y);
return PptxUnitHelper.toPixels(this.properties['a:off'][0]['$'].y, this.properties['a:off'][0]['$'].dpi);
} else {
return this._y;
}
} else {
this._y = val;

if (this.properties !== undefined) {
this.properties['a:off'][0]['$'].y = PptxUnitHelper.fromPixels(val);
this.properties['a:off'][0]['$'].y = PptxUnitHelper.fromPixels(val, this._dpi);
}
}

Expand All @@ -57,15 +59,15 @@ class ElementProperties {
cx(val) {
if (arguments.length === 0) {
if (this.properties !== undefined) {
return PptxUnitHelper.toPixels(this.properties['a:ext'][0]['$'].cx);
return PptxUnitHelper.toPixels(this.properties['a:ext'][0]['$'].cx, this.properties['a:off'][0]['$'].dpi);
} else {
return this._cx;
}
} else {
this._cx = val;

if (this.properties !== undefined) {
this.properties['a:ext'][0]['$'].cx = PptxUnitHelper.fromPixels(val);
this.properties['a:ext'][0]['$'].cx = PptxUnitHelper.fromPixels(val, this._dpi);
}
}

Expand All @@ -75,15 +77,29 @@ class ElementProperties {
cy(val) {
if (arguments.length === 0) {
if (this.properties !== undefined) {
return PptxUnitHelper.toPixels(this.properties['a:ext'][0]['$'].cy);
return PptxUnitHelper.toPixels(this.properties['a:ext'][0]['$'].cy, this.properties['a:off'][0]['$'].dpi);
} else {
return this._cy;
}
} else {
this._cy = val;

if (this.properties !== undefined) {
this.properties['a:ext'][0]['$'].cy = PptxUnitHelper.fromPixels(val);
this.properties['a:ext'][0]['$'].cy = PptxUnitHelper.fromPixels(val, this._dpi);
}
}

return this;
}

dpi(val) {
if (arguments.length === 0) {
return this._dpi;
} else {
this._dpi = val;

if (this.properties !== undefined) {
this.properties['a:off'][0]['$'].dpi = val;
}
}

Expand Down
16 changes: 8 additions & 8 deletions lib/helpers/unit-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ class PptxUnitHelper {
return Math.floor(val * 914400);
}

static fromPoints(val) {
return Math.floor(val * 914400 / 72);
static fromPoints(val, dpi = 72) {
return Math.floor(val * 914400 / dpi);
}

static fromPixels(val) {
return Math.floor(val * 914400 / 72);
static fromPixels(val, dpi = 72) {
return Math.floor(val * 914400 / dpi);
}

static toPixels(val) {
return val * 72 / 914400;
static toPixels(val, dpi = 72) {
return val * dpi / 914400;
}

static toInches(val) {
return val / 914400;
}

static toPoints(val) {
return val / 914400 * 72;
static toPoints(val, dpi = 72) {
return val / 914400 * dpi;
}

static fromCm(val) {
Expand Down