You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2019/10/29 08:53:24 UTC
[incubator-echarts] branch fix-11145 created (now 4ef9779)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch fix-11145
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
at 4ef9779 fix: use axis dim and index as key #11479
This branch includes the following new commits:
new 4ef9779 fix: use axis dim and index as key #11479
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/01: fix: use axis dim and index as key #11479
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-11145
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 4ef97796bfe25a8233abbcf536ae0243ed819a6b
Author: Ovilia <zw...@gmail.com>
AuthorDate: Tue Oct 29 16:51:58 2019 +0800
fix: use axis dim and index as key #11479
---
src/layout/barGrid.js | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/layout/barGrid.js b/src/layout/barGrid.js
index 9ca33c7..069cc25 100644
--- a/src/layout/barGrid.js
+++ b/src/layout/barGrid.js
@@ -89,21 +89,22 @@ export function prepareLayoutBarSeries(seriesType, ecModel) {
/**
- * Map from axis.index to min gap of two adjacent values.
+ * Map from (baseAxis.dim + '_' + baseAxis.index) to min gap of two adjacent
+ * values.
* This works for time axes, value axes, and log axes.
* For a single time axis, return value is in the form like
- * [[1000000]].
+ * {'x_0': [1000000]}.
* The value of 1000000 is in milliseconds.
*/
function getValueAxesMinGaps(barSeries) {
/**
* Map from axis.index to values.
* For a single time axis, axisValues is in the form like
- * [[1495555200000, 1495641600000, 1495728000000]].
+ * {'x_0': [1495555200000, 1495641600000, 1495728000000]}.
* Items in axisValues[x], e.g. 1495555200000, are time values of all
* series.
*/
- var axisValues = [];
+ var axisValues = {};
zrUtil.each(barSeries, function (seriesModel) {
var cartesian = seriesModel.coordinateSystem;
var baseAxis = cartesian.getBaseAxis();
@@ -112,39 +113,41 @@ function getValueAxesMinGaps(barSeries) {
}
var data = seriesModel.getData();
- var axisId = baseAxis.index;
+ var key = baseAxis.dim + '_' + baseAxis.index;
+ var dim = data.mapDimension(baseAxis.dim);
for (var i = 0, cnt = data.count(); i < cnt; ++i) {
- var value = data.get(baseAxis.dim, i);
- if (!axisValues[axisId]) {
+ var value = data.get(dim, i);
+ if (!axisValues[key]) {
// No previous data for the axis
- axisValues[axisId] = [value];
+ axisValues[key] = [value];
}
else {
// No value in previous series
- axisValues[axisId].push(value);
+ axisValues[key].push(value);
}
// Ignore duplicated time values in the same axis
}
});
var axisMinGaps = [];
- for (var i = 0; i < axisValues.length; ++i) {
- if (axisValues[i]) {
+ for (var i in axisValues) {
+ var valuesInAxis = axisValues[i];
+ if (valuesInAxis) {
// Sort axis values into ascending order to calculate gaps
- axisValues[i].sort(function (a, b) {
+ valuesInAxis.sort(function (a, b) {
return a - b;
});
- var min = Number.MAX_VALUE;
- for (var j = 1; j < axisValues[i].length; ++j) {
- var delta = axisValues[i][j] - axisValues[i][j - 1];
+ var min = null;
+ for (var j = 1; j < valuesInAxis.length; ++j) {
+ var delta = valuesInAxis[j] - valuesInAxis[j - 1];
if (delta > 0) {
// Ignore 0 delta because they are of the same axis value
- min = Math.min(min, delta);
+ min = min === null ? delta : Math.min(min, delta);
}
}
// Set to null if only have one data
- axisMinGaps[i] = min === Number.MAX_VALUE ? null : min;
+ axisMinGaps[i] = min;
}
}
return axisMinGaps;
@@ -164,7 +167,8 @@ export function makeColumnLayout(barSeries) {
bandWidth = baseAxis.getBandWidth();
}
else if (baseAxis.type === 'value' || baseAxis.type === 'time') {
- var minGap = axisMinGaps[baseAxis.index];
+ var key = baseAxis.dim + '_' + baseAxis.index;
+ var minGap = axisMinGaps[key];
var extentSpan = Math.abs(axisExtent[1] - axisExtent[0]);
var scale = baseAxis.scale.getExtent();
var scaleSpan = Math.abs(scale[1] - scale[0]);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org