@@ -206,7 +206,7 @@ function viewModel(state, callbacks, model) {
206
206
var unitPad = c . verticalPadding / height ;
207
207
var _unitToPaddedPx = unitToPaddedPx ( height , c . verticalPadding ) ;
208
208
209
- var viewModel = {
209
+ var vm = {
210
210
key : model . key ,
211
211
xScale : xScale ,
212
212
model : model ,
@@ -215,7 +215,7 @@ function viewModel(state, callbacks, model) {
215
215
216
216
var uniqueKeys = { } ;
217
217
218
- viewModel . dimensions = dimensions . filter ( helpers . isVisible ) . map ( function ( dimension , i ) {
218
+ vm . dimensions = dimensions . filter ( helpers . isVisible ) . map ( function ( dimension , i ) {
219
219
var domainToPaddedUnit = domainToPaddedUnitScale ( dimension , unitPad ) ;
220
220
var foundKey = uniqueKeys [ dimension . label ] ;
221
221
uniqueKeys [ dimension . label ] = ( foundKey || 0 ) + 1 ;
@@ -229,7 +229,7 @@ function viewModel(state, callbacks, model) {
229
229
specifiedConstraint . map ( function ( d ) { return d . map ( domainToPaddedUnit ) ; } ) :
230
230
[ [ - Infinity , Infinity ] ] ;
231
231
var brushMove = function ( ) {
232
- var p = viewModel ;
232
+ var p = vm ;
233
233
p . focusLayer && p . focusLayer . render ( p . panels , true ) ;
234
234
var filtersActive = someFiltersActive ( p ) ;
235
235
if ( ! state . contextShown ( ) && filtersActive ) {
@@ -299,7 +299,7 @@ function viewModel(state, callbacks, model) {
299
299
unitToPaddedPx : _unitToPaddedPx ,
300
300
domainScale : domainScale ( height , c . verticalPadding , dimension , tickvals , ticktext ) ,
301
301
ordinalScale : ordinalScale ( dimension ) ,
302
- parent : viewModel ,
302
+ parent : vm ,
303
303
model : model ,
304
304
brush : brush . makeBrush (
305
305
state ,
@@ -310,9 +310,8 @@ function viewModel(state, callbacks, model) {
310
310
} ,
311
311
brushMove ,
312
312
function ( f ) {
313
- var p = viewModel ;
314
- p . focusLayer . render ( p . panels , true ) ;
315
- p . pickLayer && p . pickLayer . render ( p . panels , true ) ;
313
+ vm . focusLayer . render ( vm . panels , true ) ;
314
+ vm . pickLayer && vm . pickLayer . render ( vm . panels , true ) ;
316
315
state . linePickActive ( true ) ;
317
316
if ( callbacks && callbacks . filterChanged ) {
318
317
var invScale = domainToPaddedUnit . invert ;
@@ -321,14 +320,14 @@ function viewModel(state, callbacks, model) {
321
320
var newRanges = f . map ( function ( r ) {
322
321
return r . map ( invScale ) . sort ( Lib . sorterAsc ) ;
323
322
} ) . sort ( function ( a , b ) { return a [ 0 ] - b [ 0 ] ; } ) ;
324
- callbacks . filterChanged ( p . key , dimension . _index , newRanges ) ;
323
+ callbacks . filterChanged ( vm . key , dimension . _index , newRanges ) ;
325
324
}
326
325
}
327
326
)
328
327
} ;
329
328
} ) ;
330
329
331
- return viewModel ;
330
+ return vm ;
332
331
}
333
332
334
333
function styleExtentTexts ( selection ) {
@@ -386,8 +385,7 @@ function calcAllTicks(cd) {
386
385
var dim = dimensions [ k ] . _ax ;
387
386
388
387
if ( dim ) {
389
- if ( ! dim . range ) dim . range = [ 0 , 1 ] ;
390
- if ( ! dim . dtick ) dim . dtick = 0.1 ;
388
+ if ( ! dim . dtick ) dim . dtick = 0.01 * Math . abs ( dim . range [ 1 ] - dim . range [ 0 ] ) ;
391
389
dim . tickformat = dimensions [ k ] . tickformat ;
392
390
393
391
Axes . calcTicks ( dim ) ;
@@ -399,27 +397,28 @@ function calcAllTicks(cd) {
399
397
}
400
398
}
401
399
402
- module . exports = function parcoords ( gd , cdModule , layout , callbacks ) {
403
- var state = parcoordsInteractionState ( ) ;
400
+ function linearFormat ( dim , v ) {
401
+ return Axes . tickText ( dim . _ax , v , false ) . text ;
402
+ }
404
403
405
- var fullLayout = gd . _fullLayout ;
406
- var svg = fullLayout . _toppaper ;
407
- var glContainer = fullLayout . _glcontainer ;
404
+ function extremeText ( d , isTop ) {
405
+ if ( d . ordinal ) return '' ;
406
+ var domain = d . domainScale . domain ( ) ;
407
+ var v = ( domain [ isTop ? domain . length - 1 : 0 ] ) ;
408
408
409
- function linearFormat ( dim , v ) {
410
- return Axes . tickText ( dim . _ax , v , false ) . text ;
411
- }
409
+ return linearFormat ( d . model . dimensions [ d . visibleIndex ] , v ) ;
410
+ }
412
411
413
- function extremeText ( d , isTop ) {
414
- if ( d . ordinal ) return '' ;
415
- var domain = d . domainScale . domain ( ) ;
416
- var v = ( domain [ isTop ? domain . length - 1 : 0 ] ) ;
417
412
418
- return linearFormat ( d . model . dimensions [ d . visibleIndex ] , v ) ;
419
- }
413
+ module . exports = function parcoords ( gd , cdModule , layout , callbacks ) {
414
+ var fullLayout = gd . _fullLayout ;
415
+ var svg = fullLayout . _toppaper ;
416
+ var glContainer = fullLayout . _glcontainer ;
420
417
421
418
calcAllTicks ( cdModule ) ;
422
419
420
+ var state = parcoordsInteractionState ( ) ;
421
+
423
422
var vm = cdModule
424
423
. filter ( function ( d ) { return unwrap ( d ) . trace . visible ; } )
425
424
. map ( model . bind ( 0 , layout ) )
@@ -509,14 +508,14 @@ module.exports = function parcoords(gd, cdModule, layout, callbacks) {
509
508
} ) ;
510
509
511
510
var yAxis = parcoordsControlView . selectAll ( '.' + c . cn . yAxis )
512
- . data ( function ( vm ) { return vm . dimensions ; } , keyFun ) ;
511
+ . data ( function ( p ) { return p . dimensions ; } , keyFun ) ;
513
512
514
513
yAxis . enter ( )
515
514
. append ( 'g' )
516
515
. classed ( c . cn . yAxis , true ) ;
517
516
518
- parcoordsControlView . each ( function ( vm ) {
519
- updatePanelLayout ( yAxis , vm ) ;
517
+ parcoordsControlView . each ( function ( p ) {
518
+ updatePanelLayout ( yAxis , p ) ;
520
519
} ) ;
521
520
522
521
glLayers
0 commit comments