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

Fix data label position when brushed - #485

pull/1616/head
Masayuki Tanaka 10 years ago
parent
9a5a6d622e
commit
805b15a3b8
4 changed files with 29 additions and 7 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. 4
      c3.js
  2. 2
      c3.min.js
  3. 26
      htdocs/samples/subchart.html
  4. 4
      src/text.js

4
c3.js
Unescape View File

@ -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 @@
} 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) {

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

26
htdocs/samples/subchart.html
Unescape View File

@ -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>

4
src/text.js
Unescape View File

@ -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) {
} 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;
}; };

Write Preview
Loading…
Cancel
Save