From 49bf0293608154676e18846c964d700b11a2ad7a Mon Sep 17 00:00:00 2001 From: nicgirault Date: Sat, 11 Mar 2017 09:10:11 +0100 Subject: [PATCH 1/2] test heatmap opacity --- src/tracks/Heatmap.test.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/tracks/Heatmap.test.js b/src/tracks/Heatmap.test.js index 6755d88..a73fc29 100644 --- a/src/tracks/Heatmap.test.js +++ b/src/tracks/Heatmap.test.js @@ -23,7 +23,12 @@ describe('Heatmap', () => { {block_id: 'chr1', start: 1000001, end: 2000000, value: 2}, {block_id: 'chr2', start: 0, end: 1000000, value: 3}, {block_id: 'chr2', start: 1000001, end: 2000000, value: 4} - ]) + ], + { + color: 'Spectral', + opacity: 0.8 + } + ) .render() const expectedColors = [ @@ -38,6 +43,7 @@ describe('Heatmap', () => { forEach(tiles.nodes(), (tileNode, i) => { const tile = select(tileNode) expect(tile.attr('fill')).to.equal(expectedColors[i]) + expect(tile.attr('opacity')).to.equal('0.8') }) }) }) From eaf9bcd581768cfdf2c71ca68185fe1c76e45087 Mon Sep 17 00:00:00 2001 From: nicgirault Date: Sat, 11 Mar 2017 09:14:22 +0100 Subject: [PATCH 2/2] fix line example --- demo/line/index.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/demo/line/index.js b/demo/line/index.js index 97618c2..dca66e2 100644 --- a/demo/line/index.js +++ b/demo/line/index.js @@ -20,7 +20,15 @@ var gieStainColor = { } var drawCircos = function (error, GRCh37, cytobands, snp250, snp, snp1m) { - cytobands = cytobands.map(function (d) { + GRCh37 = GRCh37.filter(function (d) { + return d.id === 'chr1' || d.id === 'chr2' || d.id === 'chr3' + }) + + cytobands = cytobands + .filter(function (d) { + return d.chrom === 'chr1' || d.chrom === 'chr2' || d.chrom === 'chr3' + }) + .map(function (d) { return { block_id: d.chrom, start: parseInt(d.chromStart),