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

Clean up factor range and add factor method #14037

Merged
merged 15 commits into from
Aug 27, 2024
Merged

Clean up factor range and add factor method #14037

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8c0e6a9
Clean up factor range and add factor method
bryevdv Aug 22, 2024
5b36d5d
Merge branch 'branch-3.6' into bv/factor-range-cleanup
bryevdv Aug 23, 2024
bf722c2
remove spurious comment
bryevdv Aug 23, 2024
4252356
formatting
bryevdv Aug 23, 2024
a8493ef
any -> unknown
bryevdv Aug 23, 2024
39b5817
docs comments
bryevdv Aug 23, 2024
1bf9b7a
remove unnecessary internal properties
bryevdv Aug 23, 2024
8bacbdf
fix levels property cruft
bryevdv Aug 23, 2024
59216a8
use switch for range.levels
bryevdv Aug 23, 2024
e6020b7
remove axis offsets cruft
bryevdv Aug 24, 2024
9803309
split off typed FactorMapper
bryevdv Aug 26, 2024
04dbdf4
misc formatting
bryevdv Aug 26, 2024
b5de87c
fix test
bryevdv Aug 26, 2024
fd61143
better error type
bryevdv Aug 27, 2024
9c02df9
don't use .at
bryevdv Aug 27, 2024
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
15 changes: 4 additions & 11 deletions bokehjs/src/lib/models/axes/axis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,9 @@ export class AxisView extends GuideRendererView {

const [sxs, sys] = this.scoords(coords)
const [nx, ny] = this.normals
const [xoff, yoff] = this.offsets

const [nxin, nyin] = [nx * (xoff-tin), ny * (yoff-tin)]
const [nxout, nyout] = [nx * (xoff+tout), ny * (yoff+tout)]
const [nxin, nyin] = [nx * -tin, ny * -tin]
const [nxout, nyout] = [nx * tout, ny * tout]

visuals.set_value(ctx)

Expand All @@ -360,12 +359,11 @@ export class AxisView extends GuideRendererView {
}

const [sxs, sys] = this.scoords(coords)
const [xoff, yoff] = this.offsets

const [nx, ny] = this.normals

const nxd = nx*(xoff + standoff)
const nyd = ny*(yoff + standoff)
const nxd = nx*standoff
const nyd = ny*standoff

const {vertical_align, align} = this.panel.get_label_text_heuristics(orient)
const angle = this.panel.get_label_angle_heuristic(orient)
Expand Down Expand Up @@ -557,11 +555,6 @@ export class AxisView extends GuideRendererView {
}
}

// TODO Remove this.
get offsets(): [number, number] {
return [0, 0]
}

get ranges(): [Range, Range] {
const i = this.dimension
const j = 1 - i
Expand Down
56 changes: 33 additions & 23 deletions bokehjs/src/lib/models/axes/categorical_axis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ export class CategoricalAxisView extends AxisView {
const [range] = this.ranges as [FactorRange, FactorRange]
const [start, end] = this.computed_bounds

if (range.tops == null || range.tops.length < 2 || !this.visuals.separator_line.doit) {
const {factors} = range
const {tops} = range.mapper
if (tops == null || tops.length < 2 || !this.visuals.separator_line.doit) {
return
}

Expand All @@ -46,12 +48,12 @@ export class CategoricalAxisView extends AxisView {
const coords: Coords = [[], []]

let ind = 0
for (let i = 0; i < range.tops.length - 1; i++) {
for (let i = 0; i < tops.length - 1; i++) {
let first: Factor, last: Factor

for (let j = ind; j < range.factors.length; j++) {
if (range.factors[j][0] == range.tops[i+1]) {
[first, last] = [range.factors[j-1], range.factors[j]]
for (let j = ind; j < factors.length; j++) {
if (factors[j][0] == tops[i+1]) {
[first, last] = [factors[j-1], factors[j]]
ind = j
break
}
Expand Down Expand Up @@ -109,22 +111,29 @@ export class CategoricalAxisView extends AxisView {
return map(this.model.formatter.doFormat(ticks, this))
}

if (range.levels == 1) {
const major = ticks.major as L1Factor[]
const labels = format(major)
info.push([labels, coords.major, this.model.major_label_orientation, this.visuals.major_label_text])
} else if (range.levels == 2) {
const major = (ticks.major as L2Factor[]).map((x) => x[1])
const labels = format(major)
info.push([labels, coords.major, this.model.major_label_orientation, this.visuals.major_label_text])
info.push([map(ticks.tops as string[]), coords.tops, this.model.group_label_orientation, this.visuals.group_text])
} else if (range.levels == 3) {
const major = (ticks.major as L3Factor[]).map((x) => x[2])
const labels = format(major)
const mid_labels = ticks.mids.map((x) => x[1])
info.push([labels, coords.major, this.model.major_label_orientation, this.visuals.major_label_text])
info.push([map(mid_labels), coords.mids, this.model.subgroup_label_orientation, this.visuals.subgroup_text])
info.push([map(ticks.tops as string[]), coords.tops, this.model.group_label_orientation, this.visuals.group_text])
switch (range.mapper.levels) {
case 1: {
const major = ticks.major as L1Factor[]
const labels = format(major)
info.push([labels, coords.major, this.model.major_label_orientation, this.visuals.major_label_text])
break
}
case 2: {
const major = (ticks.major as L2Factor[]).map((x) => x[1])
const labels = format(major)
info.push([labels, coords.major, this.model.major_label_orientation, this.visuals.major_label_text])
info.push([map(ticks.tops as L1Factor[]), coords.tops, this.model.group_label_orientation, this.visuals.group_text])
break
}
case 3: {
const major = (ticks.major as L3Factor[]).map((x) => x[2])
const labels = format(major)
const mid_labels = ticks.mids.map((x) => x[1])
info.push([labels, coords.major, this.model.major_label_orientation, this.visuals.major_label_text])
info.push([map(mid_labels), coords.mids, this.model.subgroup_label_orientation, this.visuals.subgroup_text])
info.push([map(ticks.tops as L1Factor[]), coords.tops, this.model.group_label_orientation, this.visuals.group_text])
break
}
}

return info
Expand All @@ -148,12 +157,13 @@ export class CategoricalAxisView extends AxisView {
coords.major[i] = ticks.major as any
coords.major[j] = ticks.major.map(() => this.loc)

if (range.levels == 3) {
const {levels} = range.mapper
if (levels == 3) {
coords.mids[i] = ticks.mids as any
coords.mids[j] = ticks.mids.map(() => this.loc)
}

if (range.levels > 1) {
if (levels > 1) {
coords.tops[i] = ticks.tops as any
coords.tops[j] = ticks.tops.map(() => this.loc)
}
Expand Down
Loading
Loading