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

[stats][boxplot] fix container props calculation #203

Merged
merged 1 commit into from
Nov 29, 2017
Merged

[stats][boxplot] fix container props calculation #203

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
78 changes: 54 additions & 24 deletions packages/vx-stats/src/boxplot/BoxPlot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,16 @@ export default function BoxPlot({
}) {
const offset = horizontal? top: left;
const center = offset + boxWidth / 2;

let maxLinePos = Array(4).fill(0);
let maxToBoxLinePos = Array(4).fill(0);
let boxPos = Array(4).fill(0);
let medianLinePos = Array(4).fill(0);
let minToBoxLinePos = Array(4).fill(0);
let minLinePos = Array(4).fill(0);
let containerPos = Array(4).fill(0);

// all of these are [x0, y0, x1, y1]
maxLinePos[0] = center - boxWidth / 4;
maxLinePos[1] = valueScale(max);
maxLinePos[2] = center + boxWidth / 4;
Expand Down Expand Up @@ -73,6 +77,13 @@ export default function BoxPlot({
minLinePos[1] = valueScale(min);
minLinePos[2] = center + boxWidth / 4;
minLinePos[3] = valueScale(min);

const valueRange = valueScale.range();
containerPos[0] = boxPos[0];
containerPos[1] = Math.min(...valueRange);
containerPos[2] = boxPos[2];
containerPos[3] = Math.abs(valueRange[0] - valueRange[1]);

if (horizontal) {
maxLinePos = verticalToHorizontal(maxLinePos);
maxToBoxLinePos = verticalToHorizontal(maxToBoxLinePos);
Expand All @@ -81,9 +92,33 @@ export default function BoxPlot({
medianLinePos = verticalToHorizontal(medianLinePos);
minToBoxLinePos = verticalToHorizontal(minToBoxLinePos);
minLinePos = verticalToHorizontal(minLinePos);
containerPos = verticalToHorizontal(containerPos);
containerPos[0] = Math.min(...valueRange);
}
return (
<Group className={classnames('vx-boxplot', className)}>
{outliers.map((d, i) => {
const cx = horizontal ? valueScale(d) : center;
const cy = horizontal ? center : valueScale(d);
return (
<circle
key={i}
className="vx-boxplot-outlier"
cx={cx}
cy={cy}
stroke={stroke}
strokeWidth={1}
fill={fill}
fillOpacity={fillOpacity}
r="4"
{...additionalProps(outlierProps, {
data: d,
cx,
cy
})}
/>);
})
}
<line
className="vx-boxplot-max"
x1={maxLinePos[0]}
Expand All @@ -97,6 +132,8 @@ export default function BoxPlot({
max,
x1: maxLinePos[0],
x2: maxLinePos[2],
y1: maxLinePos[1],
y2: maxLinePos[3],
})}
/>
<line
Expand All @@ -108,6 +145,7 @@ export default function BoxPlot({
strokeWidth={strokeWidth}
/>
<rect
className="vx-boxplot-box"
x={boxPos[0]}
y={boxPos[1]}
width={boxPos[2]}
Expand All @@ -127,7 +165,9 @@ export default function BoxPlot({
min,
max,
x1: boxPos[0],
x2: boxPos[0] + boxPos[2]
x2: boxPos[0] + boxPos[2],
y1: boxPos[1],
y2: boxPos[1] + boxPos[3],
})}
/>
<line
Expand All @@ -142,7 +182,9 @@ export default function BoxPlot({
data,
median,
x1: medianLinePos[0],
x2: medianLinePos[2]
x2: medianLinePos[2],
y1: medianLinePos[1],
y2: medianLinePos[3],
})}
/>
<line
Expand All @@ -166,35 +208,23 @@ export default function BoxPlot({
min,
x1: minLinePos[0],
x2: minLinePos[2],
y1: minLinePos[1],
y2: minLinePos[3],
})}
/>
{outliers.map((d, i) => {
return (
<circle
key={i}
cx={horizontal?valueScale(d):center}
cy={horizontal?center:valueScale(d)}
strokeWidth={strokeWidth}
fill={fill}
fillOpacity={fillOpacity}
r="5"
{...additionalProps(outlierProps, {
data: d,
})}
/>);
})
}
{container &&
<rect
x={left}
y={max}
width={boxWidth}
height={min - max}
x={containerPos[0]}
y={containerPos[1]}
width={containerPos[2]}
height={containerPos[3]}
fillOpacity="0"
{...additionalProps(containerProps, {
data,
x1: left,
x2: left + boxWidth,
x1: containerPos[0],
x2: containerPos[0] + containerPos[2],
y1: containerPos[1],
y2: containerPos[1] + containerPos[3],
median,
max,
min,
Expand Down