|
|
@ -1000,7 +1000,7 @@ |
|
|
|
gF = Math.abs(gMin) + gMax, fA = Math.abs(sA) + eA, |
|
|
|
gF = Math.abs(gMin) + gMax, fA = Math.abs(sA) + eA, |
|
|
|
aTic = (Math.PI) / gF; |
|
|
|
aTic = (Math.PI) / gF; |
|
|
|
d.startAngle = (-1 * (Math.PI / 2)) + (aTic * Math.abs(gMin)); |
|
|
|
d.startAngle = (-1 * (Math.PI / 2)) + (aTic * Math.abs(gMin)); |
|
|
|
d.endAngle = d.startAngle + (aTic * ((d.value > gMax) ? gMax : d.value )); |
|
|
|
d.endAngle = d.startAngle + (aTic * ((d.value > gMax) ? gMax : d.value)); |
|
|
|
} |
|
|
|
} |
|
|
|
return found ? d : null; |
|
|
|
return found ? d : null; |
|
|
|
} |
|
|
|
} |
|
|
@ -1041,7 +1041,7 @@ |
|
|
|
return translate; |
|
|
|
return translate; |
|
|
|
} |
|
|
|
} |
|
|
|
function getArcRatio(d) { |
|
|
|
function getArcRatio(d) { |
|
|
|
var whole = __gauge_style == 'arc' ? Math.PI : (Math.PI * 2); |
|
|
|
var whole = __gauge_style === 'arc' ? Math.PI : (Math.PI * 2); |
|
|
|
return d ? (d.endAngle - d.startAngle) / whole : null; |
|
|
|
return d ? (d.endAngle - d.startAngle) / whole : null; |
|
|
|
} |
|
|
|
} |
|
|
|
function convertToArcData(d) { |
|
|
|
function convertToArcData(d) { |
|
|
@ -2257,13 +2257,13 @@ |
|
|
|
return function (value) { |
|
|
|
return function (value) { |
|
|
|
for (var a = 1; a < levels.length; a++) { |
|
|
|
for (var a = 1; a < levels.length; a++) { |
|
|
|
if (levels[0] === 'percentage' && ((value / __gauge_max) * 100) < levels[a]) { |
|
|
|
if (levels[0] === 'percentage' && ((value / __gauge_max) * 100) < levels[a]) { |
|
|
|
return colors[a-1]; |
|
|
|
return colors[a - 1]; |
|
|
|
} |
|
|
|
} |
|
|
|
if (levels[0] === 'whole' && value < levels[a]) { |
|
|
|
if (levels[0] === 'whole' && value < levels[a]) { |
|
|
|
return colors[a-1]; |
|
|
|
return colors[a - 1]; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return colors[colors.length-1]; |
|
|
|
return colors[colors.length - 1]; |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -2452,8 +2452,8 @@ |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
area = d3.svg.area() |
|
|
|
area = d3.svg.area() |
|
|
|
.x(xx) |
|
|
|
.x(xx) |
|
|
|
.y0(function (d, i) { if (__data_groups.length > 0) { var point = getPoint(d,i); return point[0][1]; } return yScaleGetter(d.id)(0); }) |
|
|
|
.y0(function (d, i) { if (__data_groups.length > 0) { var point = getPoint(d, i); return point[0][1]; } return yScaleGetter(d.id)(0); }) |
|
|
|
.y1(function (d, i) { if (__data_groups.length > 0) { var point = getPoint(d,i); return point[1][1]; } return yScaleGetter(d.id)(d.value); }); |
|
|
|
.y1(function (d, i) { if (__data_groups.length > 0) { var point = getPoint(d, i); return point[1][1]; } return yScaleGetter(d.id)(d.value); }); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return function (d, i) { |
|
|
|
return function (d, i) { |
|
|
@ -2477,7 +2477,7 @@ |
|
|
|
var getPoint = generateGetLinePoint(lineIndices, isSub), |
|
|
|
var getPoint = generateGetLinePoint(lineIndices, isSub), |
|
|
|
yScaleGetter = isSub ? getSubYScale : getYScale, |
|
|
|
yScaleGetter = isSub ? getSubYScale : getYScale, |
|
|
|
xValue = isSub ? subxx : xx, |
|
|
|
xValue = isSub ? subxx : xx, |
|
|
|
yValue = function (d,i) { if (__data_groups.length > 0) { var point = getPoint(d,i); return point[0][1]; } return yScaleGetter(d.id)(d.value); }, |
|
|
|
yValue = function (d, i) { if (__data_groups.length > 0) { var point = getPoint(d, i); return point[0][1]; } return yScaleGetter(d.id)(d.value); }, |
|
|
|
line = d3.svg.line() |
|
|
|
line = d3.svg.line() |
|
|
|
.x(__axis_rotated ? yValue : xValue) |
|
|
|
.x(__axis_rotated ? yValue : xValue) |
|
|
|
.y(__axis_rotated ? xValue : yValue); |
|
|
|
.y(__axis_rotated ? xValue : yValue); |
|
|
@ -2843,13 +2843,13 @@ |
|
|
|
updateLegend(mapToIds(c3.data.targets), {withTransform: false, withTransitionForTransform: false}); |
|
|
|
updateLegend(mapToIds(c3.data.targets), {withTransform: false, withTransitionForTransform: false}); |
|
|
|
|
|
|
|
|
|
|
|
/*-- Main Region --*/ |
|
|
|
/*-- Main Region --*/ |
|
|
|
if (c3.data.targets.length == 0) { |
|
|
|
if (c3.data.targets.length === 0) { |
|
|
|
main.append("text") |
|
|
|
main.append("text") |
|
|
|
.attr("class", CLASS.text) |
|
|
|
.attr("class", CLASS.text) |
|
|
|
.attr("x", (main[0][0].parentNode.width.baseVal.value / 2) - margin.left) |
|
|
|
.attr("x", (main[0][0].parentNode.width.baseVal.value / 2) - margin.left) |
|
|
|
.attr("y", (main[0][0].parentNode.height.baseVal.value / 2) - margin.top) |
|
|
|
.attr("y", (main[0][0].parentNode.height.baseVal.value / 2) - margin.top) |
|
|
|
.attr("text-anchor", "middle") |
|
|
|
.attr("text-anchor", "middle") |
|
|
|
.attr("style", (__data_empty_label_fill ? "fill:"+ __data_empty_label_fill +"; " : "") + (__data_empty_label_size ? "font-size:"+ __data_empty_label_size +"; " : "") ) |
|
|
|
.attr("style", (__data_empty_label_fill ? "fill:" + __data_empty_label_fill + "; " : "") + (__data_empty_label_size ? "font-size:" + __data_empty_label_size + "; " : "")) |
|
|
|
.text(__data_empty_label_text); |
|
|
|
.text(__data_empty_label_text); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -3730,8 +3730,8 @@ |
|
|
|
.attr("transform", "scale(1,1)") |
|
|
|
.attr("transform", "scale(1,1)") |
|
|
|
.attr("d", function (d) { |
|
|
|
.attr("d", function (d) { |
|
|
|
d.value = __gauge_max; |
|
|
|
d.value = __gauge_max; |
|
|
|
d.startAngle = -1*(Math.PI/2); |
|
|
|
d.startAngle = -1 * (Math.PI / 2); |
|
|
|
d.endAngle = Math.PI/2; |
|
|
|
d.endAngle = Math.PI / 2; |
|
|
|
return getArc(d, true); |
|
|
|
return getArc(d, true); |
|
|
|
}); |
|
|
|
}); |
|
|
|
mainArc.exit().transition().duration(durationForExit) |
|
|
|
mainArc.exit().transition().duration(durationForExit) |
|
|
|