aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wqflask/wqflask/templates/marker_regression_gn1.html6
-rw-r--r--wqflask/wqflask/views.py16
2 files changed, 3 insertions, 19 deletions
diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html
index 7aceabee..268e3e1c 100644
--- a/wqflask/wqflask/templates/marker_regression_gn1.html
+++ b/wqflask/wqflask/templates/marker_regression_gn1.html
@@ -414,8 +414,8 @@
provides_entrypoints: true
});
BD.putSource({name: 'Genotype',
- controlURI: gn_server_url+"/api_pre1/genotype/mouse/BXD.json",
- URIBase: gn_server_url+"/api_pre1/genotype/mouse/",
+ controlURI: "{{gn_server_url}}/api_pre1/genotype/mouse/BXD.json",
+ URIBase: "{{gn_server_url}}/api_pre1/genotype/mouse/",
tier_type: 'rqtl-genotype',
vOffset: 8,
pinned: true,
@@ -480,7 +480,7 @@
}],
});
BD.putSource({name: 'SNP density',
- jbURI: gn_server_url+"/api_pre1/snp",
+ jbURI: "{{gn_server_url}}/api_pre1/snp",
jbQuery: "",
refetchOnZoom: true,
style: [{
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 8d5eadb6..9fdaabf3 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -559,22 +559,6 @@ def marker_regression_page():
with Bench("Rendering template"):
rendered_template = render_template("marker_regression_gn1.html", **gn1_template_vars)
- # with Bench("Rendering template"):
- # if result['pair_scan'] == True:
- # img_path = result['pair_scan_filename']
- # logger.info("img_path:", img_path)
- # initial_start_vars = request.form
- # logger.info("initial_start_vars:", initial_start_vars)
- # imgfile = open(TEMPDIR + '/' + img_path, 'rb')
- # imgdata = imgfile.read()
- # imgB64 = imgdata.encode("base64")
- # bytesarray = array.array('B', imgB64)
- # result['pair_scan_array'] = bytesarray
- # rendered_template = render_template("pair_scan_results.html", **result)
- # else:
- # rendered_template = render_template("marker_regression.html", **result)
- # rendered_template = render_template("marker_regression_gn1.html", **gn1_template_vars)
-
return rendered_template