diff options
| author | Pjotr Prins | 2016-10-11 12:12:45 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-10-11 12:12:45 +0000 |
| commit | 2dd01d1dfc93a7fce59be7e817a2dd5536b3e95e (patch) | |
| tree | 679c170f84b57d9a98751f9690e7737e6e2243c8 | |
| parent | f942b4b6c0818010be9b9d245d9e02d2f466f29e (diff) | |
| parent | 83774eb60deda8897c89cf29cf91065e02348115 (diff) | |
| download | genenetwork2-2dd01d1dfc93a7fce59be7e817a2dd5536b3e95e.tar.gz | |
Merge branch 'biodalliance' of github.com:chfi/genenetwork2 into chfi
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/biodalliance.js | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/marker_regression_gn1.html | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/wqflask/wqflask/static/new/javascript/biodalliance.js b/wqflask/wqflask/static/new/javascript/biodalliance.js index 3cfc26eb..3b9e3b7f 100644 --- a/wqflask/wqflask/static/new/javascript/biodalliance.js +++ b/wqflask/wqflask/static/new/javascript/biodalliance.js @@ -23,7 +23,7 @@ BD.createBrowser = function(chr, start, end, speciesName, sources) { sources: sources, - maxHeight: 1000, + maxHeight: 1400, setDocumentTitle: false, prefix: '/dalliance/', workerPrefix: 'build/', diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html index c213e60c..a39da73a 100644 --- a/wqflask/wqflask/templates/marker_regression_gn1.html +++ b/wqflask/wqflask/templates/marker_regression_gn1.html @@ -416,7 +416,8 @@ BD.putSource({name: 'Genotype', controlURI: "http://test-gn2.genenetwork.org/api_pre1/genotype/mouse/BXD.json", URIBase: "http://test-gn2.genenetwork.org/api_pre1/genotype/mouse/", - tier_type: 'rqtl-genotype', + tier_type: 'rqtl-genotype', + vOffset: 8, pinned: true, transposed: true, style: [ @@ -469,6 +470,7 @@ type: 'default', style: { glyph: "LINEPLOT", + AUTOMAX: "true", MIN: 0, MAX: 3, HEIGHT: 200, @@ -480,12 +482,14 @@ BD.putSource({name: 'SNP density', jbURI: "http://test-gn2.genenetwork.org/api_pre1/snp", jbQuery: "", + refetchOnZoom: true, style: [{ type: 'default', style: { glyph: "HISTOGRAM", MIN: 0, MAX: 5000, + AUTOMAX: "true", HEIGHT: 60, STEPS: 100, COLOR1: "red", |