Move interpolation methods to d3-interpolate.

d3 · Nov 25, 2015 · 4dcaa3c · 4dcaa3c
1 parent 15beb75
commit 4dcaa3c
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 499 deletions.
diff --git a/README.md b/README.md
@@ -22,12 +22,6 @@ c.s += 0.2;
 c + ""; // #c62dcd
 ```
 
-Or to find the perceptual halfway point between steelblue and brown:
-
-```js
-interpolateLab("steelblue", "brown")(0.5); // #8e5c6d
-```
-
 In addition to the ubiquitous and machine-friendly [RGB](#rgb) and [HSL](#hsl) color space, d3-color supports two color spaces that are designed for humans:
 
 * Dave Green’s [Cubehelix](#cubehelix)
@@ -115,72 +109,10 @@ Constructs a new [Cubehelix](https://www.mrao.cam.ac.uk/~dag/CUBEHELIX/) color.
 
 If *h*, *s* and *l* are specified, these represent the channel values of the returned color. If a CSS Color Module Level 3 *specifier* string is specified, it is parsed and then converted to the Cubehelix color space. See [color](#color) for examples. If a [*color*](#color) instance is specified, it is converted to the RGB color space using [*color*.rgb](#color_rgb) and then converted to Cubehelix. (Colors already in the Cubehelix color space skip the conversion to RGB.)
 
-<a name="interpolateRgb" href="#interpolateRgb">#</a> <b>interpolateRgb</b>(<i>a</i>, <i>b</i>)
-
-![interpolateRgb](https://cloud.githubusercontent.com/assets/230541/8027976/07e91580-0d58-11e5-8d3f-4c50f152a2e3.png)
-
-Returns an RGB color space interpolator between the two colors *a* and *b*. The colors *a* and *b* need not be in RGB; they will be converted to RGB using [rgb](#rgb). The return value of the interpolator is a hexadecimal RGB string.
-
-<a name="interpolateHsl" href="#interpolateHsl">#</a> <b>interpolateHsl</b>(<i>a</i>, <i>b</i>)
-
-![interpolatehsl](https://cloud.githubusercontent.com/assets/230541/8027979/07fec100-0d58-11e5-90df-dc458ae7af10.png)
-
-Returns an HSL color space interpolator between the two colors *a* and *b*. The colors *a* and *b* need not be in HSL; they will be converted to HSL using [hsl](#hsl). If either color’s hue or saturation is NaN, the opposing color’s channel value is used. The shortest path between hues is used. The return value of the interpolator is a hexadecimal RGB string.
-
-<a name="interpolateHslLong" href="#interpolateHslLong">#</a> <b>interpolateHslLong</b>(<i>a</i>, <i>b</i>)
-
-![interpolatehsllong](https://cloud.githubusercontent.com/assets/230541/8028057/bae888b8-0d59-11e5-983a-a460a59ae4ab.png)
-
-Like [interpolateHsl](#interpolateHsl), but does not use the shortest path between hues.
-
-<a name="interpolateLab" href="#interpolateLab">#</a> <b>interpolateLab</b>(<i>a</i>, <i>b</i>)
-
-![interpolatelab](https://cloud.githubusercontent.com/assets/230541/8027977/07eaea04-0d58-11e5-8f4f-b739eb842549.png)
-
-Returns a Lab color space interpolator between the two colors *a* and *b*. The colors *a* and *b* need not be in Lab; they will be converted to Lab using [lab](#lab). The return value of the interpolator is a hexadecimal RGB string.
-
-<a name="interpolateHcl" href="#interpolateHcl">#</a> <b>interpolateHcl</b>(<i>a</i>, <i>b</i>)
-
-![interpolatehcl](https://cloud.githubusercontent.com/assets/230541/8027978/07f91002-0d58-11e5-92f0-f06899907c6a.png)
-
-Returns an HCL color space interpolator between the two colors *a* and *b*. The colors *a* and *b* need not be in HCL; they will be converted to HCL using [hcl](#hcl). If either color’s hue or chroma is NaN, the opposing color’s channel value is used. The shortest path between hues is used. The return value of the interpolator is a hexadecimal RGB string.
-
-<a name="interpolateHclLong" href="#interpolateHclLong">#</a> <b>interpolateHclLong</b>(<i>a</i>, <i>b</i>)
-
-![interpolatehcllong](https://cloud.githubusercontent.com/assets/230541/8028056/bad85786-0d59-11e5-9c22-6c23215779fa.png)
-
-Like [interpolateHcl](#interpolateHcl), but does not use the shortest path between hues.
-
-<a name="interpolateCubehelix" href="#interpolateCubehelix">#</a> <b>interpolateCubehelix</b>(<i>a</i>, <i>b</i>)
-
-![interpolatecubehelix](https://cloud.githubusercontent.com/assets/230541/8027999/737cde08-0d58-11e5-8130-36e2437996ee.png)
-
-Returns a Cubehelix color space interpolator between the two colors *a* and *b* using the default *gamma* of 1.0. The colors *a* and *b* need not be in Cubehelix; they will be converted to Cubehelix using [cubehelix](#cubehelix). If either color’s hue or saturation is NaN, the opposing color’s channel value is used. The shortest path between hues is used. The return value of the interpolator is a hexadecimal RGB string.
-
-<a name="interpolateCubehelixLong" href="#interpolateCubehelixLong">#</a> <b>interpolateCubehelixLong</b>(<i>a</i>, <i>b</i>)
-
-![interpolatecubehelixlong](https://cloud.githubusercontent.com/assets/230541/8028055/bad68424-0d59-11e5-8f0f-1ecdbd8e46c8.png)
-
-Like [interpolateCubehelix](#interpolateCubehelix), but does not use the shortest path between hues.
-
-<a name="interpolateCubehelixGamma" href="#interpolateCubehelixGamma">#</a> <b>interpolateCubehelixGamma</b>(<i>gamma</i>)
-
-Returns a Cubehelix color space interpolator factory using the specified *gamma*. A gamma value less than one emphasizes low intensity values, while a gamma value greater than one emphasizes high intensity values. For example:
-
-```js
-var i = interpolateCubehelixGamma(1.5)("red", "blue");
-```
-
-<a name="interpolateCubehelixGammaLong" href="#interpolateCubehelixGammaLong">#</a> <b>interpolateCubehelixGammaLong</b>(<i>gamma</i>)
-
-Like [interpolateCubehelixGamma](#interpolateCubehelixGamma), but does not use the shortest path between hues.
-
 ## Changes from D3 3.x:
 
 * A new [cubehelix](#cubehelix) color space!
 
-* New “long” methods for hue interpolation in [HSL](#interpolateHslLong), [HCL](#interpolateHclLong) and [Cubehelix](#interpolateCubehelixLong).
-
 * A new [color](#color) method parses the specified string according to the CSS specification and returns the corresponding color in its color space. For HSL color values, this is the HSL color space; for other values, the RGB color space is used. This method correctly parses RGB colors with percentages (e.g., `rgb(30%,40%,50%)`). Decimal values where integers are required are no longer allowed (e.g., `rgb(100.5,0,0)` is not a valid color).
 
 * The [*color*.brighter](#color_brighter) method no longer special-cases behavior for black and very dark channels in RGB; it is now a simple channel multiplier, consistent with [*color*.darker](#color_darker) and other color spaces.

diff --git a/index.js b/index.js
@@ -4,15 +4,3 @@ export {default as hsl} from "./src/hsl";
 export {default as lab} from "./src/lab";
 export {default as hcl} from "./src/hcl";
 export {default as cubehelix} from "./src/cubehelix";
-export {default as interpolateRgb} from "./src/interpolateRgb";
-export {default as interpolateHsl} from "./src/interpolateHsl";
-export {default as interpolateHslLong} from "./src/interpolateHslLong";
-export {default as interpolateLab} from "./src/interpolateLab";
-export {default as interpolateHcl} from "./src/interpolateHcl";
-export {default as interpolateHclLong} from "./src/interpolateHclLong";
-
-import interpolateCubehelixGamma from "./src/interpolateCubehelixGamma";
-import interpolateCubehelixGammaLong from "./src/interpolateCubehelixGammaLong";
-export var interpolateCubehelix = interpolateCubehelixGamma(1);
-export var interpolateCubehelixLong = interpolateCubehelixGammaLong(1);
-export {interpolateCubehelixGamma, interpolateCubehelixGammaLong};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3-color",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "description": "Color spaces! RGB, HSL, Cubehelix, Lab and HCL (Lch).",
   "keywords": [
     "d3",

diff --git a/src/deltaHue.js b/src/deltaHue.js
diff --git a/src/interpolateCubehelixGamma.js b/src/interpolateCubehelixGamma.js
diff --git a/src/interpolateCubehelixGammaLong.js b/src/interpolateCubehelixGammaLong.js
diff --git a/src/interpolateHcl.js b/src/interpolateHcl.js
diff --git a/src/interpolateHclLong.js b/src/interpolateHclLong.js
diff --git a/src/interpolateHsl.js b/src/interpolateHsl.js
diff --git a/src/interpolateHslLong.js b/src/interpolateHslLong.js
diff --git a/src/interpolateLab.js b/src/interpolateLab.js
diff --git a/src/interpolateRgb.js b/src/interpolateRgb.js
diff --git a/src/rgb.js b/src/rgb.js
@@ -47,12 +47,11 @@ prototype.displayable = function() {
 };
 
 prototype.toString = function() {
-  return format(this.r, this.g, this.b);
-};
-
-export function format(r, g, b) {
+  var r = Math.round(this.r),
+      g = Math.round(this.g),
+      b = Math.round(this.b);
   return "#"
-      + (isNaN(r) ? "00" : (r = Math.round(r)) < 16 ? "0" + Math.max(0, r).toString(16) : Math.min(255, r).toString(16))
-      + (isNaN(g) ? "00" : (g = Math.round(g)) < 16 ? "0" + Math.max(0, g).toString(16) : Math.min(255, g).toString(16))
-      + (isNaN(b) ? "00" : (b = Math.round(b)) < 16 ? "0" + Math.max(0, b).toString(16) : Math.min(255, b).toString(16));
+      + (isNaN(r) || r <= 0 ? "00" : r < 16 ? "0" + r.toString(16) : r >= 255 ? "ff" : r.toString(16))
+      + (isNaN(g) || r <= 0 ? "00" : g < 16 ? "0" + g.toString(16) : g >= 255 ? "ff" : g.toString(16))
+      + (isNaN(b) || r <= 0 ? "00" : b < 16 ? "0" + b.toString(16) : b >= 255 ? "ff" : b.toString(16));
 };
diff --git a/test/interpolateHcl-test.js b/test/interpolateHcl-test.js