Skip to content

fix: axis formatting depended on initial values or changes #1541

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

Merged
maartenbreddels merged 1 commit into from
Apr 11, 2023
Merged

fix: axis formatting depended on initial values or changes #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 27 additions & 40 deletions js/src/Axis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,14 @@ export class Axis extends WidgetView {

Promise.all([scale_promise, offset_promise]).then(() => {
this.create_listeners();
this.tick_format = this.generate_tick_formatter();
this.create_axis();
this.set_scales_range();
this.update_scales();
this.set_tick_values();
this.tickformat_changed();
this.append_axis();
});
}

create_listeners() {
// Creates all event listeners

Expand Down Expand Up @@ -125,7 +127,10 @@ export class Axis extends WidgetView {

update_display() {
this.g_axisline.remove();
this.create_axis();
this.set_tick_values();
this.set_scales_range();
this.tickformat_changed();
this.append_axis();
}

Expand Down Expand Up @@ -194,16 +199,6 @@ export class Axis extends WidgetView {
this.axis.tickValues(this.axis_scale.scale.ticks());
}
}
if (
this.model.get('tick_format') === null ||
this.model.get('tick_format') === undefined
) {
if (!isOrdinalScale(this.axis_scale)) {
this.tick_format = this.guess_tick_format(this.axis.tickValues());
}
}
this.axis.tickFormat(this.tick_format);

if (this.g_axisline) {
this.g_axisline
.transition('set_tick_values')
Expand Down Expand Up @@ -231,9 +226,11 @@ export class Axis extends WidgetView {

apply_tick_styling() {
// Applies current tick styling to all displayed ticks
const tickText = this.g_axisline.selectAll('.tick text');
applyStyles(tickText, this.model.get('tick_style'));
tickText.attr('transform', this.get_tick_transforms());
if (this.g_axisline) {
const tickText = this.g_axisline.selectAll('.tick text');
applyStyles(tickText, this.model.get('tick_style'));
tickText.attr('transform', this.get_tick_transforms());
}
}

get_tick_transforms() {
Expand Down Expand Up @@ -367,7 +364,6 @@ export class Axis extends WidgetView {
}

append_axis() {
this.create_axis();
this.update_scales();

// Create initial SVG element
Expand All @@ -386,7 +382,6 @@ export class Axis extends WidgetView {
applyAttrs(lineText, this.get_label_attributes());

// Apply custom settings
this.set_tick_values();
this.update_grid_lines();
this.update_color();
this.apply_tick_styling();
Expand Down Expand Up @@ -682,6 +677,7 @@ export class Axis extends WidgetView {
//animate axis and grid lines on domain changes
const animate = true;
this.set_tick_values(animate);
this.tickformat_changed();
this.update_grid_lines(animate);
}

Expand Down Expand Up @@ -860,14 +856,11 @@ export class Axis extends WidgetView {
};
}

_linear_scale_precision(ticks?: any[]): number {
_linear_scale_precision(): number {
if (!(isLinearScale(this.axis_scale) || isColorScale(this.axis_scale))) {
return -1;
}
ticks =
ticks === undefined || ticks === null
? this.axis_scale.scale.ticks()
: ticks;
let ticks: any[] = this.axis.tickValues();
// Case where all data is concentrated into one point.
if (ticks.length === 1) {
return 1;
Expand Down Expand Up @@ -898,19 +891,16 @@ export class Axis extends WidgetView {
}
}

linear_sc_format(ticks?: any[]) {
return this.get_format_func(this._linear_scale_precision(ticks));
linear_sc_format() {
return this.get_format_func(this._linear_scale_precision());
}

date_sc_format(ticks?: any[]) {
date_sc_format() {
// assumes that scale is a linear date scale
if (!isDateScale(this.axis_scale)) {
return;
}
ticks =
ticks === undefined || ticks === null
? this.axis_scale.scale.ticks()
: ticks;
let ticks: any[] = this.axis.tickValues();
// diff is the difference between ticks in milliseconds
const diff = Math.abs(ticks[1] - ticks[0]);

Expand Down Expand Up @@ -981,18 +971,15 @@ export class Axis extends WidgetView {
};
}

log_sc_format(ticks?: any[]) {
return this.get_format_func(this._log_sc_precision(ticks));
log_sc_format() {
return this.get_format_func(this._log_sc_precision());
}

_log_sc_precision(ticks?: any[]): number {
_log_sc_precision(): number {
if (!isLogScale(this.axis_scale)) {
return -1;
}
ticks =
ticks === undefined || ticks === null
? this.axis_scale.scale.ticks()
: ticks;
let ticks: any[] = this.axis.tickValues();
const ratio = Math.abs(Math.log10(ticks[1] / ticks[0]));

if (ratio >= 0.301) {
Expand All @@ -1004,16 +991,16 @@ export class Axis extends WidgetView {
}
}

guess_tick_format(ticks?: any[]) {
guess_tick_format() {
if (isDateScale(this.axis_scale) || isDateColorScale(this.axis_scale)) {
return this.date_sc_format(ticks);
return this.date_sc_format();
} else if (
isLinearScale(this.axis_scale) ||
isColorScale(this.axis_scale)
) {
return this.linear_sc_format(ticks);
return this.linear_sc_format();
} else if (isLogScale(this.axis_scale)) {
return this.log_sc_format(ticks);
return this.log_sc_format();
}
}

Expand Down
12 changes: 10 additions & 2 deletions js/src/ColorAxis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class ColorBar extends Axis {
const that = this;
return scale_promise.then(() => {
that.create_listeners();
this.create_axis();
this.set_tick_values();
that.tick_format = that.generate_tick_formatter();
that.set_scales_range();
that.append_axis();
Expand Down Expand Up @@ -70,7 +72,7 @@ class ColorBar extends Axis {
);
}

update_display() {
create_axis(): void {
this.side = this.model.get('side');
this.vertical = this.model.get('orientation') === 'vertical';
if (this.vertical) {
Expand Down Expand Up @@ -104,7 +106,11 @@ class ColorBar extends Axis {
> as d3.AxisScale<d3.AxisDomain>
);
}
}

update_display() {
this.g_axisline.remove();
this.create_axis();
this.g_axisline = this.d3el
.select('#colorBarG' + this.cid)
.append('g')
Expand Down Expand Up @@ -455,7 +461,9 @@ class ColorBar extends Axis {
transform =
'translate(0, ' + (this.side === 'top' ? 0 : this.bar_height) + ')';
}
this.g_axisline.attr('transform', transform).call(this.axis);
if (this.g_axisline) {
this.g_axisline.attr('transform', transform).call(this.axis);
}
}
}

Expand Down