Skip to content

Commit

Permalink
Fix #3228 (dataZoom erroneously exclude min max value by accuracy pro…
Browse files Browse the repository at this point in the history 
…blem)
  • Loading branch information
@100pah
100pah committed May 18, 2016
1 parent c9fd23f commit a89fd0d
Show file tree
Hide file tree
Showing 5 changed files with 492 additions and 18 deletions.
11 changes: 4 additions & 7 deletions src/component/dataZoom/AxisProxy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,10 @@ define(function(require) {
boundValue, dataExtent, percentExtent, true
);
}
// Avoid rounding error.
// And make sure the window is larger than the original
function round(val) {
return Math[idx === 0 ? 'floor' : 'ceil'](val * 1e12) / 1e12;
}
valueWindow[idx] = round(boundValue);
percentWindow[idx] = round(boundPercent);
// valueWindow[idx] = round(boundValue);
// percentWindow[idx] = round(boundPercent);
valueWindow[idx] = boundValue;
percentWindow[idx] = boundPercent;
});

return {
Expand Down
43 changes: 36 additions & 7 deletions src/util/number.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,48 @@ define(function (require) {
* @return {(number|Array.<number>}
*/
number.linearMap = function (val, domain, range, clamp) {
var subDomain = domain[1] - domain[0];
var subRange = range[1] - range[0];

var sub = domain[1] - domain[0];

if (sub === 0) {
return (range[0] + range[1]) / 2;
if (subDomain === 0) {
return subRange === 0
? range[0]
: (range[0] + range[1]) / 2;
}
var t = (val - domain[0]) / sub;

// Avoid accuracy problem in edge, such as
// 146.39 - 62.83 === 83.55999999999999.
// See echarts/test/ut/spec/util/number.js#linearMap#accuracyError
// It is a little verbose for efficiency considering this method
// is a hotspot.
if (clamp) {
t = Math.min(Math.max(t, 0), 1);
if (subDomain > 0) {
if (val <= domain[0]) {
return range[0];
}
else if (val >= domain[1]) {
return range[1];
}
}
else {
if (val >= domain[0]) {
return range[0];
}
else if (val <= domain[1]) {
return range[1];
}
}
}
else {
if (val === domain[0]) {
return range[0];
}
if (val === domain[1]) {
return range[1];
}
}

return t * (range[1] - range[0]) + range[0];
return (val - domain[0]) / subDomain * subRange + range[0];
};

/**
Expand Down
255 changes: 251 additions & 4 deletions test/dataZoomHighPrecision.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,39 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script src="esl.js"></script>
<script src="config.js"></script>
<link ref="stylesheet" href="reset.css" />
</head>
<body>
<style>
html, body, #main {
width: 100%;
height: 100%;
.split {
line-height: 60px;
height: 60px;
background: #ddd;
text-align: center;
font-weight: bold;
font-size: 20px;
}
.main {
height: 80%;
}
</style>
<div id="info"></div>
<div id="main"></div>

<div class="split">Check toolbox dataZoom normal</div>
<div id="main1" class="main"></div>
<div class="split">y max min should not be excluded, dataZoom label should be accurately right</div>
<div id="main2" class="main"></div>
<div class="split">y max min should not be excluded, dataZoom label should be accurately right</div>
<div id="main3" class="main"></div>








<script>

require([
Expand All @@ -26,7 +49,11 @@
'echarts/component/toolbox'
], function (echarts) {

var chart = echarts.init(document.getElementById('main'));
var main = document.getElementById('main1');
if (!main) {
return;
}
var chart = echarts.init(main);

chart.setOption({
"title": {
Expand Down Expand Up @@ -100,5 +127,225 @@
});

</script>











<script>

require([
'echarts',
'echarts/chart/line',
'echarts/chart/bar',
'echarts/component/legend',
'echarts/component/grid',
'echarts/component/tooltip',
'echarts/component/dataZoom'
], function (echarts) {

var main = document.getElementById('main2');
if (!main) {
return;
}
var chart = echarts.init(main);

var option = {
"title": {
"text": "1个月数据",
"left": "center"
},
"tooltip": {
"trigger": "axis"
},
"dataZoom": [
{
"show": true,
"yAxisIndex": 0,
"filterMode": "empty",
"width": 12,
"handleSize": 8,
labelPrecision: 7,
"showDataShadow": false,
"right": 42
}
],
"legend": [
{
"data": [
"重量"
],
"top": 36,
"left": "center"
}
],
"grid": [
{
"left": 80,
"top": 90,
"right": 58,
"height": 350
}
],
"xAxis": [
{
"boundaryGap": false,
"data": [
"2016-02-17",
"2016-02-18",
"2016-02-19",
"2016-02-20",
"2016-02-21",
"2016-02-22",
"2016-02-23",
"2016-02-24",
"2016-02-25",
"2016-02-26",
"2016-02-27",
"2016-02-28",
"2016-02-29",
"2016-03-01",
"2016-03-02",
"2016-03-03",
"2016-03-04"
]
}
],
"yAxis": [
{
"name": "重量(g)"
}
],
"series": [
{
"type": "line",
"data": [
"241.68",
"12703.10",
"17724.90",
"17722.60",
"12326.70",
"12703.10",
"17724.90",
// "17755.13984",
"17722.60",
"12326.70",
"-290.01",
"-12736.80",
"-12361.40",
"-0.00",
"-290.01",
"-12736.80",
"-8525.49",
"-15918.30"
],
"name": "重量"
}
]
};

chart.setOption(option);
});

</script>






<script>

require([
'echarts',
'echarts/chart/line',
'echarts/chart/bar',
'echarts/component/legend',
'echarts/component/grid',
'echarts/component/tooltip',
'echarts/component/dataZoom'
], function (echarts) {

var main = document.getElementById('main3');
if (!main) {
return;
}
var chart = echarts.init(main);

option = {
"title": {
"text": "1个月温度",
"left": "center"
},
"tooltip": {
"trigger": "axis"
},
"dataZoom": [
{
"show": true,
"yAxisIndex": 0,
//endValue:83.57,
"filterMode": "empty",
labelPrecision: 4,
"showDataShadow": false
}
],
"legend": [
{
"data": [
"温度"
],
"top": 31,
"left": "center"
}
],
"grid": {},
"xAxis": [
{
"data": [
"2015-12-08",
"2015-12-09",
"2015-12-10",
"2015-12-11",
"2015-12-12"
]
}
],
"yAxis": [
{
"name": "温度(℃)"
}
],
"series": [
{
"type": "line",
"data": [
"83.56",
"83.39",
"55.10",
"-5.47",
"-62.83"
],
"name": "温度"
}
]
};

chart.setOption(option);
});


</script>





</body>
</html>
Loading

0 comments on commit a89fd0d

Please sign in to comment.