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

Fix tick text position when rotate

pull/681/head
Masayuki Tanaka 10 years ago
parent
ad3a3a6416
commit
ab40f1874e
3 changed files with 9 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. 7
      c3.js
  2. 2
      c3.min.js
  3. 7
      src/axis.js

7
c3.js
Unescape View File

@ -4115,7 +4115,7 @@
}; };
c3_chart_internal_fn.xForRotatedTickText = function (r) { c3_chart_internal_fn.xForRotatedTickText = function (r) {
return 10 * Math.sin(Math.PI * (r / 180)); return 8 * 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) * (r > 0 ? 1 : -1); return 11.5 - 2.5 * (r / 15) * (r > 0 ? 1 : -1);
@ -4125,8 +4125,9 @@
.style("text-anchor", rotate > 0 ? "start" : "end"); .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("transform", "rotate(" + rotate + ")")
.attr("transform", "rotate(" + rotate + ")"); .selectAll('tspan')
.attr('dx', this.xForRotatedTickText(rotate));
}; };
c3_chart_internal_fn.getMaxTickWidth = function (id) { c3_chart_internal_fn.getMaxTickWidth = function (id) {

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
src/axis.js
Unescape View File

@ -242,7 +242,7 @@ c3_chart_internal_fn.textAnchorForY2AxisLabel = function () {
}; };
c3_chart_internal_fn.xForRotatedTickText = function (r) { c3_chart_internal_fn.xForRotatedTickText = function (r) {
return 10 * Math.sin(Math.PI * (r / 180)); return 8 * 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) * (r > 0 ? 1 : -1); return 11.5 - 2.5 * (r / 15) * (r > 0 ? 1 : -1);
@ -252,8 +252,9 @@ c3_chart_internal_fn.rotateTickText = function (axis, transition, rotate) {
.style("text-anchor", rotate > 0 ? "start" : "end"); .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("transform", "rotate(" + rotate + ")")
.attr("transform", "rotate(" + rotate + ")"); .selectAll('tspan')
.attr('dx', this.xForRotatedTickText(rotate));
}; };
c3_chart_internal_fn.getMaxTickWidth = function (id) { c3_chart_internal_fn.getMaxTickWidth = function (id) {

Write Preview
Loading…
Cancel
Save