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

Add axis.x.extent option instead of axis.x.default - #512

pull/542/head
Masayuki Tanaka 10 years ago
parent
ad81613558
commit
d9c280a587
7 changed files with 90 additions and 8 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. 6
      c3.js
  2. 4
      c3.min.js
  3. 6
      htdocs/index.html
  4. 76
      htdocs/samples/axes_x_extent.html
  5. 2
      src/config.js
  6. 2
      src/core.js
  7. 2
      src/subchart.js

6
c3.js
Unescape View File

@ -253,7 +253,7 @@
.on("dblclick.zoom", null); .on("dblclick.zoom", null);
// Set default extent if defined // Set default extent if defined
if (config.axis_x_default) { $$.brush.extent($$.getDefaultExtent()); } if (config.axis_x_extent) { $$.brush.extent($$.getDefaultExtent()); }
// Add Axis // Add Axis
$$.initAxis(); $$.initAxis();
@ -956,7 +956,7 @@
axis_x_min: undefined, axis_x_min: undefined,
axis_x_padding: {}, axis_x_padding: {},
axis_x_height: undefined, axis_x_height: undefined,
axis_x_default: undefined, axis_x_extent: undefined,
axis_x_label: {}, axis_x_label: {},
axis_y_show: true, axis_y_show: true,
axis_y_max: undefined, axis_y_max: undefined,
@ -4935,7 +4935,7 @@
}; };
c3_chart_internal_fn.getDefaultExtent = function () { c3_chart_internal_fn.getDefaultExtent = function () {
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
extent = isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default; extent = isFunction(config.axis_x_extent) ? config.axis_x_extent($$.getXDomain($$.data.targets)) : config.axis_x_extent;
if ($$.isTimeSeries()) { if ($$.isTimeSeries()) {
extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])]; extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])];
} }

4
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
htdocs/index.html
Unescape View File

@ -172,6 +172,12 @@
Update y domain automatically Update y domain automatically
</a> </a>
</div> </div>
<div class="col-md-4">
<h3>Default X Extent</h3>
<a href="./samples/axes_x_extent.html">
Set default x extent
</a>
</div>
</div> </div>
</div> </div>
</div> </div>

76
htdocs/samples/axes_x_extent.html
Unescape View File

@ -0,0 +1,76 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="/css/c3.css">
</head>
<body>
<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="/js/c3.js"></script>
<script>
var chart1 = c3.generate({
bindto: '#chart1',
data: {
columns: [
['data1', 100, 200, 50, 300, 400, 290],
['data2', 10, 20, 50, 30, 10, 100],
],
},
axis: {
x: {
extent: [2, 4.5]
}
},
subchart: {
show: true
}
});
var chart2 = c3.generate({
bindto: '#chart2',
data: {
x: 'x',
columns: [
['x', '2014-01-01', '2014-02-01', '2014-03-01', '2014-04-01', '2014-05-01', '2014-06-01'],
['data1', 100, 200, 50, 300, 400, 290],
['data2', 10, 20, 50, 30, 10, 100],
],
},
axis: {
x: {
type: 'timeseries',
extent: ['2014-03-01', '2014-04-20']
}
},
subchart: {
show: true
}
});
var chart3 = c3.generate({
bindto: '#chart3',
data: {
columns: [
['data1', 100, 200, 50, 300, 400, 290],
['data2', 10, 20, 50, 30, 10, 100],
],
},
axis: {
x: {
extent: [1, 4.2]
}
},
zoom: {
enabled: true
},
subchart: {
show: true
}
});
</script>
</body>
</html>

2
src/config.js
Unescape View File

@ -92,7 +92,7 @@ c3_chart_internal_fn.getDefaultConfig = function () {
axis_x_min: undefined, axis_x_min: undefined,
axis_x_padding: {}, axis_x_padding: {},
axis_x_height: undefined, axis_x_height: undefined,
axis_x_default: undefined, axis_x_extent: undefined,
axis_x_label: {}, axis_x_label: {},
axis_y_show: true, axis_y_show: true,
axis_y_max: undefined, axis_y_max: undefined,

2
src/core.js
Unescape View File

@ -248,7 +248,7 @@ c3_chart_internal_fn.initWithData = function (data) {
.on("dblclick.zoom", null); .on("dblclick.zoom", null);
// Set default extent if defined // Set default extent if defined
if (config.axis_x_default) { $$.brush.extent($$.getDefaultExtent()); } if (config.axis_x_extent) { $$.brush.extent($$.getDefaultExtent()); }
// Add Axis // Add Axis
$$.initAxis(); $$.initAxis();

2
src/subchart.js
Unescape View File

@ -183,7 +183,7 @@ c3_chart_internal_fn.transformContext = function (withTransition, transitions) {
}; };
c3_chart_internal_fn.getDefaultExtent = function () { c3_chart_internal_fn.getDefaultExtent = function () {
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
extent = isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default; extent = isFunction(config.axis_x_extent) ? config.axis_x_extent($$.getXDomain($$.data.targets)) : config.axis_x_extent;
if ($$.isTimeSeries()) { if ($$.isTimeSeries()) {
extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])]; extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])];
} }

Write Preview
Loading…
Cancel
Save