@@ -87,7 +87,7 @@ function ordinalScale(dimension) {
87
87
. range ( dimension . tickvals . map ( function ( d ) { return ( d - extent [ 0 ] ) / ( extent [ 1 ] - extent [ 0 ] ) ; } ) ) ;
88
88
}
89
89
90
- function unitToColorScale ( cscale , cmin , cmax , coloringArray ) {
90
+ function unitToColorScale ( cscale ) {
91
91
92
92
var colorStops = cscale . map ( function ( d ) { return d [ 0 ] ; } ) ;
93
93
var colorStrings = cscale . map ( function ( d ) { return d [ 1 ] ; } ) ;
@@ -103,27 +103,17 @@ function unitToColorScale(cscale, cmin, cmax, coloringArray) {
103
103
. range ( colorTuples . map ( prop ( key ) ) ) ;
104
104
} ) ;
105
105
106
- var colorToUnitScale = d3 . scale . linear ( )
107
- . domain ( d3 . extent ( coloringArray ) ) ;
108
-
109
- var unitMin = colorToUnitScale ( cmin ) ;
110
- var unitMax = colorToUnitScale ( cmax ) ;
111
-
112
- var cScale = d3 . scale . linear ( )
113
- . clamp ( true )
114
- . domain ( [ unitMin , unitMax ] ) ;
115
-
116
106
return function ( d ) {
117
107
return polylinearUnitScales . map ( function ( s ) {
118
- return s ( cScale ( d ) ) ;
108
+ return s ( d ) ;
119
109
} ) ;
120
110
} ;
121
111
}
122
112
123
113
function model ( layout , d , i , a ) {
124
114
125
115
var lines = Lib . extendDeep ( { } , d . line , {
126
- color : d . line . color . map ( domainToUnitScale ( { values : d . line . color } ) ) ,
116
+ color : d . line . color . map ( domainToUnitScale ( { values : d . line . color , range : [ d . line . cmin , d . line . cmax ] } ) ) ,
127
117
blockLineCount : c . blockLineCount ,
128
118
canvasOverdrag : c . overdrag * c . canvasPixelRatio
129
119
} ) ;
@@ -142,7 +132,7 @@ function model(layout, d, i, a) {
142
132
colCount : d . dimensions . filter ( visible ) . length ,
143
133
dimensions : d . dimensions ,
144
134
tickDistance : c . tickDistance ,
145
- unitToColor : unitToColorScale ( d . line . colorscale , d . line . cmin , d . line . cmax , d . line . color ) ,
135
+ unitToColor : unitToColorScale ( d . line . colorscale ) ,
146
136
lines : lines ,
147
137
translateX : d . domain . x [ 0 ] * layout . width ,
148
138
translateY : layout . height - d . domain . y [ 1 ] * layout . height ,
0 commit comments