Skip to content

Area enhancements #5

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Area enhancements #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8cc74e
added bower configuration
Aug 6, 2013
56f4da3
added support for setting margins with attributes
Aug 6, 2013
4f62360
version number increments
Aug 7, 2013
8768494
option to rotate the label with a default of true
Aug 8, 2013
1f7a84c
added tooltips to area
Aug 8, 2013
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
12 changes: 12 additions & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "dangle",
"version": "1.1.1",
"main": "src/dangle.module.js",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
]
}
13 changes: 13 additions & 0 deletions css/dangle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,17 @@
fill: #000;
stroke: none;
font-size: 12px;
}

.area-tooltip {
position: absolute;
text-align: left;
width: 150px;
height: 40px;
padding: 2px;
font: 12px sans-serif;
background: white;
border: 2px #959595 solid;
border-radius: 2px;
pointer-events: none;
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dangle",
"description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
"version": "1.0.0",
"version": "1.1.1",
"homepage": "http://www.fullscale.co/dangle",
"keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
"repository": {
Expand Down
99 changes: 75 additions & 24 deletions src/modules/area/area.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

angular.module('dangle')
.directive('fsArea', [function() {
.directive('fsArea', ['$filter', function($filter) {
'use strict';

return {
Expand All @@ -41,18 +41,28 @@ angular.module('dangle')
duration: '@',
delay: '@',
plot: '@',
pointRadius: '@'
pointRadius: '@',
marginLeft: '=',
marginRight: '=',
marginBottom:'=',
marginTop: '=',
xticks: '=',
yticks: '=',
tooltips: '@'
},

link: function(scope, element, attrs) {

var dateFilter = $filter('date');

var margin = {
top: 20,
right: 20,
bottom: 30,
left: 80
top: scope.marginTop || 20,
right: scope.marginRight || 20,
bottom: scope.marginBottom || 30,
left: scope.marginLeft || 80
};


// default width/height - mainly to create initial aspect ratio
var width = scope.width || 1280;
var height = scope.height || 300;
Expand All @@ -61,7 +71,9 @@ angular.module('dangle')
var interpolate = attrs.interpolate || 'false';

var label = attrs.label || 'Frequency';
var rotateLabel = attrs.rotateLabel || 'true';
var klass = attrs.class || '';
var tooltips = attrs.tooltips || 'false';

// add margins (make room for x,y labels)
width = width - margin.left - margin.right;
Expand All @@ -74,7 +86,7 @@ angular.module('dangle')
var y = d3.scale.linear()
.range([height, 0]);

// create x,y axis
// create x,y axis
var xAxis = d3.svg.axis()
.scale(x)
.orient('bottom');
Expand All @@ -83,7 +95,16 @@ angular.module('dangle')
.scale(y)
.orient('left');

// create line generator
//set the number of ticks if specified
if(scope.xticks) {
xAxis.ticks(scope.xticks);
}

if(scope.yticks) {
yAxis.ticks(scope.yticks);
}

// create line generator
var line = d3.svg.line()
.x(function(d) { return x(d.time); })
.y(function(d) { return y(d.count); });
Expand All @@ -94,7 +115,7 @@ angular.module('dangle')
.y0(height)
.y1(function(d) { return y(d.count); });

// enable interpolation if specified
// enable interpolation if specified
if (attrs.interpolate == 'true') {
line.interpolate('cardinal');
area.interpolate('cardinal');
Expand All @@ -120,23 +141,35 @@ angular.module('dangle')
.attr('transform', 'translate(0,' + height + ')')
.call(xAxis);

// insert the x axis (no data yet)
svg.append('g')
var axis = svg.append('g')
.attr('class', 'area y axis ' + klass)
.call(yAxis)
.append('text')
.attr('transform', 'rotate(-90)')
.attr('y', 6)
.attr('dy', '.71em')
.style('text-anchor', 'end')
.text(label);
.append('text')
.attr('dy', '.71em')
.text(label);
// insert the y axis (no data yet)
if(rotateLabel == 'true') {
axis
.attr('transform', 'rotate(-90)')
.attr('y', 6)
.style('text-anchor', 'end')
} else {
axis
.attr('y', -10)
.attr('dy', '.71em')
}


// generate the line. Data is empty at link time
svg.append('path')
.datum([])
.attr('class', 'area line ' + klass)
.attr("d", line);

var div = d3.select("body").append("div")
.attr("class", "area-tooltip")
.style("opacity", 0);


// main observer fn called when scope is updated. Data and scope vars are now bound
scope.$watch('bind', function(data) {
Expand All @@ -158,7 +191,7 @@ angular.module('dangle')
x.domain(d3.extent(data, function(d) { return d.time; }));
y.domain([0, d3.max(data, function(d) { return d.count; })]);

// create the transition
// create the transition
var t = svg.transition().duration(duration);

// feed the current data to our area/line generators
Expand All @@ -172,13 +205,13 @@ angular.module('dangle')
// using Math.random as (optional) key fn ensures old
// data values are flushed and all new values inserted
var points = svg.selectAll('circle')
.data(data.filter(function(d) {
return d.count;
}), function(d) {
return Math.random();
.data(data.filter(function(d) {
return d.count;
}), function(d) {
return Math.random();
});

// d3 enter fn binds each new value to a circle
// d3 enter fn binds each new value to a circle
points.enter()
.append('circle')
.attr('class', 'area line points ' + klass)
Expand All @@ -194,10 +227,28 @@ angular.module('dangle')
.attr("r", pointRadius);

// wire up any events (registers filter callback)
points.on('mousedown', function(d) {
points.on('mousedown', function(d) {
scope.$apply(function() {
(scope.onClick || angular.noop)(field, d.time);
});
}).on("mouseover", function(d) {
if(tooltips === 'true') {
div.transition()
.duration(200)
.style("opacity", .9);
div .html(
"<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
"<br>" + label + ":" + "<strong>" + d.count +"</strong>"
)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}
}).on("mouseout", function(d) {
if(tooltips === 'true') {
div.transition()
.duration(100)
.style("opacity", .0);
}
});

// d3 exit/remove flushes old values (removes old circles)
Expand Down