Browse Source

Fix tick text rotation with negative value - #501

pull/542/head
Masayuki Tanaka 11 years ago
parent
commit
a083377723
  1. 4
      c3.js
  2. 2
      c3.min.js
  3. 4
      src/axis.js

4
c3.js

@ -3950,11 +3950,11 @@
return 10 * Math.sin(Math.PI * (r / 180)); return 10 * Math.sin(Math.PI * (r / 180));
}; };
c3_chart_internal_fn.yForRotatedTickText = function (r) { c3_chart_internal_fn.yForRotatedTickText = function (r) {
return 11.5 - 2.5 * (r / 15); return 11.5 - 2.5 * (r / 15) * (r > 0 ? 1 : -1);
}; };
c3_chart_internal_fn.rotateTickText = function (axis, transition, rotate) { c3_chart_internal_fn.rotateTickText = function (axis, transition, rotate) {
axis.selectAll('.tick text') axis.selectAll('.tick text')
.style("text-anchor", "start"); .style("text-anchor", rotate > 0 ? "start" : "end");
transition.selectAll('.tick text') transition.selectAll('.tick text')
.attr("y", this.yForRotatedTickText(rotate)) .attr("y", this.yForRotatedTickText(rotate))
.attr("x", this.xForRotatedTickText(rotate)) .attr("x", this.xForRotatedTickText(rotate))

2
c3.min.js vendored

File diff suppressed because one or more lines are too long

4
src/axis.js

@ -227,11 +227,11 @@ c3_chart_internal_fn.xForRotatedTickText = function (r) {
return 10 * Math.sin(Math.PI * (r / 180)); return 10 * Math.sin(Math.PI * (r / 180));
}; };
c3_chart_internal_fn.yForRotatedTickText = function (r) { c3_chart_internal_fn.yForRotatedTickText = function (r) {
return 11.5 - 2.5 * (r / 15); return 11.5 - 2.5 * (r / 15) * (r > 0 ? 1 : -1);
}; };
c3_chart_internal_fn.rotateTickText = function (axis, transition, rotate) { c3_chart_internal_fn.rotateTickText = function (axis, transition, rotate) {
axis.selectAll('.tick text') axis.selectAll('.tick text')
.style("text-anchor", "start"); .style("text-anchor", rotate > 0 ? "start" : "end");
transition.selectAll('.tick text') transition.selectAll('.tick text')
.attr("y", this.yForRotatedTickText(rotate)) .attr("y", this.yForRotatedTickText(rotate))
.attr("x", this.xForRotatedTickText(rotate)) .attr("x", this.xForRotatedTickText(rotate))

Loading…
Cancel
Save