Skip to content

Ability set yAxis domain #202

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

Open
riosc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ability set yAxis domain #202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db962e3
adding the ability to define the yAxis domain
riosc May 14, 2015
418cbcb
Update angular-charts.js
riosc May 14, 2015
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
41 changes: 30 additions & 11 deletions src/angular-charts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ angular.module('angularCharts').directive('acChart', function($templateCache, $c
lineCurveType: 'cardinal',
isAnimate: true,
yAxisTickFormat: 's',
yAxisDomain: [],
waitForHeightAndWidth: false
};

Expand Down Expand Up @@ -288,9 +289,9 @@ angular.module('angularCharts').directive('acChart', function($templateCache, $c
x.domain(points.map(function(d) {
return d.x;
}));
var padding = d3.max(yData) * 0.20;

y.domain([d3.min(yData), d3.max(yData) + padding]);
var result = getDomain(yData, config.yAxisDomain);
y.domain(result);

x0.domain(d3.range(yMaxPoints)).rangeRoundBands([0, x.rangeBand()]);

Expand Down Expand Up @@ -505,9 +506,8 @@ angular.module('angularCharts').directive('acChart', function($templateCache, $c
.append("g")
.attr("transform", "translate(" + margin.left + "," + margin.top + ")");

var padding = d3.max(yData) * 0.20;

y.domain([d3.min(yData), d3.max(yData) + padding]);
var result = getDomain(yData, config.yAxisDomain);
y.domain(result);

svg.append("g")
.attr("class", "x axis")
Expand Down Expand Up @@ -735,9 +735,8 @@ angular.module('angularCharts').directive('acChart', function($templateCache, $c
.append("g")
.attr("transform", "translate(" + margin.left + "," + margin.top + ")");

var padding = d3.max(yData) * 0.20;

y.domain([d3.min(yData), d3.max(yData) + padding]);
var result = getDomain(yData, config.yAxisDomain);
y.domain(result);

svg.append("g")
.attr("class", "x axis")
Expand Down Expand Up @@ -969,9 +968,8 @@ angular.module('angularCharts').directive('acChart', function($templateCache, $c
.append("g")
.attr("transform", "translate(" + margin.left + "," + margin.top + ")");

var padding = d3.max(yData) * 0.20;

y.domain([d3.min(yData), d3.max(yData) + padding]);
var result = getDomain(yData, config.yAxisDomain);
y.domain(result);

svg.append("g")
.attr("class", "x axis")
Expand Down Expand Up @@ -1163,6 +1161,27 @@ angular.module('angularCharts').directive('acChart', function($templateCache, $c
}
}

/**
* Return an Array with the domain limit, based on config object
* or according to the axis dataset
*
* @param data Tha data to be represented
* @param defaultDomain Domain limit defined in config object
*/
function getDomain(data, defaultDomain){
var minVal, maxVal, padding = 0;
if (defaultDomain.length === 2){
minVal = Number(defaultDomain[0]);
maxVal = Number(defaultDomain[1]);
}else{
minVal = d3.min(data);
maxVal = d3.max(data);
padding = maxVal * 0.2;
}

return [minVal, maxVal + padding];
}

var w = angular.element($window);
var resizePromise = null;
w.bind('resize', function(ev) {
Expand Down