Skip to content

Commit 4c6ea9c

Browse files
author
Daniel W Mane
committed
Merge pull request #303 from palantir/0.8.0-merge-in-master
Merge 0.8.0 into master
2 parents 76c64c9 + d3cadb8 commit 4c6ea9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3381
-2361
lines changed

Diff for: ‎Gruntfile.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ module.exports = function(grunt) {
6666
},
6767
"rebuild": {
6868
"tasks": ["dev-compile"],
69-
"files": ["src/*.ts"]
69+
"files": ["src/**/*.ts"]
7070
},
7171
"tests": {
7272
"tasks": ["ts:test", "tslint"],
@@ -78,9 +78,9 @@ module.exports = function(grunt) {
7878
}
7979
},
8080
blanket_mocha: {
81-
all: ['test/tests.html'],
81+
all: ['test/coverage.html'],
8282
options: {
83-
threshold: 85
83+
threshold: 80
8484
}
8585
},
8686
connect: {
@@ -147,4 +147,5 @@ module.exports = function(grunt) {
147147

148148
grunt.registerTask("launch", ["connect", "dev-compile", "watch"]);
149149
grunt.registerTask("test", ["dev-compile", "blanket_mocha"]);
150+
grunt.registerTask("bm", ["blanket_mocha"]);
150151
};

Diff for: ‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "plottable",
3-
"version": "0.7.0",
3+
"version": "0.8.0",
44
"ignore": [
55
"**/*",
66
"!plottable.js",

Diff for: ‎examples/exampleUtil.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function makeRandomData(numPoints, scaleFactor) {
99
data.sort(function (a, b) {
1010
return a.x - b.x;
1111
});
12-
return { data: data, metadata: { cssClass: "random-data" } };
12+
return data;
1313
}
1414

1515
function makeNormallyDistributedData(n, xMean, xStdDev, yMean, yStdDev) {
@@ -85,10 +85,7 @@ function makeRandomBucketData(numBuckets, bucketWidth, maxValue) {
8585
y: Math.round(Math.random() * maxValue)
8686
});
8787
}
88-
return {
89-
"data": data,
90-
metadata: { cssClass: "random-buckets" }
91-
};
88+
return data;
9289
}
9390

9491
function generateHeightWeightData(n) {
@@ -104,8 +101,5 @@ function generateHeightWeightData(n) {
104101
});
105102
}
106103

107-
return {
108-
data: data,
109-
metadata: { cssClass: "height-weight-data" }
110-
};
104+
return data;
111105
}

Diff for: ‎examples/exampleUtil.ts

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
function makeRandomData(numPoints, scaleFactor=1): Plottable.IDataset {
1+
function makeRandomData(numPoints, scaleFactor=1): any[] {
22
var data = [];
33
for (var i = 0; i < numPoints; i++) {
44
var x = Math.random();
55
var r = {x: x, y: (x + x * Math.random()) * scaleFactor}
66
data.push(r);
77
}
88
data.sort((a: any, b: any) => a.x - b.x);
9-
return {data: data, metadata: {cssClass: "random-data"}};
9+
return data;
1010
}
1111

1212
function makeNormallyDistributedData(n=100, xMean?, xStdDev?, yMean?, yStdDev?) {
@@ -53,7 +53,7 @@ function binByVal(data: any[], accessor: Plottable.IAccessor, range=[0,100], nBi
5353
})
5454
return bins;
5555
}
56-
function makeRandomBucketData(numBuckets: number, bucketWidth: number, maxValue = 10): Plottable.IDataset {
56+
function makeRandomBucketData(numBuckets: number, bucketWidth: number, maxValue = 10): any[] {
5757
var data = [];
5858
for (var i=0; i < numBuckets; i++) {
5959
data.push({
@@ -62,10 +62,7 @@ function makeRandomBucketData(numBuckets: number, bucketWidth: number, maxValue
6262
y: Math.round(Math.random() * maxValue)
6363
});
6464
}
65-
return {
66-
"data": data,
67-
metadata: {cssClass: "random-buckets"}
68-
};
65+
return data;
6966
}
7067

7168
function generateHeightWeightData(n: number) {
@@ -81,8 +78,5 @@ function generateHeightWeightData(n: number) {
8178
});
8279
}
8380

84-
return {
85-
data: data,
86-
metadata: {cssClass: "height-weight-data"}
87-
};
81+
return data;
8882
}

Diff for: ‎examples/main-page/commit-dashboard.js

+20-22
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ function commitDashboard(dataManager, svg) {
4545
var scatterDateAxis = new Plottable.XAxis(timeScale, "bottom", dateFormatter);
4646

4747
var rScale = new Plottable.QuantitiveScale(d3.scale.log())
48-
.range([2, 12])
49-
.widenDomainOnData(commits, linesAddedAccessor);
48+
.range([2, 12]);
5049
function radiusAccessor(d) { return rScale.scale(linesAddedAccessor(d)); }
5150

5251
var scatterRenderer = new Plottable.CircleRenderer(commits, timeScale, scatterYScale)
53-
.xAccessor("date")
54-
.yAccessor(hourAccessor)
55-
.rAccessor(radiusAccessor)
56-
.colorAccessor(function(d) { return contributorColorScale.scale(d.name); });
52+
.project("x", "date")
53+
.project("y", hourAccessor)
54+
.project("r", linesAddedAccessor, rScale)
55+
.project("fill", "name", contributorColorScale);
56+
window.scatterRenderer = scatterRenderer;
5757

5858
var scatterGridlines = new Plottable.Gridlines(timeScale, scatterYScale);
5959
var scatterRenderArea = scatterGridlines.merge(scatterRenderer);
@@ -68,17 +68,14 @@ function commitDashboard(dataManager, svg) {
6868
var tscRenderers = {};
6969
dataManager.directories.forEach(function(dir) {
7070
var timeSeries = directoryTimeSeries[dir];
71-
var directoryDataset = {
72-
data: timeSeries,
73-
metadata: {}
74-
};
75-
var lineRenderer = new Plottable.LineRenderer(directoryDataset, timeScale, tscYScale);
76-
lineRenderer.xAccessor(function(d) { return d[0]; })
77-
.yAccessor(function(d) { return d[1]; })
78-
.colorAccessor(function(d) { return directoryColorScale.scale(dir); });
71+
var lineRenderer = new Plottable.LineRenderer(timeSeries, timeScale, tscYScale);
72+
lineRenderer.project("x", function(d) { return d[0]; })
73+
.project("y", function(d) { return d[1]; })
74+
.project("stroke", function() {return dir}, directoryColorScale);
7975
lineRenderer.classed(dir, true);
8076
tscRenderers[dir] = lineRenderer;
8177
tscRenderArea = tscRenderArea.merge(lineRenderer);
78+
window.lineRenderer = lineRenderer;
8279
});
8380

8481
var loadTSCData = function() {
@@ -102,17 +99,17 @@ function commitDashboard(dataManager, svg) {
10299
// ----- /Legends -----
103100

104101
// ----- Bar1: Lines changed by contributor -----
105-
var contributorBarYScale = new Plottable.LinearScale();
106-
var contributorBarYAxis = new Plottable.YAxis(contributorBarYScale, "right");
107102
var contributorBarXScale = new Plottable.OrdinalScale().domain(dataManager.contributors);
103+
var contributorBarYScale = new Plottable.LinearScale();
108104
var contributorBarXAxis = new Plottable.XAxis(contributorBarXScale, "bottom", function(d) { return d});
105+
var contributorBarYAxis = new Plottable.YAxis(contributorBarYScale, "right");
109106
contributorBarXAxis.classed("no-tick-labels", true).rowMinimum(5);
110107
var contributorBarRenderer = new Plottable.CategoryBarRenderer(linesByContributor,
111108
contributorBarXScale,
112109
contributorBarYScale);
113-
contributorBarRenderer.widthAccessor(40);
114-
contributorBarRenderer.colorAccessor(function(d) { return contributorColorScale.scale(d.name); });
115-
contributorBarRenderer.xAccessor("name").yAccessor(linesAddedAccessor);
110+
contributorBarRenderer.project("width", 40)
111+
.project("fill", "name", contributorColorScale)
112+
.project("x", "name").project("y", linesAddedAccessor);
116113
var contributorGridlines = new Plottable.Gridlines(null, contributorBarYScale);
117114
var contributorBarChart = new Plottable.Table([
118115
[contributorBarRenderer.merge(contributorGridlines), contributorBarYAxis],
@@ -129,9 +126,10 @@ function commitDashboard(dataManager, svg) {
129126
var directoryBarRenderer = new Plottable.CategoryBarRenderer(linesByDirectory,
130127
directoryBarXScale,
131128
directoryBarYScale);
132-
directoryBarRenderer.widthAccessor(40);
133-
directoryBarRenderer.colorAccessor(function(d) { return directoryColorScale.scale(d.directory); });
134-
directoryBarRenderer.xAccessor("directory").yAccessor(linesAddedAccessor);
129+
directoryBarRenderer.project("width", 40)
130+
.project("fill", "directory", directoryColorScale)
131+
.project("x", "directory")
132+
.project("y", linesAddedAccessor);
135133
var directoryGridlines = new Plottable.Gridlines(null, directoryBarYScale);
136134
var directoryBarChart = new Plottable.Table([
137135
[directoryBarRenderer.merge(directoryGridlines), directoryBarYAxis],

Diff for: ‎license_header.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
Plottable v0.7.0 (https://github.com/palantir/plottable)
2+
Plottable v0.8.0 (https://github.com/palantir/plottable)
33
Copyright 2014 Palantir Technologies
44
Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
55
*/

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "plottable.js",
3-
"version": "0.7.0",
3+
"version": "0.8.0",
44
"description": "Build flexible, performant, interactive charts using D3",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)