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

Fix axis.x.default

pull/542/head
Masayuki Tanaka 10 years ago
parent
e30d1df814
commit
50bd61a0ea
6 changed files with 67 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. 6
      c3.min.js
  3. 21
      htdocs/samples/subchart.html
  4. 29
      htdocs/samples/zoom.html
  5. 4
      src/core.js
  6. 8
      src/subchart.js

12
c3.js
Unescape View File

@ -253,9 +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) { if (config.axis_x_default) { $$.brush.extent($$.getDefaultExtent()); }
$$.brush.extent(isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default);
}
// Add Axis // Add Axis
$$.initAxis(); $$.initAxis();
@ -4915,6 +4913,14 @@
$$.context.attr("transform", $$.getTranslate('context')); $$.context.attr("transform", $$.getTranslate('context'));
subXAxis.attr("transform", $$.getTranslate('subx')); subXAxis.attr("transform", $$.getTranslate('subx'));
}; };
c3_chart_internal_fn.getDefaultExtent = function () {
var $$ = this, config = $$.config,
extent = isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default;
if ($$.isTimeSeries()) {
extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])];
}
return extent;
};
c3_chart_internal_fn.initZoom = function () { c3_chart_internal_fn.initZoom = function () {
var $$ = this, d3 = $$.d3, config = $$.config; var $$ = this, d3 = $$.d3, config = $$.config;

6
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
htdocs/samples/subchart.html
Unescape View File

@ -5,6 +5,7 @@
<body> <body>
<div id="chart1"></div> <div id="chart1"></div>
<div id="chart2"></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>
@ -41,6 +42,26 @@
} }
}); });
var chart3 = c3.generate({
bindto: '#chart3',
data: {
columns: [
['data1', 30, 200, 100, 400, 150, 250],
['data2', 50, 20, 10, 40, 15, 25]
],
labels: true
},
axis: {
x: {
default: [3, 5]
}
},
subchart: {
show: true
},
});
</script> </script>
</body> </body>
</html> </html>

29
htdocs/samples/zoom.html
Unescape View File

@ -3,26 +3,47 @@
<link rel="stylesheet" type="text/css" href="/css/c3.css"> <link rel="stylesheet" type="text/css" href="/css/c3.css">
</head> </head>
<body> <body>
<div id="chart"></div> <div id="chart1"></div>
<button onclick="load()">Load</button> <button onclick="load()">Load</button>
<div id="chart2"></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>
<script> <script>
var chart = c3.generate({ var chart1 = c3.generate({
bindto: '#chart', bindto: '#chart1',
data: { data: {
columns: [ columns: [
generateData(100) generateData(100)
], ],
}, },
axis: {
x: {
default: [30, 60]
}
},
zoom: { enabled: true }, zoom: { enabled: true },
subchart: { show: true } subchart: { show: true }
}); });
var chart2 = c3.generate({
bindto: '#chart2',
data: {
columns: [
generateData(100)
],
},
axis: {
x: {
default: [30, 60]
}
},
zoom: { enabled: true },
});
function load() { function load() {
chart.load({ chart1.load({
columns: [ columns: [
generateData(Math.random() * 1000) generateData(Math.random() * 1000)
], ],

4
src/core.js
Unescape View File

@ -248,9 +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) { if (config.axis_x_default) { $$.brush.extent($$.getDefaultExtent()); }
$$.brush.extent(isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default);
}
// Add Axis // Add Axis
$$.initAxis(); $$.initAxis();

8
src/subchart.js
Unescape View File

@ -181,3 +181,11 @@ c3_chart_internal_fn.transformContext = function (withTransition, transitions) {
$$.context.attr("transform", $$.getTranslate('context')); $$.context.attr("transform", $$.getTranslate('context'));
subXAxis.attr("transform", $$.getTranslate('subx')); subXAxis.attr("transform", $$.getTranslate('subx'));
}; };
c3_chart_internal_fn.getDefaultExtent = function () {
var $$ = this, config = $$.config,
extent = isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default;
if ($$.isTimeSeries()) {
extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])];
}
return extent;
};

Write Preview
Loading…
Cancel
Save