@@ -111,31 +111,35 @@ function unitToColorScale(cscale) {
111
111
}
112
112
113
113
function model ( layout , d , i , a ) {
114
+ var trace = d . trace ,
115
+ line = trace . line ,
116
+ domain = trace . domain ,
117
+ dimensions = trace . dimensions ;
114
118
115
- var lines = Lib . extendDeep ( { } , d . line , {
116
- color : d . line . color . map ( domainToUnitScale ( { values : d . line . color , range : [ d . line . cmin , d . line . cmax ] } ) ) ,
119
+ var lines = Lib . extendDeep ( { } , line , {
120
+ color : line . color . map ( domainToUnitScale ( { values : line . color , range : [ line . cmin , line . cmax ] } ) ) ,
117
121
blockLineCount : c . blockLineCount ,
118
122
canvasOverdrag : c . overdrag * c . canvasPixelRatio
119
123
} ) ;
120
124
121
125
var groupCount = a . length ;
122
- var groupWidth = layout . width * ( d . domain . x [ 1 ] - d . domain . x [ 0 ] ) ;
123
- var groupHeight = layout . height * ( d . domain . y [ 1 ] - d . domain . y [ 0 ] ) / groupCount ;
126
+ var groupWidth = layout . width * ( domain . x [ 1 ] - domain . x [ 0 ] ) ;
127
+ var groupHeight = layout . height * ( domain . y [ 1 ] - domain . y [ 0 ] ) / groupCount ;
124
128
125
129
var pad = layout . margin || { l : 80 , r : 80 , t : 100 , b : 80 } ;
126
130
var rowPad = pad ;
127
- var rowContentWidth = groupWidth - pad . l - pad . r - ( d . line . showscale ? c . legendWidth : 0 ) ; // leavig room for the colorbar
131
+ var rowContentWidth = groupWidth - pad . l - pad . r - ( line . showscale ? c . legendWidth : 0 ) ; // leavig room for the colorbar
128
132
var rowHeight = groupHeight - rowPad . t - rowPad . b ;
129
133
130
134
return {
131
135
key : i ,
132
- colCount : d . dimensions . filter ( visible ) . length ,
133
- dimensions : d . dimensions ,
136
+ colCount : dimensions . filter ( visible ) . length ,
137
+ dimensions : dimensions ,
134
138
tickDistance : c . tickDistance ,
135
- unitToColor : unitToColorScale ( d . line . colorscale ) ,
139
+ unitToColor : unitToColorScale ( line . colorscale ) ,
136
140
lines : lines ,
137
- translateX : d . domain . x [ 0 ] * layout . width ,
138
- translateY : layout . height - d . domain . y [ 1 ] * layout . height ,
141
+ translateX : domain . x [ 0 ] * layout . width ,
142
+ translateY : layout . height - domain . y [ 1 ] * layout . height ,
139
143
pad : pad ,
140
144
canvasWidth : rowContentWidth * c . canvasPixelRatio + 2 * lines . canvasOverdrag ,
141
145
canvasHeight : rowHeight * c . canvasPixelRatio ,
@@ -266,7 +270,7 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
266
270
}
267
271
268
272
var vm = styledData
269
- . filter ( function ( d ) { return ! ! d . dimensions && d . dimensions . length > 0 ; } )
273
+ . filter ( function ( d ) { return d . trace . visible ; } )
270
274
. map ( model . bind ( 0 , layout ) )
271
275
. map ( viewModel ) ;
272
276
0 commit comments