Skip to content

Commit

Permalink
remove rounded corner mixin
Browse files Browse the repository at this point in the history
  • Loading branch information
@ianjennings
ianjennings committed Jul 28, 2017
1 parent b92147d commit 756a2df
Showing 1 changed file with 0 additions and 120 deletions.
120 changes: 0 additions & 120 deletions examples/bar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,126 +20,6 @@

var channel = "c3-bar-test" + Math.random();

// --------------- Overrides to get rounded corner is bar charts ------------------
c3.chart.internal.fn.additionalConfig = {
bar_radiusAll: false,
bar_radius: 5,
tooltip_format_color: undefined

};

c3.chart.internal.fn.isOrderDesc = function () {
var config = this.config;
if(this.isFunction(config.data_order)) {
return false;
}else {
return config.data_order && config.data_order.toLowerCase() === 'desc';
}
};

c3.chart.internal.fn.isOrderAsc = function () {
var config = this.config;
if(this.isFunction(config.data_order)) {
return false;
}else {
return config.data_order && config.data_order.toLowerCase() === 'asc';
}
};

c3.chart.internal.fn.generateDrawBar = function (barIndices, isSub) {
var $$ = this, config = $$.config,
getPoints = $$.generateGetBarPoints(barIndices, isSub);
return function (d, i) {
// 4 points that make a bar
var points = getPoints(d, i),
groups = config.data_groups,
path = '';

// switch points if axis is rotated, not applicable for sub chart
var indexX = config.axis_rotated ? 1 : 0;
var indexY = config.axis_rotated ? 0 : 1;
var bar_radius = config.bar_radius;
var bar_radiusAll = config.bar_radiusAll;
if(groups && groups.length>0) {
var lastGrps = [];
groups.forEach(function(group){
lastGrps.push(group[group.length-1]);
});
//if(points[0][1] < points[1][1] || points[0][0] > points[1][0] ) {
// bar_radius = bar_radius*-1;
//}
if((points[0][1] === points[1][1]) && (points[1][1]=== points[2][1]) && (points[2][1] === points[3][1]) ||
(points[0][0] === points[1][0]) && (points[1][0]=== points[2][0]) && (points[2][0] === points[3][0])){
path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + points[1][indexX] + ',' + (points[1][indexY]) + ' ' +
'L' + (points[2][indexX]) + ',' + points[2][indexY] + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';
return path;
}
if(lastGrps.indexOf(d.id) > -1 && (config.data_order === null)) {
if(config.axis_rotated) {
path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + (points[1][indexX]-bar_radius) + ',' + points[1][indexY] + ' ' +
'Q' + points[1][indexX] + ',' + points[1][indexY] + ' ' + points[1][indexX] + ',' + (points[1][indexY]+bar_radius) + ' ' +
'L' + points[2][indexX] + ',' + (points[2][indexY]-bar_radius) + ' ' +
'Q' + points[2][indexX] + ',' + points[2][indexY] + ' ' + (points[2][indexX]-bar_radius) + ',' + points[2][indexY] + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';
}else {
path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + points[1][indexX] + ',' + (points[1][indexY]+bar_radius) + ' ' +
'Q' + points[1][indexX] + ',' + points[1][indexY] + ' ' + (points[1][indexX]+bar_radius) + ',' + points[1][indexY] + ' ' +
'L' + (points[2][indexX]-bar_radius) + ',' + points[2][indexY] + ' ' +
'Q' + points[2][indexX] + ',' + points[2][indexY] + ' ' + points[2][indexX] + ',' + (points[2][indexY]+bar_radius) + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';
}
}else {
if(bar_radiusAll) {
path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + (points[1][indexX]+bar_radius) + ',' + (points[1][indexY]) + ' ' +
'Q' + points[1][indexX] + ',' + points[1][indexY] + ' ' + (points[1][indexX]) + ',' + (points[1][indexY]+bar_radius) + ' ' +
'L' + (points[2][indexX]) + ',' + (points[2][indexY]-bar_radius) + ' ' +
'Q' + points[2][indexX] + ',' + points[2][indexY] + ' ' + (points[2][indexX]+bar_radius) + ',' + (points[2][indexY]) + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';
}else {
path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + points[1][indexX] + ',' + (points[1][indexY]) + ' ' +
'L' + (points[2][indexX]) + ',' + points[2][indexY] + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';
}
}
}else {
/*path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + points[1][indexX] + ',' + (points[1][indexY]) + ' ' +
'L' + (points[2][indexX]) + ',' + points[2][indexY] + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';*/
if(config.axis_rotated) {
path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + (points[1][indexX]-bar_radius) + ',' + points[1][indexY] + ' ' +
'Q' + points[1][indexX] + ',' + points[1][indexY] + ' ' + points[1][indexX] + ',' + (points[1][indexY]+bar_radius) + ' ' +
'L' + points[2][indexX] + ',' + (points[2][indexY]-bar_radius) + ' ' +
'Q' + points[2][indexX] + ',' + points[2][indexY] + ' ' + (points[2][indexX]-bar_radius) + ',' + points[2][indexY] + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';
}else {
path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + points[1][indexX] + ',' + (points[1][indexY]+bar_radius) + ' ' +
'Q' + points[1][indexX] + ',' + points[1][indexY] + ' ' + (points[1][indexX]+bar_radius) + ',' + points[1][indexY] + ' ' +
'L' + (points[2][indexX]-bar_radius) + ',' + points[2][indexY] + ' ' +
'Q' + points[2][indexX] + ',' + points[2][indexY] + ' ' + points[2][indexX] + ',' + (points[2][indexY]+bar_radius) + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
'z';
}
}
return path;
};
};

eon.chart({
pubnub: pubnub,
channels: [channel],
Expand Down

0 comments on commit 756a2df

Please sign in to comment.