Skip to content

C
c3-closed
Commit 2647aeaf authored by Evgeny's avatar Evgeny
Browse files
Options

Fix bug for category x axis

parent dc521a50
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 28 deletions
c3.js
View file @ 2647aeaf
......@@ -4661,10 +4661,12 @@
withoutTransition: withoutTransition,
};
if(tickValues && config.axis_x_start){
tickValues = tickValues.map(function(x) {
return x + config.axis_x_start;
});
if(!$$.isTimeSeries() && $$.isXAxis(orient)){
if(tickValues){
tickValues = tickValues.map(function(x) {
return x + config.axis_x_start;
});
}
}
var axis = c3_axis($$.d3, axisParams, $$).scale(scale).orient(orient);
......@@ -4694,14 +4696,23 @@
};
c3_chart_internal_fn.updateXAxisTickValues = function (targets, axis) {
var $$ = this, config = $$.config, tickValues;
if (config.axis_x_tick_fit || config.axis_x_tick_count) {
tickValues = $$.generateTickValues($$.mapTargetsToUniqueXs(targets), config.axis_x_tick_count, $$.isTimeSeries());
}
if(tickValues && config.axis_x_start){
tickValues = tickValues.map(function(x) {
return x + config.axis_x_start;
});
if(!$$.isTimeSeries() && $$.isXAxis($$.xAxis.orient())){
if(tickValues){
tickValues = tickValues.map(function(x) {
if(x instanceof Date){
return x;
}
return x + $$.config.axis_x_start;
});
}
}
if (axis) {
axis.tickValues(tickValues);
} else {
......@@ -4711,8 +4722,9 @@
return tickValues;
};
c3_chart_internal_fn.getYAxis = function (scale, orient, tickFormat, tickValues, withOuterTick) {
var axisParams = {withOuterTick: withOuterTick},
var $$ = this, axisParams = {withOuterTick: withOuterTick},
axis = c3_axis(this.d3, axisParams, this).scale(scale).orient(orient).tickFormat(tickFormat);
if (this.isTimeSeriesY()) {
axis.ticks(this.d3.time[this.config.axis_y_tick_time_value], this.config.axis_y_tick_time_interval);
} else {
......@@ -8187,8 +8199,7 @@
function axisX(selection, x) {
selection.attr("transform", function (d) {
if($$.config.axis_x_start){
if($$.isXAxis(orient)){
d -= $$.config.axis_x_start;
}
......@@ -8197,6 +8208,10 @@
}
function axisY(selection, y) {
selection.attr("transform", function (d) {
if($$.isXAxis(orient)){
d -= $$.config.axis_x_start;
}
return "translate(0," + Math.ceil(y(d)) + ")";
});
}
......@@ -8246,7 +8261,7 @@
}
domain = scale.domain();
for (i = Math.ceil(domain[0]); i < domain[1]; i++) {
ticks.push(i);
ticks.push(i + $$.config.axis_x_start);
}
if (ticks.length > 0 && ticks[0] > 0) {
ticks.unshift(ticks[0] - (ticks[1] - ticks[0]));
......@@ -8334,7 +8349,7 @@
var tickText,
subtext, spaceIndex, textWidth, thinOutCoef, splitted = [];
if($$.isCategorized()){
if(params.isCaregory){
tickText = $$.categoryName(d);
tickText = textFormatted(tickText);
} else {
......@@ -8409,7 +8424,7 @@
text = tick.select("text");
if(typeof turn_axis_ticks !== 'undefined' || typeof turn_axis_ticks_90 !== 'undefined'){
if($$.isXAxis(orient) && $$.isCategorized){
if($$.isXAxis(orient) && params.isCategory){
shouldSplitText = false;
if(typeof turn_axis_ticks !== 'undefined'){
......
c3.min.js
View file @ 2647aeaf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/axis.js
View file @ 2647aeaf
......@@ -41,10 +41,12 @@ c3_chart_internal_fn.getXAxis = function (scale, orient, tickFormat, tickValues,
withoutTransition: withoutTransition,
};
if(tickValues && config.axis_x_start){
tickValues = tickValues.map(function(x) {
return x + config.axis_x_start;
});
if(!$$.isTimeSeries() && $$.isXAxis(orient)){
if(tickValues){
tickValues = tickValues.map(function(x) {
return x + config.axis_x_start;
});
}
}
var axis = c3_axis($$.d3, axisParams, $$).scale(scale).orient(orient);
......@@ -74,14 +76,23 @@ c3_chart_internal_fn.getXAxis = function (scale, orient, tickFormat, tickValues,
};
c3_chart_internal_fn.updateXAxisTickValues = function (targets, axis) {
var $$ = this, config = $$.config, tickValues;
if (config.axis_x_tick_fit || config.axis_x_tick_count) {
tickValues = $$.generateTickValues($$.mapTargetsToUniqueXs(targets), config.axis_x_tick_count, $$.isTimeSeries());
}
if(tickValues && config.axis_x_start){
tickValues = tickValues.map(function(x) {
return x + config.axis_x_start;
});
if(!$$.isTimeSeries() && $$.isXAxis($$.xAxis.orient())){
if(tickValues){
tickValues = tickValues.map(function(x) {
if(x instanceof Date){
return x;
}
return x + $$.config.axis_x_start;
});
}
}
if (axis) {
axis.tickValues(tickValues);
} else {
......@@ -91,8 +102,9 @@ c3_chart_internal_fn.updateXAxisTickValues = function (targets, axis) {
return tickValues;
};
c3_chart_internal_fn.getYAxis = function (scale, orient, tickFormat, tickValues, withOuterTick) {
var axisParams = {withOuterTick: withOuterTick},
var $$ = this, axisParams = {withOuterTick: withOuterTick},
axis = c3_axis(this.d3, axisParams, this).scale(scale).orient(orient).tickFormat(tickFormat);
if (this.isTimeSeriesY()) {
axis.ticks(this.d3.time[this.config.axis_y_tick_time_value], this.config.axis_y_tick_time_interval);
} else {
......
src/c3.axis.js
View file @ 2647aeaf
......@@ -14,8 +14,7 @@ function c3_axis(d3, params, $$) {
function axisX(selection, x) {
selection.attr("transform", function (d) {
if($$.config.axis_x_start){
if($$.isXAxis(orient)){
d -= $$.config.axis_x_start;
}
......@@ -24,6 +23,10 @@ function c3_axis(d3, params, $$) {
}
function axisY(selection, y) {
selection.attr("transform", function (d) {
if($$.isXAxis(orient)){
d -= $$.config.axis_x_start;
}
return "translate(0," + Math.ceil(y(d)) + ")";
});
}
......@@ -73,7 +76,7 @@ function c3_axis(d3, params, $$) {
}
domain = scale.domain();
for (i = Math.ceil(domain[0]); i < domain[1]; i++) {
ticks.push(i);
ticks.push(i + $$.config.axis_x_start);
}
if (ticks.length > 0 && ticks[0] > 0) {
ticks.unshift(ticks[0] - (ticks[1] - ticks[0]));
......@@ -161,7 +164,7 @@ function c3_axis(d3, params, $$) {
var tickText,
subtext, spaceIndex, textWidth, thinOutCoef, splitted = [];
if($$.isCategorized()){
if(params.isCaregory){
tickText = $$.categoryName(d);
tickText = textFormatted(tickText);
} else {
......@@ -236,7 +239,7 @@ function c3_axis(d3, params, $$) {
text = tick.select("text");
if(typeof turn_axis_ticks !== 'undefined' || typeof turn_axis_ticks_90 !== 'undefined'){
if($$.isXAxis(orient) && $$.isCategorized){
if($$.isXAxis(orient) && params.isCategory){
shouldSplitText = false;
if(typeof turn_axis_ticks !== 'undefined'){
......
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