Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Another visualization for negative values (bar) #183

Closed
wants to merge 2 commits into from
Closed

Another visualization for negative values (bar) #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ede22c8
Thousand Separator
Jul 3, 2013
dc4c75c
Negative values
Jul 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 41 additions & 5 deletions Chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ window.Chart = function(context){
ctx.stroke();

if (config.scaleShowLabels){
ctx.fillText(calculatedScale.labels[j],yAxisPosX-8,xAxisPosY - ((j+1) * scaleHop));
ctx.fillText(thousand_separator(calculatedScale.labels[j]),yAxisPosX-8,xAxisPosY - ((j+1) * scaleHop));
}
}

Expand Down Expand Up @@ -1042,7 +1042,15 @@ window.Chart = function(context){

scaleHop = Math.floor(scaleHeight/calculatedScale.steps);
calculateXAxisSize();
animationLoop(config,drawScale,drawBars,ctx);

var zeroY = 0;
if (valueBounds.minValue < 0) {
var zeroY = calculateOffset(0,calculatedScale,scaleHop);
}


animationLoop(config,drawScale,drawBars,ctx);


function drawBars(animPc){
ctx.lineWidth = config.barStrokeWidth;
Expand All @@ -1053,10 +1061,10 @@ window.Chart = function(context){
var barOffset = yAxisPosX + config.barValueSpacing + valueHop*j + barWidth*i + config.barDatasetSpacing*i + config.barStrokeWidth*i;

ctx.beginPath();
ctx.moveTo(barOffset, xAxisPosY);
ctx.moveTo(barOffset, xAxisPosY-zeroY);
ctx.lineTo(barOffset, xAxisPosY - animPc*calculateOffset(data.datasets[i].data[j],calculatedScale,scaleHop)+(config.barStrokeWidth/2));
ctx.lineTo(barOffset + barWidth, xAxisPosY - animPc*calculateOffset(data.datasets[i].data[j],calculatedScale,scaleHop)+(config.barStrokeWidth/2));
ctx.lineTo(barOffset + barWidth, xAxisPosY);
ctx.lineTo(barOffset + barWidth, xAxisPosY-zeroY);
if(config.barShowStroke){
ctx.stroke();
}
Expand All @@ -1075,6 +1083,7 @@ window.Chart = function(context){
ctx.lineTo(width-(widestXLabel/2)-xAxisLength-5,xAxisPosY);
ctx.stroke();



if (rotateLabels > 0){
ctx.save();
Expand Down Expand Up @@ -1106,7 +1115,7 @@ window.Chart = function(context){
ctx.lineTo(yAxisPosX + (i+1) * valueHop, 5);
ctx.stroke();
}

//Y axis
ctx.lineWidth = config.scaleLineWidth;
ctx.strokeStyle = config.scaleLineColor;
Expand Down Expand Up @@ -1135,6 +1144,15 @@ window.Chart = function(context){
}
}

if (zeroY != 0) {
ctx.strokeStyle = '#aaa';
ctx.lineWidth = 1;
ctx.beginPath();
ctx.moveTo(yAxisPosX, xAxisPosY-zeroY);
ctx.lineTo(yAxisPosX+xAxisLength, xAxisPosY-zeroY);
ctx.stroke();
}


}
function calculateXAxisSize(){
Expand Down Expand Up @@ -1421,6 +1439,24 @@ window.Chart = function(context){
// Provide some basic currying to the user
return data ? fn( data ) : fn;
};

function thousand_separator(input) {
var number = input.split('.');
num = number[0];
num = num.split("").reverse().join("");
var numpoint = '';
for (var i = 0; i < num.length; i++) {
numpoint += num.substr(i,1);
if (((i+1)%3 == 0) && i != num.length-1) {
numpoint += ',';
}
}
num = numpoint.split("").reverse().join("");
if (number[1] != undefined) {
num = num+'.'+number[1];
}
return num;
}
}


2 changes: 1 addition & 1 deletion samples/bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{
fillColor : "rgba(151,187,205,0.5)",
strokeColor : "rgba(151,187,205,1)",
data : [28,48,40,19,96,27,100]
data : [-28,48,-40,19,96,27,100]
}
]

Expand Down