Skip to content

Commit 3601106

Browse files
committed
small fix for boxplot.js, scale.js, etc
1 parent 355e480 commit 3601106

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/core/element/CorePoint.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ const binds = computed(() => {
3131
'stroke-dasharray': parseLinetype(linetype).join(" ") || null,
3232
}
3333
if (d != null) {
34-
let transform = `translate(${x + translateX},${y + translateY})`
35-
if (size != 1) transform += `scale(${size})`
36-
if (angle) transform += `rotate(${angle})`
37-
Object.assign(result, { d, transform })
34+
let transform = [], tslX = x + translateX, tslY = y + translateY
35+
if (tslX !== 0 || tslY !== 0) transform.push(`translate(${tslX},${tslY})`)
36+
if (size != 1) transform.push(`scale(${size})`)
37+
if (angle) transform.push(`rotate(${angle})`)
38+
Object.assign(result, { d, transform: transform.join(' ') || null })
3839
} else {
3940
let transform = (translateX || translateY) ? `translate(${translateX}, ${translateY})` : null
4041
Object.assign(result, { cx: x, cy: y, r: size / 2, transform })

src/core/layer/svg/CoreSvgEllipse.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ const binds = computed(() => {
3232
const disc = Math.sqrt(Math.max(0, tr * tr / 4 - det))
3333
let vbind = {
3434
cx: ch, cy: cv,
35-
rx: 1 / Math.sqrt(tr / 2 + disc), ry: 1 / Math.sqrt(tr / 2 - disc),
36-
angle: -Math.atan2(2 * B, A - C) / 2 * 180 / Math.PI,
35+
rx: 1 / Math.sqrt(tr / 2 + disc) || 0, ry: 1 / Math.sqrt(tr / 2 - disc) || 0,
36+
angle: -Math.atan2(2 * B, A - C) / 2 * 180 / Math.PI || 0,
3737
fill, color, linetype, linewidth, alpha, title,
3838
translateX, translateY,
3939
}

src/js/scale.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function disable_scale({ title, ...etc } = {}) {
7676
}
7777

7878
function palette_scale_hue({
79-
h = [15, 375], c = 100, l = 65, h_start = 0,
79+
h = [15, 375], c = 100, l = 65, h_start = 0, alpha = 1,
8080
direction = 1,
8181
limits, oob = oob_censor,
8282
na_value = "#7f7f7f", null_value = null,
@@ -92,7 +92,7 @@ function palette_scale_hue({
9292
v = this.oob(v, { min: scale_min, max: scale_max })
9393
if (v === null) return null_value
9494
if (isNaN(v)) return na_value
95-
return d3.hcl(h_start + h_min + h_interval * (v - scale_min) / scale_interval * direction, c, l).toString()
95+
return d3.hcl(h_start + h_min + h_interval * (v - scale_min) / scale_interval * direction, c, l, alpha).toString()
9696
})
9797
}
9898
return Object.assign(fn, { title, limits, oob }, etc)
@@ -185,10 +185,11 @@ function palette_scale_gradientn({
185185
}
186186

187187
function palette_scale_auto({
188+
alpha,
188189
limits, oob = oob_censor,
189190
title, ...etc
190191
} = {}) {
191-
let scale_hue = palette_scale_hue(),
192+
let scale_hue = palette_scale_hue({ alpha }),
192193
scale_gradient = palette_scale_gradient()
193194
let fn = function (arr) {
194195
if (arr.level != null) {
@@ -201,12 +202,10 @@ function palette_scale_auto({
201202
}
202203

203204
function palette_scale_dynamic({
204-
discrete, continuous,
205+
discrete = palette_scale_hue(), continuous = palette_scale_gradient(),
205206
limits, oob = oob_censor,
206207
title, ...etc
207208
} = {}) {
208-
discrete ??= palette_scale_hue()
209-
continuous ??= palette_scale_gradient()
210209
let fn = function (arr) {
211210
if (arr.level != null) {
212211
return discrete.call(this, arr)

src/js/stat/boxplot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ export default Object.assign(function (data, { }) {
4747
result[key] = cates.map(x => x.group).map(i => group.categories[i][key])
4848
}
4949
return result
50-
}, { core_attrs: ['x', 'y', 'xnudge', 'ynudge'] })
50+
}, { core_attrs: ['x', 'y', 'width', 'height', 'xnudge', 'ynudge'] })

0 commit comments

Comments
 (0)