Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
c3-closed
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Evgeny
c3-closed
Commits
0bf66eef
You need to sign in or sign up before continuing.
Commit
0bf66eef
authored
Sep 20, 2014
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support TSV - #532
parent
f1f62db1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
9 deletions
+39
-9
c3.js
c3.js
+11
-3
c3.min.js
c3.min.js
+0
-0
c3_test.tsv
htdocs/data/c3_test.tsv
+7
-0
data_url.html
htdocs/samples/data_url.html
+10
-3
data.convert.js
src/data.convert.js
+11
-3
No files found.
c3.js
View file @
0bf66eef
...
@@ -1699,24 +1699,32 @@
...
@@ -1699,24 +1699,32 @@
var
d
;
var
d
;
if
(
type
===
'json'
)
{
if
(
type
===
'json'
)
{
d
=
$$
.
convertJsonToData
(
JSON
.
parse
(
data
.
response
),
keys
);
d
=
$$
.
convertJsonToData
(
JSON
.
parse
(
data
.
response
),
keys
);
}
else
if
(
type
===
'tsv'
)
{
d
=
$$
.
convertTsvToData
(
data
.
response
);
}
else
{
}
else
{
d
=
$$
.
convertCsvToData
(
data
.
response
);
d
=
$$
.
convertCsvToData
(
data
.
response
);
}
}
done
.
call
(
$$
,
d
);
done
.
call
(
$$
,
d
);
});
});
};
};
c3_chart_internal_fn
.
convert
CsvToData
=
function
(
csv
)
{
c3_chart_internal_fn
.
convert
XsvToData
=
function
(
xsv
,
parser
)
{
var
d3
=
this
.
d3
,
rows
=
d3
.
csv
.
parseRows
(
c
sv
),
d
;
var
rows
=
parser
.
parseRows
(
x
sv
),
d
;
if
(
rows
.
length
===
1
)
{
if
(
rows
.
length
===
1
)
{
d
=
[{}];
d
=
[{}];
rows
[
0
].
forEach
(
function
(
id
)
{
rows
[
0
].
forEach
(
function
(
id
)
{
d
[
0
][
id
]
=
null
;
d
[
0
][
id
]
=
null
;
});
});
}
else
{
}
else
{
d
=
d3
.
csv
.
parse
(
c
sv
);
d
=
parser
.
parse
(
x
sv
);
}
}
return
d
;
return
d
;
};
};
c3_chart_internal_fn
.
convertCsvToData
=
function
(
csv
)
{
return
this
.
convertXsvToData
(
csv
,
this
.
d3
.
csv
);
};
c3_chart_internal_fn
.
convertTsvToData
=
function
(
tsv
)
{
return
this
.
convertXsvToData
(
tsv
,
this
.
d3
.
tsv
);
};
c3_chart_internal_fn
.
convertJsonToData
=
function
(
json
,
keys
)
{
c3_chart_internal_fn
.
convertJsonToData
=
function
(
json
,
keys
)
{
var
$$
=
this
,
var
$$
=
this
,
new_rows
=
[],
targetKeys
,
data
;
new_rows
=
[],
targetKeys
,
data
;
...
...
c3.min.js
View file @
0bf66eef
This source diff could not be displayed because it is too large. You can
view the blob
instead.
htdocs/data/c3_test.tsv
0 → 100644
View file @
0bf66eef
data1 data2 data3
520 380 100
540 350 110
570 400 150
550 370 200
580 420 180
\ No newline at end of file
htdocs/samples/data_url.html
View file @
0bf66eef
...
@@ -22,20 +22,27 @@
...
@@ -22,20 +22,27 @@
},
1000
);
},
1000
);
setTimeout
(
function
()
{
setTimeout
(
function
()
{
chart
.
load
({
url
:
'/data/c3_test.tsv'
,
mimeType
:
'tsv'
});
},
2000
);
setTimeout
(
function
()
{
chart
=
c3
.
generate
({
chart
=
c3
.
generate
({
data
:
{
data
:
{
url
:
'/data/c3_test.json'
,
url
:
'/data/c3_test.json'
,
mimeType
:
'json'
mimeType
:
'json'
}
}
});
});
},
2
000
);
},
3
000
);
setTimeout
(
function
()
{
setTimeout
(
function
()
{
chart
.
load
({
chart
.
load
({
url
:
'/data/c3_test_2.json'
,
url
:
'/data/c3_test_2.json'
,
mimeType
:
'json'
mimeType
:
'json'
});
});
},
3
000
);
},
4
000
);
setTimeout
(
function
()
{
setTimeout
(
function
()
{
chart
.
load
({
chart
.
load
({
...
@@ -45,7 +52,7 @@
...
@@ -45,7 +52,7 @@
value
:
[
'data1'
,
'data2'
]
value
:
[
'data1'
,
'data2'
]
}
}
});
});
},
4
000
);
},
5
000
);
</script>
</script>
</body>
</body>
...
...
src/data.convert.js
View file @
0bf66eef
...
@@ -4,24 +4,32 @@ c3_chart_internal_fn.convertUrlToData = function (url, mimeType, keys, done) {
...
@@ -4,24 +4,32 @@ c3_chart_internal_fn.convertUrlToData = function (url, mimeType, keys, done) {
var
d
;
var
d
;
if
(
type
===
'json'
)
{
if
(
type
===
'json'
)
{
d
=
$$
.
convertJsonToData
(
JSON
.
parse
(
data
.
response
),
keys
);
d
=
$$
.
convertJsonToData
(
JSON
.
parse
(
data
.
response
),
keys
);
}
else
if
(
type
===
'tsv'
)
{
d
=
$$
.
convertTsvToData
(
data
.
response
);
}
else
{
}
else
{
d
=
$$
.
convertCsvToData
(
data
.
response
);
d
=
$$
.
convertCsvToData
(
data
.
response
);
}
}
done
.
call
(
$$
,
d
);
done
.
call
(
$$
,
d
);
});
});
};
};
c3_chart_internal_fn
.
convert
CsvToData
=
function
(
csv
)
{
c3_chart_internal_fn
.
convert
XsvToData
=
function
(
xsv
,
parser
)
{
var
d3
=
this
.
d3
,
rows
=
d3
.
csv
.
parseRows
(
c
sv
),
d
;
var
rows
=
parser
.
parseRows
(
x
sv
),
d
;
if
(
rows
.
length
===
1
)
{
if
(
rows
.
length
===
1
)
{
d
=
[{}];
d
=
[{}];
rows
[
0
].
forEach
(
function
(
id
)
{
rows
[
0
].
forEach
(
function
(
id
)
{
d
[
0
][
id
]
=
null
;
d
[
0
][
id
]
=
null
;
});
});
}
else
{
}
else
{
d
=
d3
.
csv
.
parse
(
c
sv
);
d
=
parser
.
parse
(
x
sv
);
}
}
return
d
;
return
d
;
};
};
c3_chart_internal_fn
.
convertCsvToData
=
function
(
csv
)
{
return
this
.
convertXsvToData
(
csv
,
this
.
d3
.
csv
);
};
c3_chart_internal_fn
.
convertTsvToData
=
function
(
tsv
)
{
return
this
.
convertXsvToData
(
tsv
,
this
.
d3
.
tsv
);
};
c3_chart_internal_fn
.
convertJsonToData
=
function
(
json
,
keys
)
{
c3_chart_internal_fn
.
convertJsonToData
=
function
(
json
,
keys
)
{
var
$$
=
this
,
var
$$
=
this
,
new_rows
=
[],
targetKeys
,
data
;
new_rows
=
[],
targetKeys
,
data
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment