Skip to content

Commit

Permalink
Merge pull request #6749 from d-rudolf/master
Browse files Browse the repository at this point in the history 
boxplot whisker fix
  • Loading branch information
@100pah
100pah committed Oct 12, 2017
2 parents 2a386b7 + 0df3a46 commit 8475db1
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 114 deletions.
26 changes: 23 additions & 3 deletions extension/dataTool/prepareBoxplotData.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,33 @@ define(function (require) {
var Q2 = quantile(ascList, 0.5);
var Q3 = quantile(ascList, 0.75);
var IQR = Q3 - Q1;
var whiskerMin = Q1 - (boundIQR == null ? 1.5 : boundIQR) * IQR;
var whiskerMax = Q3 + (boundIQR == null ? 1.5 : boundIQR) * IQR;

var low = boundIQR === 'none'
? ascList[0]
: Q1 - (boundIQR == null ? 1.5 : boundIQR) * IQR;
: getWhiskerMin();

var high = boundIQR === 'none'
? ascList[ascList.length - 1]
: Q3 + (boundIQR == null ? 1.5 : boundIQR) * IQR;
: getWhiskerMax();


function getWhiskerMin(){
var diffList = ascList.map(function (dataPoint){
return Math.abs(dataPoint - whiskerMin);});
var minValue = Math.min.apply(null, diffList);
var minArg = diffList.indexOf(minValue);
return ascList[minArg]
}

function getWhiskerMax(){
var diffList = ascList.map(function (dataPoint){
return Math.abs(whiskerMax - dataPoint);});
var maxValue = Math.min.apply(null, diffList);
var maxArg = diffList.indexOf(maxValue);
return ascList[maxArg]
}

boxData.push([low, Q1, Q2, Q3, high]);

Expand All @@ -60,4 +80,4 @@ define(function (require) {
};
};

});
});
188 changes: 77 additions & 111 deletions test/boxplot.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
'echarts/component/grid',
'echarts/component/tooltip',
'zrender/vml/vml'
], function (echarts, rawData, prepareBoxplotData, env) {
],
function (echarts, rawData, prepareBoxplotData, env) {

chart = echarts.init(document.getElementById('main'), null, {
renderer: 'canvas'
Expand All @@ -53,10 +54,15 @@
initControlPanel(env);

function update(layout) {

var rawData = [[850, 740, 900, 1070, 930, 850, 950, 980, 980, 880, 1000, 980, 930, 650, 760, 810, 1000, 1000, 960, 960],
[960, 940, 960, 940, 880, 800, 850, 880, 900, 840, 830, 790, 810, 880, 880, 830, 800, 790, 760, 800],
[880, 880, 880, 860, 720, 720, 620, 860, 970, 950, 880, 910, 850, 870, 840, 840, 850, 840, 840, 840],
[890, 810, 810, 820, 800, 770, 760, 740, 750, 760, 910, 920, 890, 860, 880, 720, 840, 850, 850, 780],
[890, 840, 780, 810, 760, 810, 790, 810, 820, 850, 870, 870, 810, 740, 810, 940, 950, 800, 810, 870]]
data = prepareBoxplotData(rawData, {
layout: layout
});
console.log(data)
mean = calculateMean(rawData);

var categoryAxis = {
Expand All @@ -82,120 +88,80 @@
}
};


chart.setOption({
title: [
{
text: 'Michelson-Morley Experiment',
left: 'center'
},
{
text: 'upper: Q3 + 1.5 * IRQ \nlower: Q1 - 1.5 * IRQ',
borderColor: '#999',
borderWidth: 1,
textStyle: {
fontSize: 14
},
left: '10%',
top: '90%'
}
],
legend: {
data: ['line', 'line2', 'line3']
title: [
{
text: 'Michelson-Morley Experiment',
left: 'center',
},
tooltip: {
trigger: 'item',
axisPointer: {
type: 'shadow'
}
},
grid: {
{
text: 'upper: Q3 + 1.5 * IRQ \nlower: Q1 - 1.5 * IRQ',
borderColor: '#999',
borderWidth: 1,
textStyle: {
fontSize: 14
},
left: '10%',
right: '10%',
bottom: '15%'
top: '90%'
}
],
tooltip: {
trigger: 'item',
axisPointer: {
type: 'shadow'
}
},
grid: {
left: '10%',
right: '10%',
bottom: '15%'
},
xAxis: {
type: 'category',
data: data.axisData,
boundaryGap: true,
nameGap: 30,
splitArea: {
show: false
},
xAxis: layout === 'horizontal' ? categoryAxis : valueAxis,
yAxis: layout === 'vertical' ? categoryAxis : valueAxis,
series: [
{
name: 'boxplot',
type: 'boxplot',
data: data.boxData,

markPoint: {
data: [
{
name: '某个坐标',
coord: [2, 300]
},
{
name: '某个屏幕坐标',
x: 100,
y: 200,
label: {
normal: {
show: false,
formatter: 'asdf'
},
emphasis: {
show: true,
position: 'top',
formatter: 'zxcv'
}
}
},
{
name: 'max value (default)',
type: 'max'
},
{
name: 'min value (default)',
type: 'min'
},
{
name: 'max value (dim:Q1)',
type: 'max',
valueDim: 'Q1'
},
{
name: 'average value (dim:Q1)',
type: 'average',
valueDim: 'Q1'
}
]
},

markLine: {
data: [
[
{name: '两个坐标之间的标线', coord: [1, 240]},
{coord: [2, 260]}
],
[
{name: '两个屏幕坐标之间的标线', x: 50, y: 60},
{x: 70, y: 90}
],
[
{name: 'max - min', type: 'max'},
{type: 'min'}
],
{
name: 'min line',
type: 'min'
},
{
name: 'max line on dim:Q3',
type: 'max',
valueDim: 'Q3'
}
]
axisLabel: {
formatter: 'expr {value}'
},
splitLine: {
show: false
}
},
yAxis: {
type: 'value',
name: 'km/s minus 299,000',
splitArea: {
show: true
}
},
series: [
{
name: 'boxplot',
type: 'boxplot',
data: data.boxData,
tooltip: {
formatter: function (param) {
return [
'Experiment ' + param.name + ': ',
'upper: ' + param.data[5],
'Q3: ' + param.data[4],
'median: ' + param.data[3],
'Q1: ' + param.data[2],
'lower: ' + param.data[1]
].join('<br/>')
}

},
{
name: 'outlier',
type: 'scatter',
data: data.outliers
}
},
{
name: 'outlier',
type: 'scatter',
data: data.outliers
}
]
});
}
Expand Down Expand Up @@ -237,4 +203,4 @@

</script>
</body>
</html>
</html>

0 comments on commit 8475db1

Please sign in to comment.