@@ -5,15 +5,14 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
5
5
6
6
function render ( scope , element ) {
7
7
8
- var _data , d3Data , options , getColor , svg , margin , width , height , x , y , labels , axes , bars , info ;
8
+ var _data , options , getColor , svg , margin , width , height , x , y , labels , axes , bars , info ;
9
9
10
10
if ( ! scope . data ) {
11
11
return ;
12
12
}
13
13
14
14
_data = angular . copy ( scope . data ) ;
15
15
getColor = common . colors ( _data . colors ) ;
16
- d3Data = [ ] ;
17
16
18
17
options = common . defaults ( _data , {
19
18
height : 300 ,
@@ -36,8 +35,12 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
36
35
x = d3 . scale . ordinal ( ) . rangeRoundBands ( [ 0 , width ] , 0.2 ) ;
37
36
y = d3 . scale . linear ( ) . range ( [ height , 0 ] ) ;
38
37
39
- x . domain ( _data . data . map ( function ( d ) { return d . x ; } ) ) ;
40
- y . domain ( [ 0 , d3 . max ( _data . data , function ( d ) { return d . y ; } ) ] ) ;
38
+ x . domain ( _data . data . map ( function ( d ) {
39
+ return d . x ;
40
+ } ) ) ;
41
+ y . domain ( [ 0 , d3 . max ( _data . data , function ( d ) {
42
+ return d . y ;
43
+ } ) ] ) ;
41
44
42
45
function drawAxes ( ) {
43
46
var xAxis , yAxis ;
@@ -57,7 +60,7 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
57
60
append ( 'g' ) .
58
61
attr ( {
59
62
'class' : 'x axis' ,
60
- 'transform' : common . translate ( margin . left , height + 1 )
63
+ 'transform' : common . translate ( margin . left , height + 1 )
61
64
} ) .
62
65
call ( xAxis ) .
63
66
selectAll ( 'text' ) .
@@ -104,7 +107,7 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
104
107
info .
105
108
append ( 'text' ) .
106
109
attr ( {
107
- 'transform' : common . translate ( margin . left + x ( d . x ) + x . rangeBand ( ) / 2 , height + 40 ) ,
110
+ 'transform' : common . translate ( margin . left + x ( d . x ) + x . rangeBand ( ) / 2 , height + 40 ) ,
108
111
'text-anchor' : 'middle' ,
109
112
'alignment-baseline' : 'central'
110
113
} )
@@ -137,7 +140,7 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
137
140
'width' : x . rangeBand ( ) ,
138
141
'height' : 0 ,
139
142
'transform' : function ( d ) {
140
- return common . translate ( margin . left + x ( d . x ) , height + 1 ) ;
143
+ return common . translate ( margin . left + x ( d . x ) , height + 1 ) ;
141
144
} ,
142
145
'fill' : getColor ( 'bars' )
143
146
} )
@@ -147,7 +150,7 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
147
150
} ) .
148
151
transition ( ) . delay ( delay ) . duration ( duration ) .
149
152
attr ( 'transform' , function ( d ) {
150
- return common . translate ( margin . left + x ( d . x ) , y ( d . y ) + 1 ) ;
153
+ return common . translate ( margin . left + x ( d . x ) , y ( d . y ) + 1 ) ;
151
154
} ) .
152
155
attr ( 'height' , function ( d ) {
153
156
return height - y ( d . y ) ;
0 commit comments