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

Cache tick text size - #730

pull/763/merge
Masayuki Tanaka 10 years ago
parent
1c35022955
commit
3334ef8656
4 changed files with 29 additions and 16 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. 6
      c3.js
  2. 10
      c3.min.js
  3. 23
      spec/axis-spec.js
  4. 6
      src/c3.axis.js

6
c3.js
Unescape View File

@ -6455,6 +6455,8 @@
// Features: // Features:
// 1. category axis // 1. category axis
// 2. ceil values of translate/x/y to int for half pixel antialiasing // 2. ceil values of translate/x/y to int for half pixel antialiasing
// 3. multiline tick text
var tickTextCharSize;
function c3_axis(d3, params) { function c3_axis(d3, params) {
var scale = d3.scale.linear(), orient = "bottom", innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments; var scale = d3.scale.linear(), orient = "bottom", innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments;
@ -6503,6 +6505,9 @@
return tickFormat ? tickFormat(v) : v; return tickFormat ? tickFormat(v) : v;
} }
function getSizeFor1Char(tick) { function getSizeFor1Char(tick) {
if (tickTextCharSize) {
return tickTextCharSize;
}
var size = { var size = {
h: 11.5, h: 11.5,
w: 5.5 w: 5.5
@ -6517,6 +6522,7 @@
size.w = w; size.w = w;
} }
}).text(''); }).text('');
tickTextCharSize = size;
return size; return size;
} }
function axis(g) { function axis(g) {

10
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

23
spec/axis-spec.js
Unescape View File

@ -206,7 +206,7 @@ describe('c3 chart axis', function () {
it('should split x axis tick text to multiple lines', function () { it('should split x axis tick text to multiple lines', function () {
var ticks = chart.internal.main.select('.c3-axis-x').selectAll('g.tick'), var ticks = chart.internal.main.select('.c3-axis-x').selectAll('g.tick'),
expectedTexts = ['very long tick text on x', 'axis'], expectedTexts = ['very long tick text', 'on x axis'],
expectedX = '0'; expectedX = '0';
expect(ticks.size()).toBe(6); expect(ticks.size()).toBe(6);
ticks.each(function () { ticks.each(function () {
@ -286,7 +286,7 @@ describe('c3 chart axis', function () {
it('should split x axis tick text to multiple lines', function () { it('should split x axis tick text to multiple lines', function () {
var ticks = chart.internal.main.select('.c3-axis-x').selectAll('g.tick'), var ticks = chart.internal.main.select('.c3-axis-x').selectAll('g.tick'),
expectedTexts = ['very long tick text on', 'x axis'], expectedTexts = ['very long tick', 'text on x axis'],
expectedX = '-9'; expectedX = '-9';
expect(ticks.size()).toBe(6); expect(ticks.size()).toBe(6);
ticks.each(function () { ticks.each(function () {
@ -378,12 +378,13 @@ describe('c3 chart axis', function () {
var tick = chart.internal.main.select('.c3-axis-x').select('g.tick'), var tick = chart.internal.main.select('.c3-axis-x').select('g.tick'),
tspans = tick.selectAll('tspan'), tspans = tick.selectAll('tspan'),
expectedTickTexts = [ expectedTickTexts = [
'this is a very long', 'this is a very',
'tick text on', 'long tick text',
'category axis' 'on category',
'axis',
], ],
expectedX = '0'; expectedX = '0';
expect(tspans.size()).toBe(3); expect(tspans.size()).toBe(4);
tspans.each(function (d, i) { tspans.each(function (d, i) {
var tspan = d3.select(this); var tspan = d3.select(this);
expect(tspan.text()).toBe(expectedTickTexts[i]); expect(tspan.text()).toBe(expectedTickTexts[i]);
@ -426,9 +427,9 @@ describe('c3 chart axis', function () {
var tick = chart.internal.main.select('.c3-axis-x').select('g.tick'), var tick = chart.internal.main.select('.c3-axis-x').select('g.tick'),
tspans = tick.selectAll('tspan'), tspans = tick.selectAll('tspan'),
expectedTickTexts = [ expectedTickTexts = [
'this is a very long', 'this is a very',
'tick text on category', 'long tick text on',
'axis' 'category axis'
], ],
expectedX = '-9'; expectedX = '-9';
expect(tspans.size()).toBe(3); expect(tspans.size()).toBe(3);
@ -479,8 +480,8 @@ describe('c3 chart axis', function () {
var tick = chart.internal.main.select('.c3-axis-x').select('g.tick'), var tick = chart.internal.main.select('.c3-axis-x').select('g.tick'),
tspans = tick.selectAll('tspan'), tspans = tick.selectAll('tspan'),
expectedTickTexts = [ expectedTickTexts = [
'this is a very long tick text on', 'this is a very long tick',
'category axis' 'text on category axis'
], ],
expectedX = '-9'; expectedX = '-9';
expect(tspans.size()).toBe(2); expect(tspans.size()).toBe(2);

6
src/c3.axis.js
Unescape View File

@ -1,6 +1,8 @@
// Features: // Features:
// 1. category axis // 1. category axis
// 2. ceil values of translate/x/y to int for half pixel antialiasing // 2. ceil values of translate/x/y to int for half pixel antialiasing
// 3. multiline tick text
var tickTextCharSize;
function c3_axis(d3, params) { function c3_axis(d3, params) {
var scale = d3.scale.linear(), orient = "bottom", innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments; var scale = d3.scale.linear(), orient = "bottom", innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments;
@ -49,6 +51,9 @@ function c3_axis(d3, params) {
return tickFormat ? tickFormat(v) : v; return tickFormat ? tickFormat(v) : v;
} }
function getSizeFor1Char(tick) { function getSizeFor1Char(tick) {
if (tickTextCharSize) {
return tickTextCharSize;
}
var size = { var size = {
h: 11.5, h: 11.5,
w: 5.5 w: 5.5
@ -63,6 +68,7 @@ function c3_axis(d3, params) {
size.w = w; size.w = w;
} }
}).text(''); }).text('');
tickTextCharSize = size;
return size; return size;
} }
function axis(g) { function axis(g) {

Write Preview
Loading…
Cancel
Save