Skip to content

C
c3-closed
Commit 805b15a3 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix data label position when brushed - #485

parent 9a5a6d62
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 6 deletions
c3.js
View file @ 805b15a3
...@@ -2983,7 +2983,7 @@ ...@@ -2983,7 +2983,7 @@
} else { } else {
xPos = $$.hasType('bar') ? (points[2][0] + points[0][0]) / 2 : points[0][0]; xPos = $$.hasType('bar') ? (points[2][0] + points[0][0]) / 2 : points[0][0];
} }
return xPos > $$.width ? $$.width - box.width : xPos; return d.value !== null ? xPos : xPos > $$.width ? $$.width - box.width : xPos;
}; };
c3_chart_internal_fn.getYForText = function (points, d, textElement) { c3_chart_internal_fn.getYForText = function (points, d, textElement) {
var $$ = this, var $$ = this,
...@@ -2993,7 +2993,7 @@ ...@@ -2993,7 +2993,7 @@
} else { } else {
yPos = points[2][1] + (d.value < 0 ? box.height : $$.isBarType(d) ? -3 : -6); yPos = points[2][1] + (d.value < 0 ? box.height : $$.isBarType(d) ? -3 : -6);
} }
return yPos < box.height ? box.height : yPos; return d.value !== null ? yPos : yPos < box.height ? box.height : yPos;
}; };
c3_chart_internal_fn.setTargetType = function (targetIds, type) { c3_chart_internal_fn.setTargetType = function (targetIds, type) {
......
c3.min.js
View file @ 805b15a3
This source diff could not be displayed because it is too large. You can view the blob instead.
htdocs/samples/subchart.html
View file @ 805b15a3
...@@ -3,22 +3,44 @@ ...@@ -3,22 +3,44 @@
<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>
<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: '#chart1',
data: {
columns: [
['data1', 30, 200, 100, 400, 150, 250],
['data2', 50, 20, 10, 40, 15, 25]
],
labels: true
},
subchart: {
show: true
},
});
var chart2 = c3.generate({
bindto: '#chart2',
data: { data: {
columns: [ columns: [
['data1', 30, 200, 100, 400, 150, 250], ['data1', 30, 200, 100, 400, 150, 250],
['data2', 50, 20, 10, 40, 15, 25] ['data2', 50, 20, 10, 40, 15, 25]
], ],
labels: true
}, },
subchart: { subchart: {
show: true show: true
},
axis: {
rotated: true
} }
}); });
</script> </script>
</body> </body>
</html> </html>
src/text.js
View file @ 805b15a3
...@@ -77,7 +77,7 @@ c3_chart_internal_fn.getXForText = function (points, d, textElement) { ...@@ -77,7 +77,7 @@ c3_chart_internal_fn.getXForText = function (points, d, textElement) {
} else { } else {
xPos = $$.hasType('bar') ? (points[2][0] + points[0][0]) / 2 : points[0][0]; xPos = $$.hasType('bar') ? (points[2][0] + points[0][0]) / 2 : points[0][0];
} }
return xPos > $$.width ? $$.width - box.width : xPos; return d.value !== null ? xPos : xPos > $$.width ? $$.width - box.width : xPos;
}; };
c3_chart_internal_fn.getYForText = function (points, d, textElement) { c3_chart_internal_fn.getYForText = function (points, d, textElement) {
var $$ = this, var $$ = this,
...@@ -87,5 +87,5 @@ c3_chart_internal_fn.getYForText = function (points, d, textElement) { ...@@ -87,5 +87,5 @@ c3_chart_internal_fn.getYForText = function (points, d, textElement) {
} else { } else {
yPos = points[2][1] + (d.value < 0 ? box.height : $$.isBarType(d) ? -3 : -6); yPos = points[2][1] + (d.value < 0 ? box.height : $$.isBarType(d) ? -3 : -6);
} }
return yPos < box.height ? box.height : yPos; return d.value !== null ? yPos : yPos < box.height ? box.height : yPos;
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment