diff options
| author | zsloan | 2020-12-02 14:19:06 -0600 |
|---|---|---|
| committer | GitHub | 2020-12-02 14:19:06 -0600 |
| commit | 68db4526f8da70358b0a018c59dd74fef8d28422 (patch) | |
| tree | 0234e10e68658efb289308e0fe78d4d9074fca44 /wqflask | |
| parent | 83d1dc24e2d527463e6aa7fd79c30e8242a5a312 (diff) | |
| parent | 668d6a97356030e0286365dad53c8d191c193290 (diff) | |
| download | genenetwork2-68db4526f8da70358b0a018c59dd74fef8d28422.tar.gz | |
Merge pull request #498 from zsloan/bug/heatmap_fix
Made changes that should fix Heatmap errors + removed a console.log i…
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/lodheatmap.js | 6 | ||||
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/panelutil.js | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/wqflask/wqflask/static/new/javascript/lodheatmap.js b/wqflask/wqflask/static/new/javascript/lodheatmap.js index 965a1d53..b82c95ad 100644 --- a/wqflask/wqflask/static/new/javascript/lodheatmap.js +++ b/wqflask/wqflask/static/new/javascript/lodheatmap.js @@ -44,7 +44,9 @@ lodheatmap = function() { _ref = data.chrnames; for (_i = 0, _len = _ref.length; _i < _len; _i++) { chr = _ref[_i]; - xLR[chr[0]] = getLeftRight(data.posByChr[chr[0]]); + if (data.posByChr[chr[0]].length > 0){ + xLR[chr[0]] = getLeftRight(data.posByChr[chr[0]]); + } } zmin = 0; zmax = 0; @@ -144,7 +146,7 @@ lodheatmap = function() { }).attr("stroke", "none").attr("stroke-width", "1").on("mouseover.paneltip", function(d) { yaxis.select("text#yaxis" + d.lodindex).attr("opacity", 1); d3.select(this).attr("stroke", "black"); - return celltip.show(d); + return celltip.show(d, this); }).on("mouseout.paneltip", function(d) { yaxis.select("text#yaxis" + d.lodindex).attr("opacity", 0); d3.select(this).attr("stroke", "none"); diff --git a/wqflask/wqflask/static/new/javascript/panelutil.js b/wqflask/wqflask/static/new/javascript/panelutil.js index 3c715c81..ea55a7cf 100644 --- a/wqflask/wqflask/static/new/javascript/panelutil.js +++ b/wqflask/wqflask/static/new/javascript/panelutil.js @@ -159,7 +159,6 @@ chrscales = function(data, width, chrGap, leftMargin, pad4heatmap, mappingScale) if (mappingScale == "morgan") { max_pos = d3.max(data.posByChr[chr[0]]) - console.log("max_pos:", max_pos) data.xscale[chr[0]] = d3.scale.linear().domain([chrStart[i], max_pos]).range([data.chrStart[i], data.chrEnd[i]]); } else { |