Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[discreteBarChart] Fix y axis ticks number calculation. #2105

Merged
merged 2 commits into from
Mar 1, 2018
Merged

[discreteBarChart] Fix y axis ticks number calculation. #2105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4105ea7
[discreteBarChart] Fix y axis ticks number calculation.
ovvn Sep 27, 2017
e8432bd
[discreteBar] Remove yAccessor param. [calcTicksY] Re-use getY fn.
ovvn Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/models/discreteBarChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ nv.models.discreteBarChart = function() {
if (showYAxis) {
yAxis
.scale(y)
._ticks( nv.utils.calcTicksY(availableHeight/36, data) )
._ticks( nv.utils.calcTicksY(availableHeight/36, data, discretebar.y()) )
.tickSize( -availableWidth, 0);

g.select('.nv-y.nv-axis').call(yAxis);
Expand Down
30 changes: 26 additions & 4 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,11 +450,33 @@ nv.utils.calcTicksX = function(numTicks, data) {


/*
returns number of ticks to actually use on Y axis, based on chart data
*/
nv.utils.calcTicksY = function(numTicks, data) {
// currently uses the same logic but we can adjust here if needed later
returns number of ticks to actually use on Y axis, based on chart data
*/
nv.utils.calcTicksY = function(numTicks, data, getY) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be unit tests for this function

if (getY) {
// find max number of values from all data streams
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is incorrect

var numValues = 1;
for (var i=0; i < data.length; i += 1) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code fails linting guidelines

var values = data[i] && data[i].values ? data[i].values : [];
var maxValue;
for (var j=0; j < values.length; j += 1) {
maxValue = values[j] && getY(values[j]) ? getY(values[j]): 0;
numValues = maxValue > numValues ? maxValue : numValues;
}
}
nv.log("Requested number of ticks: ", numTicks);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debugging code should be removed

nv.log("Calculated max values to be: ", numValues);
// make sure we don't have more ticks than values to avoid duplicates
numTicks = numTicks > numValues ? numValues - 1 : numTicks;
// make sure we have at least one tick
numTicks = numTicks < 1 ? 1 : numTicks;
// make sure it's an integer
numTicks = Math.floor(numTicks);
nv.log("Calculating tick count as: ", numTicks);
return numTicks;
} else {
return nv.utils.calcTicksX(numTicks, data);
}
};


Expand Down