Skip to content

Commit d0df35c

Browse files
committed
color mapping code simplification (minor impact on mocks due to numerical precision)
1 parent 3f9b1d5 commit d0df35c

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

src/traces/parcoords/parcoords.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function ordinalScale(dimension) {
8787
.range(dimension.tickvals.map(function(d) {return (d - extent[0]) / (extent[1] - extent[0]);}));
8888
}
8989

90-
function unitToColorScale(cscale, cmin, cmax, coloringArray) {
90+
function unitToColorScale(cscale) {
9191

9292
var colorStops = cscale.map(function(d) {return d[0];});
9393
var colorStrings = cscale.map(function(d) {return d[1];});
@@ -103,27 +103,17 @@ function unitToColorScale(cscale, cmin, cmax, coloringArray) {
103103
.range(colorTuples.map(prop(key)));
104104
});
105105

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-
116106
return function(d) {
117107
return polylinearUnitScales.map(function(s) {
118-
return s(cScale(d));
108+
return s(d);
119109
});
120110
};
121111
}
122112

123113
function model(layout, d, i, a) {
124114

125115
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]})),
127117
blockLineCount: c.blockLineCount,
128118
canvasOverdrag: c.overdrag * c.canvasPixelRatio
129119
});
@@ -142,7 +132,7 @@ function model(layout, d, i, a) {
142132
colCount: d.dimensions.filter(visible).length,
143133
dimensions: d.dimensions,
144134
tickDistance: c.tickDistance,
145-
unitToColor: unitToColorScale(d.line.colorscale, d.line.cmin, d.line.cmax, d.line.color),
135+
unitToColor: unitToColorScale(d.line.colorscale),
146136
lines: lines,
147137
translateX: d.domain.x[0] * layout.width,
148138
translateY: layout.height - d.domain.y[1] * layout.height,
225 Bytes
Loading
12 Bytes
Loading
1.84 KB
Loading

0 commit comments

Comments
 (0)