Skip to content
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

Jump to bottom

Fixing dumb mistakes in scales.h #343

Merged
merged 2 commits into from
Jul 24, 2020
Merged

Fixing dumb mistakes in scales.h #343

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a84093
fixed broken functions
Oliver-BE Jul 24, 2020
67b4b00
Merge branch 'd3-wrapper' into d3-wrapper-dev-oliver
Oliver-BE Jul 24, 2020
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
12 changes: 6 additions & 6 deletions source/web/d3/scales.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,21 +945,21 @@ namespace D3 {

BandScale & Round(bool val) {
EM_ASM({
emp_d3.objects[$0].round(val);
emp_d3.objects[$0].round($1);
}, this->id, val);
return *this;
}

BandScale & SetInnerPadding(double pad) {
EM_ASM({
emp_d3.objects[$0].paddingInner(pad);
emp_d3.objects[$0].paddingInner($1);
}, this->id, pad);
return *this;
}

BandScale & SetOuterPadding(double pad) {
EM_ASM({
emp_d3.objects[$0].paddingOuter(pad);
emp_d3.objects[$0].paddingOuter($1);
}, this->id, pad);
return *this;
}
Expand All @@ -968,7 +968,7 @@ namespace D3 {
/// If padding is not specified, returns the inner padding.
BandScale & SetPadding(double pad) {
EM_ASM({
emp_d3.objects[$0].padding(pad);
emp_d3.objects[$0].padding($1);
}, this->id, pad);
return *this;
}
Expand Down Expand Up @@ -1001,14 +1001,14 @@ namespace D3 {

PointScale & Round(bool val) {
EM_ASM({
emp_d3.objects[$0].round(val);
emp_d3.objects[$0].round($1);
}, this->id, val);
return *this;
}

PointScale & SetPadding(double pad) {
EM_ASM({
emp_d3.objects[$0].padding(pad);
emp_d3.objects[$0].padding($1);
}, this->id, pad);
return *this;
}
Expand Down