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

Support json as input - #236

pull/282/head
Masayuki Tanaka 11 years ago
parent
4bfe25de5d
commit
de32240824
3 changed files with 38 additions and 6 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. 16
      c3.js
  2. 6
      c3.min.js
  3. 22
      htdocs/samples/data_json.html

16
c3.js
Unescape View File

@ -1453,6 +1453,13 @@
} }
return x; return x;
} }
function convertJsonToData(json) {
var keys = Object.keys(json), new_rows = [];
keys.forEach(function (key) {
new_rows.push([key].concat(json[key]));
});
return convertColumnsToData(new_rows);
}
function convertRowsToData(rows) { function convertRowsToData(rows) {
var keys = rows[0], new_row = {}, new_rows = [], i, j; var keys = rows[0], new_row = {}, new_rows = [], i, j;
for (i = 1; i < rows.length; i++) { for (i = 1; i < rows.length; i++) {
@ -5054,7 +5061,7 @@
/*-- Load data and init chart with defined functions --*/ /*-- Load data and init chart with defined functions --*/
if ('url' in config.data) { if (config.data.url) {
d3.xhr(config.data.url, function (error, data) { d3.xhr(config.data.url, function (error, data) {
// TODO: other mine/type // TODO: other mine/type
var rows = d3.csv.parseRows(data.response), d; var rows = d3.csv.parseRows(data.response), d;
@ -5069,10 +5076,13 @@
init(d); init(d);
}); });
} }
else if ('rows' in config.data) { else if (config.data.json) {
init(convertJsonToData(config.data.json));
}
else if (config.data.rows) {
init(convertRowsToData(config.data.rows)); init(convertRowsToData(config.data.rows));
} }
else if ('columns' in config.data) { else if (config.data.columns) {
init(convertColumnsToData(config.data.columns)); init(convertColumnsToData(config.data.columns));
} }
else { else {

6
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

22
htdocs/samples/data_json.html
Unescape View File

@ -0,0 +1,22 @@
<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: {
json: {
data1: [30, 20, 50, 40, 60, 50],
data2: [200, 130, 90, 240, 130, 220],
data3: [300, 200, 160, 400, 250, 250]
}
}
});
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save