playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix min/max for Gauge chart - #536

pull/590/head
Masayuki Tanaka 10 years ago
parent
9ee5464e7c
commit
ee9abc9298
4 changed files with 58 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      c3.js
  2. 2
      c3.min.js
  3. 45
      htdocs/samples/chart_gauge.html
  4. 12
      src/arc.js

12
c3.js
Unescape View File

@ -4174,7 +4174,8 @@
c3_chart_internal_fn.updateAngle = function (d) { c3_chart_internal_fn.updateAngle = function (d) {
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
found = false, index = 0; found = false, index = 0,
gMin = config.gauge_min, gMax = config.gauge_max, gTic, gValue;
$$.pie($$.filterTargetsToShow($$.data.targets)).forEach(function (t) { $$.pie($$.filterTargetsToShow($$.data.targets)).forEach(function (t) {
if (! found && t.data.id === d.data.id) { if (! found && t.data.id === d.data.id) {
found = true; found = true;
@ -4187,11 +4188,10 @@
d.endAngle = d.startAngle; d.endAngle = d.startAngle;
} }
if ($$.isGaugeType(d.data)) { if ($$.isGaugeType(d.data)) {
var gMin = config.gauge_min, gMax = config.gauge_max, gTic = (Math.PI) / (gMax - gMin);
gF = Math.abs(gMin) + gMax, gValue = d.value < gMin ? 0 : d.value < gMax ? d.value - gMin : (gMax - gMin);
aTic = (Math.PI) / gF; d.startAngle = -1 * (Math.PI / 2);
d.startAngle = (-1 * (Math.PI / 2)) + (aTic * Math.abs(gMin)); d.endAngle = d.startAngle + gTic * gValue;
d.endAngle = d.startAngle + (aTic * ((d.value > gMax) ? gMax : d.value));
} }
return found ? d : null; return found ? d : null;
}; };

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

45
htdocs/samples/chart_gauge.html
Unescape View File

@ -4,6 +4,9 @@
</head> </head>
<body> <body>
<div id="chart"></div> <div id="chart"></div>
<div id="chart1"></div>
<div id="chart2"></div>
<div id="chart3"></div>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script> <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="/js/c3.js"></script> <script src="/js/c3.js"></script>
@ -40,6 +43,48 @@
} }
}); });
var chart1 = c3.generate({
bindto: '#chart1',
data: {
columns: [
['data', 75.0]
],
type: 'gauge',
},
gauge: {
min: 50,
max: 100
}
});
var chart2 = c3.generate({
bindto: '#chart2',
data: {
columns: [
['data', 0.0]
],
type: 'gauge',
},
gauge: {
min: -100,
max: 100
}
});
var chart3 = c3.generate({
bindto: '#chart3',
data: {
columns: [
['data', -75.0]
],
type: 'gauge',
},
gauge: {
min: -100,
max: -50
}
});
var cycleDemo = function () { var cycleDemo = function () {
setTimeout(function () { setTimeout(function () {

12
src/arc.js
Unescape View File

@ -26,7 +26,8 @@ c3_chart_internal_fn.updateArc = function () {
c3_chart_internal_fn.updateAngle = function (d) { c3_chart_internal_fn.updateAngle = function (d) {
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
found = false, index = 0; found = false, index = 0,
gMin = config.gauge_min, gMax = config.gauge_max, gTic, gValue;
$$.pie($$.filterTargetsToShow($$.data.targets)).forEach(function (t) { $$.pie($$.filterTargetsToShow($$.data.targets)).forEach(function (t) {
if (! found && t.data.id === d.data.id) { if (! found && t.data.id === d.data.id) {
found = true; found = true;
@ -39,11 +40,10 @@ c3_chart_internal_fn.updateAngle = function (d) {
d.endAngle = d.startAngle; d.endAngle = d.startAngle;
} }
if ($$.isGaugeType(d.data)) { if ($$.isGaugeType(d.data)) {
var gMin = config.gauge_min, gMax = config.gauge_max, gTic = (Math.PI) / (gMax - gMin);
gF = Math.abs(gMin) + gMax, gValue = d.value < gMin ? 0 : d.value < gMax ? d.value - gMin : (gMax - gMin);
aTic = (Math.PI) / gF; d.startAngle = -1 * (Math.PI / 2);
d.startAngle = (-1 * (Math.PI / 2)) + (aTic * Math.abs(gMin)); d.endAngle = d.startAngle + gTic * gValue;
d.endAngle = d.startAngle + (aTic * ((d.value > gMax) ? gMax : d.value));
} }
return found ? d : null; return found ? d : null;
}; };

Write Preview
Loading…
Cancel
Save