@@ -359,25 +359,51 @@ function calcTilt(angle, position) {
359
359
} ;
360
360
}
361
361
362
+ function updatePanelLayout ( yAxis , vm ) {
363
+ var panels = vm . panels || ( vm . panels = [ ] ) ;
364
+ var data = yAxis . data ( ) ;
365
+ for ( var i = 0 ; i < data . length - 1 ; i ++ ) {
366
+ var p = panels [ i ] || ( panels [ i ] = { } ) ;
367
+ var dim0 = data [ i ] ;
368
+ var dim1 = data [ i + 1 ] ;
369
+ p . dim0 = dim0 ;
370
+ p . dim1 = dim1 ;
371
+ p . canvasX = dim0 . canvasX ;
372
+ p . panelSizeX = dim1 . canvasX - dim0 . canvasX ;
373
+ p . panelSizeY = vm . model . canvasHeight ;
374
+ p . y = 0 ;
375
+ p . canvasY = 0 ;
376
+ }
377
+ }
378
+
379
+ var linearAxis ;
380
+
381
+ function linearFormat ( v , tickformat ) {
382
+ linearAxis . tickformat = tickformat ;
383
+
384
+ return Axes . tickText (
385
+ linearAxis ,
386
+ linearAxis . d2l ( v ) ,
387
+ true
388
+ ) . text ;
389
+ }
390
+
391
+ function extremeText ( d , isTop ) {
392
+ if ( d . ordinal ) return '' ;
393
+ var domain = d . domainScale . domain ( ) ;
394
+ var v = ( domain [ isTop ? domain . length - 1 : 0 ] ) ;
395
+ return linearFormat ( v , d . tickFormat ) ;
396
+ }
397
+
362
398
module . exports = function ( gd , svg , parcoordsLineLayers , cdModule , layout , callbacks ) {
363
399
var state = parcoordsInteractionState ( ) ;
364
400
365
401
var fullLayout = gd . _fullLayout ;
366
402
367
403
// mock one linear axes for tick formatting
368
- var linearAxis = { type : 'linear' , showexponent : 'all' , exponentformat : 'B' } ;
404
+ linearAxis = { type : 'linear' , showexponent : 'all' , exponentformat : 'B' } ;
369
405
Axes . setConvert ( linearAxis , fullLayout ) ;
370
406
371
- function linearFormat ( v , tickformat ) {
372
- linearAxis . tickformat = tickformat ;
373
-
374
- return Axes . tickText (
375
- linearAxis ,
376
- linearAxis . d2l ( v ) ,
377
- true
378
- ) . text ;
379
- }
380
-
381
407
var vm = cdModule
382
408
. filter ( function ( d ) { return unwrap ( d ) . trace . visible ; } )
383
409
. map ( model . bind ( 0 , layout ) )
@@ -469,24 +495,6 @@ module.exports = function(gd, svg, parcoordsLineLayers, cdModule, layout, callba
469
495
var yAxis = parcoordsControlView . selectAll ( '.' + c . cn . yAxis )
470
496
. data ( function ( vm ) { return vm . dimensions ; } , keyFun ) ;
471
497
472
- function updatePanelLayout ( yAxis , vm ) {
473
- var panels = vm . panels || ( vm . panels = [ ] ) ;
474
- var dimData = yAxis . data ( ) ;
475
- var panelCount = dimData . length - 1 ;
476
- for ( var i = 0 ; i < panelCount ; i ++ ) {
477
- var p = panels [ i ] || ( panels [ i ] = { } ) ;
478
- var dim0 = dimData [ i ] ;
479
- var dim1 = dimData [ i + 1 ] ;
480
- p . dim0 = dim0 ;
481
- p . dim1 = dim1 ;
482
- p . canvasX = dim0 . canvasX ;
483
- p . panelSizeX = dim1 . canvasX - dim0 . canvasX ;
484
- p . panelSizeY = vm . model . canvasHeight ;
485
- p . y = 0 ;
486
- p . canvasY = 0 ;
487
- }
488
- }
489
-
490
498
yAxis . enter ( )
491
499
. append ( 'g' )
492
500
. classed ( c . cn . yAxis , true ) ;
@@ -675,13 +683,6 @@ module.exports = function(gd, svg, parcoordsLineLayers, cdModule, layout, callba
675
683
var axisExtentTopText = axisExtentTop . selectAll ( '.' + c . cn . axisExtentTopText )
676
684
. data ( repeat , keyFun ) ;
677
685
678
- function extremeText ( d , isTop ) {
679
- if ( d . ordinal ) return '' ;
680
- var domain = d . domainScale . domain ( ) ;
681
- var v = ( domain [ isTop ? domain . length - 1 : 0 ] ) ;
682
- return linearFormat ( v , d . tickFormat ) ;
683
- }
684
-
685
686
axisExtentTopText . enter ( )
686
687
. append ( 'text' )
687
688
. classed ( c . cn . axisExtentTopText , true )
0 commit comments