Skip to content

Commit

Permalink
Merge pull request #1566 from palantir/release-v0.42.0
Browse files Browse the repository at this point in the history
Release v0.42.0 (--> master)
  • Loading branch information
jtlan committed Jan 30, 2015
2 parents 3da788d + 32be219 commit e2c8d90
Show file tree
Hide file tree
Showing 39 changed files with 1,521 additions and 81 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plottable",
"description": "A library for creating charts out of D3",
"version": "0.41.1",
"version": "0.42.0",
"main": ["plottable.js", "plottable.css"],
"license": "MIT",
"ignore": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plottable.js",
"description": "A library for creating charts out of D3",
"version": "0.41.1",
"version": "0.42.0",
"repository": {
"type": "git",
"url": "https://github.com/palantir/plottable.git"
Expand Down
7 changes: 7 additions & 0 deletions plottable.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ svg.plottable {
}

.plottable .legend text {
fill: #32313F;
font-family: "Helvetica Neue", sans-serif;
font-size: 12px;
font-weight: bold;
Expand All @@ -134,6 +135,12 @@ svg.plottable {
fill: #d3d3d3;
}

.plottable .interpolated-color-legend rect.swatch-bounding-box {
fill: none;
stroke: #CCC;
stroke-width: 1px;
}

.plottable .plot.toggled-on {
visibility:visible;
}
Expand Down
68 changes: 62 additions & 6 deletions plottable.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ declare module Plottable {
function getSVGPixelWidth(svg: D3.Selection): number;
function translate(s: D3.Selection, x?: number, y?: number): any;
function boxesOverlap(boxA: ClientRect, boxB: ClientRect): boolean;
function boxIsInside(inner: ClientRect, outer: ClientRect): boolean;
}
}
}
Expand Down Expand Up @@ -1513,6 +1514,7 @@ declare module Plottable {
* @returns {D3.Selection} the renderArea selection
*/
_getRenderArea(): D3.Selection;
_getSelector(): string;
}
}
}
Expand All @@ -1525,6 +1527,7 @@ declare module Plottable {
setup(area: D3.Selection): void;
protected _numberOfAnimationIterations(data: any[]): number;
protected _drawStep(step: AppliedDrawStep): void;
_getSelector(): string;
}
}
}
Expand All @@ -1542,6 +1545,7 @@ declare module Plottable {
drawLine(draw: boolean): Area;
setup(area: D3.Selection): void;
protected _drawStep(step: AppliedDrawStep): void;
_getSelector(): string;
}
}
}
Expand All @@ -1561,6 +1565,7 @@ declare module Plottable {
protected _enterData(data: any[]): void;
protected _prepareDrawSteps(drawSteps: AppliedDrawStep[]): void;
protected _prepareData(data: any[], drawSteps: AppliedDrawStep[]): any[];
_getSelector(): string;
}
}
}
Expand Down Expand Up @@ -2368,6 +2373,62 @@ declare module Plottable {
}


declare module Plottable {
module Component {
class InterpolatedColorLegend extends AbstractComponent {
/**
* The css class applied to the legend labels.
*/
static LEGEND_LABEL_CLASS: string;
/**
* Creates an InterpolatedColorLegend.
*
* The InterpolatedColorLegend consists of a sequence of swatches, showing the
* associated Scale.InterpolatedColor sampled at various points. Two labels
* show the maximum and minimum values of the Scale.InterpolatedColor.
*
* @constructor
* @param {Scale.InterpolatedColor} interpolatedColorScale
* @param {string} orientation (horizontal/left/right).
* @param {Formatter} The labels are formatted using this function.
*/
constructor(interpolatedColorScale: Scale.InterpolatedColor, orientation?: string, formatter?: (d: any) => string);
remove(): void;
/**
* Gets the current formatter on the InterpolatedColorLegend.
*
* @returns {Formatter} The current Formatter.
*/
formatter(): Formatter;
/**
* Sets the current formatter on the InterpolatedColorLegend.
*
* @param {Formatter} formatter If provided, data will be passed though `formatter(data)`.
* @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
*/
formatter(formatter: Formatter): InterpolatedColorLegend;
/**
* Gets the orientation of the InterpolatedColorLegend.
*
* @returns {string} The current orientation.
*/
orient(): string;
/**
* Sets the orientation of the InterpolatedColorLegend.
*
* @param {string} newOrientation The desired orientation (horizontal/left/right).
*
* @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
*/
orient(newOrientation: string): InterpolatedColorLegend;
protected _setup(): void;
_requestedSpace(offeredWidth: number, offeredHeight: number): _SpaceRequest;
_doRender(): void;
}
}
}


declare module Plottable {
module Component {
class Gridlines extends AbstractComponent {
Expand Down Expand Up @@ -2646,6 +2707,7 @@ declare module Plottable {
* @param {string} key The key of new dataset
*/
protected _getPlotMetadataForDataset(key: string): PlotMetadata;
getAllSelections(): D3.Selection;
}
}
}
Expand Down Expand Up @@ -2860,12 +2922,6 @@ declare module Plottable {
* @returns {Bar} The calling plot.
*/
barLabelFormatter(formatter: Formatter): Bar<X, Y>;
/**
* Gets all the bars in the bar plot
*
* @returns {D3.Selection} All of the bars in the bar plot.
*/
getAllBars(): D3.Selection;
/**
* Gets the bar under the given pixel position (if [xValOrExtent]
* and [yValOrExtent] are {number}s), under a given line (if only one
Expand Down
Loading

0 comments on commit e2c8d90

Please sign in to comment.