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

Add area.zerobased option - #360

pull/373/merge
Masayuki Tanaka 11 years ago
parent
fa669e817c
commit
5b6b5a260d
4 changed files with 38 additions and 4 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. 5
      c3.js
  2. 6
      c3.min.js
  3. 6
      htdocs/index.html
  4. 25
      htdocs/samples/area_zerobased.html

5
c3.js
Unescape View File

@ -257,6 +257,9 @@
__bar_width_ratio = getConfig(['bar', 'width', 'ratio'], 0.6), __bar_width_ratio = getConfig(['bar', 'width', 'ratio'], 0.6),
__bar_zerobased = getConfig(['bar', 'zerobased'], true); __bar_zerobased = getConfig(['bar', 'zerobased'], true);
// area
var __area_zerobased = getConfig(['area', 'zerobased'], true);
// pie // pie
var __pie_label_show = getConfig(['pie', 'label', 'show'], true), var __pie_label_show = getConfig(['pie', 'label', 'show'], true),
__pie_label_format = getConfig(['pie', 'label', 'format']), __pie_label_format = getConfig(['pie', 'label', 'format']),
@ -1261,7 +1264,7 @@
domainLength, padding, padding_top, padding_bottom, domainLength, padding, padding_top, padding_bottom,
center = axisId === 'y2' ? __axis_y2_center : __axis_y_center, center = axisId === 'y2' ? __axis_y2_center : __axis_y_center,
yDomainAbs, lengths, diff, ratio, isAllPositive, isAllNegative, yDomainAbs, lengths, diff, ratio, isAllPositive, isAllNegative,
isZeroBased = (hasBarType(yTargets) && __bar_zerobased) || hasAreaType(yTargets), isZeroBased = (hasBarType(yTargets) && __bar_zerobased) || (hasAreaType(yTargets) && __area_zerobased),
showHorizontalDataLabel = hasDataLabel() && __axis_rotated, showHorizontalDataLabel = hasDataLabel() && __axis_rotated,
showVerticalDataLabel = hasDataLabel() && !__axis_rotated; showVerticalDataLabel = hasDataLabel() && !__axis_rotated;
if (yTargets.length === 0) { // use current domain if target of axisId is none if (yTargets.length === 0) { // use current domain if target of axisId is none

6
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
htdocs/index.html
Unescape View File

@ -319,6 +319,12 @@
Disable zero-based y domain Disable zero-based y domain
</a> </a>
</div> </div>
<div class="col-md-4">
<h3>Area</h3>
<a href="./samples/area_zerobased.html">
Disable zero-based y domain
</a>
</div>
</div> </div>
</div> </div>
</div> </div>

25
htdocs/samples/area_zerobased.html
Unescape View File

@ -0,0 +1,25 @@
<html>
<head>
<link href="/css/c3.css" rel="stylesheet" type="text/css">
</head>
<body>
<div id="chart"></div>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="/js/c3.js"></script>
<script>
var chart = c3.generate({
data: {
columns: [
['data1', 1030, 1200, 1100, 1400, 1150, 1250],
['data2', 2130, 2100, 2140, 2200, 2150, 1850]
],
type: 'area',
},
area: {
zerobased: false
}
});
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save