Merge pull request #25 from nicgirault/v2

V2
nicgirault · Mar 11, 2017 · 99b8a06 · 99b8a06
2 parents dcc517e + eaf9bcd
commit 99b8a06
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git 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),

diff --git 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')
     })
   })
 })