Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ecomfe/echarts
Browse files Browse the repository at this point in the history
  • Loading branch information
@100pah
100pah committed Jan 20, 2016
2 parents 8c8aa73 + 342515d commit 218a419
Show file tree
Hide file tree
Showing 8 changed files with 199 additions and 123 deletions.
66 changes: 34 additions & 32 deletions src/chart/line/poly.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,24 @@ define(function (require) {
if (smooth > 0) {
var prevIdx = idx - dir;
var nextIdx = idx + dir;
if (dir > 0) {
prevIdx = mathMax(prevIdx, start);
nextIdx = mathMin(nextIdx, allLen - 1);
// Last point
if ((dir > 0 && idx === allLen - 1)
|| (dir <= 0 && idx === 0)
) {
v2Copy(cp1, p);
}
else {
nextIdx = mathMax(nextIdx, 0);
prevIdx = mathMin(prevIdx, start);
}
var prevP = points[prevIdx];
var nextP = points[nextIdx];
// If next data is null
if (isNaN(nextP[0]) || isNaN(nextP[1])) {
nextP = p;
}
var prevP = points[prevIdx];
var nextP = points[nextIdx];
// If next data is null
if (isNaN(nextP[0]) || isNaN(nextP[1])) {
nextP = p;
}

vec2.sub(v, nextP, prevP);

scaleAndAdd(cp1, p, v, -smooth / 2);
vec2.sub(v, nextP, prevP);

scaleAndAdd(cp1, p, v, -smooth / 2);
}
// Smooth constraint
vec2Min(cp0, cp0, smoothMax);
vec2Max(cp0, cp0, smoothMin);
Expand All @@ -80,19 +79,21 @@ define(function (require) {
return k;
}

function getBoundingBox(points) {
function getBoundingBox(points, smoothConstraint) {
var ptMin = [Infinity, Infinity];
var ptMax = [-Infinity, -Infinity];
for (var i = 0; i < points.length; i++) {
var pt = points[i];
if (pt[0] < ptMin[0]) { ptMin[0] = pt[0]; }
if (pt[1] < ptMin[1]) { ptMin[1] = pt[1]; }
if (pt[0] > ptMax[0]) { ptMax[0] = pt[0]; }
if (pt[1] > ptMax[1]) { ptMax[1] = pt[1]; }
if (smoothConstraint) {
for (var i = 0; i < points.length; i++) {
var pt = points[i];
if (pt[0] < ptMin[0]) { ptMin[0] = pt[0]; }
if (pt[1] < ptMin[1]) { ptMin[1] = pt[1]; }
if (pt[0] > ptMax[0]) { ptMax[0] = pt[0]; }
if (pt[1] > ptMax[1]) { ptMax[1] = pt[1]; }
}
}
return {
min: ptMin,
max: ptMax
min: smoothConstraint ? ptMin : ptMax,
max: smoothConstraint ? ptMax : ptMin
};
}

Expand All @@ -105,15 +106,15 @@ define(function (require) {
shape: {
points: [],

smooth: 0
smooth: 0,

smoothConstraint: true
},

style: {
fill: null,

stroke: '#000',

smooth: 0
stroke: '#000'
},

buildPath: function (ctx, shape) {
Expand All @@ -122,7 +123,7 @@ define(function (require) {
var i = 0;
var len = points.length;

var result = getBoundingBox(points);
var result = getBoundingBox(points, shape.smoothConstraint);

while (i < len) {
i += drawSegment(
Expand All @@ -142,7 +143,8 @@ define(function (require) {
// Offset between stacked base points and points
stackedOnPoints: [],
smooth: 0,
stackedOnSmooth: 0
stackedOnSmooth: 0,
smoothConstraint: true
},

buildPath: function (ctx, shape) {
Expand All @@ -151,8 +153,8 @@ define(function (require) {

var i = 0;
var len = points.length;
var bbox = getBoundingBox(points);
var stackedOnBBox = getBoundingBox(stackedOnPoints);
var bbox = getBoundingBox(points, shape.smoothConstraint);
var stackedOnBBox = getBoundingBox(stackedOnPoints, shape.smoothConstraint);
while (i < len) {
var k = drawSegment(
ctx, points, i, len, len,
Expand Down
8 changes: 5 additions & 3 deletions src/chart/sankey/SankeySeries.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ define(function (require) {
},

itemStyle: {
normal: {},
emphasis: {}
normal: {
borderWidth: 1,
borderColor: '#aaa'
}
},

lineStyle: {
Expand All @@ -88,7 +90,7 @@ define(function (require) {
},


// colorEncoded: 'node',
// colorEncoded node

color: ['#9e0142', '#d53e4f', '#f46d43', '#fdae61', '#fee08b','#ffffbf',
'#e6f598', '#abdda4', '#66c2a5', '#3288bd', '#5e4fa2'],
Expand Down
47 changes: 19 additions & 28 deletions src/chart/themeRiver/ThemeRiverSeries.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ define(function (require) {
var completeDimensions = require('../../data/helper/completeDimensions');
var SeriesModel = require('../../model/Series');
var List = require('../../data/List');
var numberUtil = require('../../util/number');
var zrUtil = require('zrender/core/util');
var dataSelectableMixin = require('../helper/dataSelectableMixin');
var formatUtil = require('../../util/format');
var encodeHTML = formatUtil.encodeHTML;
var nest = require('../../util/array/nest');
Expand Down Expand Up @@ -37,15 +35,13 @@ define(function (require) {
this.legendDataProvider = function () {
return this._dataBeforeProcessed;
};
this.updateSelectedMap();
},

/**
* @override
*/
mergeOption: function (newOption) {
this.$superCall('mergeOption', newOption);
this.updateSelectedMap();
},

/**
Expand Down Expand Up @@ -91,7 +87,6 @@ define(function (require) {

for (var i = 0; i < data.length; ++i) {
nameList.push(data[i][DATA_NAME_INDEX]);

if (!nameMap[data[i][DATA_NAME_INDEX]]) {
nameMap[data[i][DATA_NAME_INDEX]] = count++;
}
Expand Down Expand Up @@ -142,13 +137,16 @@ define(function (require) {
.entries(indexArr);

var layerSeries = zrUtil.map(dataByName, function (d) {
return d.values;
return {
name: d.key,
indices: d.values
};
});
return layerSeries;
},

/**
* Get data indexs for show tooltip content.
* Get data indices for show tooltip content.
*
* @param {Array.<string>} dim
* @param {Array.<number>} value
Expand All @@ -170,23 +168,23 @@ define(function (require) {
}

var layerSeries = this.getLayerSeries();
var indexs = [];
var indices = [];
var layerNum = layerSeries.length;

for (var i = 0; i < layerNum; ++i) {
var minDist = Number.MAX_VALUE;
var nearestIdx = -1;
var pointNum = layerSeries[i].length;
var pointNum = layerSeries[i].indices.length;
for (var j = 0; j < pointNum; ++j) {
var dist = Math.abs(data.get(dim[0], layerSeries[i][j]) - value);
var dist = Math.abs(data.get(dim[0], layerSeries[i].indices[j]) - value);
if (dist <= minDist) {
minDist = dist;
nearestIdx = layerSeries[i][j];
nearestIdx = layerSeries[i].indices[j];
}
}
indexs.push(nearestIdx);
indices.push(nearestIdx);
}
return indexs;
return indices;
},

/**
Expand Down Expand Up @@ -228,6 +226,14 @@ define(function (require) {

singleAxisIndex: 0,

animationEasing: 'linear',

// itemStyle: {
// normal: {},
// emphasis: {
// }
// },

label: {
normal: {
margin: 4,
Expand All @@ -242,24 +248,9 @@ define(function (require) {
emphasis: {
show: true
}
},

areaStyle: {
normal: {},
emphasis: {
stroke: '#000'
}
},

lineStyle: {
normal: {},
emphasis: {}
}

}
});

zrUtil.mixin(ThemeRiverSeries, dataSelectableMixin);

return ThemeRiverSeries;
});

0 comments on commit 218a419

Please sign in to comment.