@@ -1540,43 +1540,40 @@ dc.compositeChart = function(_parent) {
1540
1540
return _chart ;
1541
1541
} ;
1542
1542
1543
- _chart . yAxisMin = function ( ) {
1544
- var min = 0 ;
1545
- var allGroups = combineAllGroups ( ) ;
1546
-
1547
- for ( var i = 0 ; i < allGroups . length ; ++ i ) {
1548
- var group = allGroups [ i ] ;
1549
- var m = d3 . min ( group . all ( ) , function ( e ) {
1550
- return _chart . valueRetriever ( ) ( e ) ;
1551
- } ) ;
1552
- if ( m < min ) min = m ;
1543
+ function getAllYAxisMinFromChildCharts ( ) {
1544
+ var allMins = [ ] ;
1545
+ for ( var i = 0 ; i < _children . length ; ++ i ) {
1546
+ allMins . push ( _children [ i ] . yAxisMin ( ) ) ;
1553
1547
}
1548
+ return allMins ;
1549
+ }
1554
1550
1555
- return min ;
1551
+ _chart . yAxisMin = function ( ) {
1552
+ return d3 . min ( getAllYAxisMinFromChildCharts ( ) ) ;
1556
1553
} ;
1557
1554
1558
- _chart . yAxisMax = function ( ) {
1559
- var max = 0 ;
1560
- var allGroups = combineAllGroups ( ) ;
1561
-
1562
- for ( var i = 0 ; i < allGroups . length ; ++ i ) {
1563
- var group = allGroups [ i ] ;
1564
- var m = d3 . max ( group . all ( ) , function ( e ) {
1565
- return _chart . valueRetriever ( ) ( e ) ;
1566
- } ) ;
1567
- if ( m > max ) max = m ;
1555
+ function getAllYAxisMaxFromChildCharts ( ) {
1556
+ var allMaxs = [ ] ;
1557
+ for ( var i = 0 ; i < _children . length ; ++ i ) {
1558
+ allMaxs . push ( _children [ i ] . yAxisMax ( ) ) ;
1568
1559
}
1560
+ return allMaxs ;
1561
+ }
1569
1562
1570
- return max ;
1563
+ _chart . yAxisMax = function ( ) {
1564
+ return d3 . max ( getAllYAxisMaxFromChildCharts ( ) ) ;
1571
1565
} ;
1572
1566
1573
1567
function combineAllGroups ( ) {
1574
1568
var allGroups = [ ] ;
1575
1569
1576
1570
allGroups . push ( _chart . group ( ) ) ;
1577
1571
1578
- for ( var i = 0 ; i < _children . length ; ++ i )
1579
- allGroups . push ( _children [ i ] . group ( ) ) ;
1572
+ for ( var i = 0 ; i < _children . length ; ++ i ) {
1573
+ var groups = _children [ i ] . allGroups ( ) ;
1574
+ for ( var j = 0 ; j < groups . length ; ++ j )
1575
+ allGroups . push ( groups [ j ] ) ;
1576
+ }
1580
1577
1581
1578
return allGroups ;
1582
1579
}
0 commit comments