aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2016-01-15 00:05:45 +0000
committerzsloan2016-01-15 00:05:45 +0000
commit3078d459efda0f4805fbf3cb18297bcdc74dc420 (patch)
tree0e74a7cf98356479d57323c81edee8171872d88e
parent6c49d8bcf0c17057b441d4985b5813a13c990c2b (diff)
downloadgenenetwork2-3078d459efda0f4805fbf3cb18297bcdc74dc420.tar.gz
Cofactor now works with reaper
-rwxr-xr-xwqflask/wqflask/marker_regression/marker_regression.py5
-rwxr-xr-xwqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js16
2 files changed, 10 insertions, 11 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 605fde63..d3ee344d 100755
--- a/wqflask/wqflask/marker_regression/marker_regression.py
+++ b/wqflask/wqflask/marker_regression/marker_regression.py
@@ -109,7 +109,6 @@ class MarkerRegression(object):
self.pair_scan = True
results = self.run_rqtl_geno()
- #print("qtl_results:", results)
elif self.mapping_method == "reaper":
if start_vars['num_perm'] == "":
self.num_perm = 0
@@ -121,7 +120,6 @@ class MarkerRegression(object):
results = self.gen_reaper_results()
elif self.mapping_method == "plink":
results = self.run_plink()
- #print("qtl_results:", pf(results))
elif self.mapping_method == "pylmm":
print("RUNNING PYLMM")
self.num_perm = start_vars['num_perm']
@@ -621,9 +619,10 @@ class MarkerRegression(object):
print("samples:", trimmed_samples)
if self.control != "" and self.do_control == "true":
+ print("CONTROL IS:", self.control)
reaper_results = genotype.regression(strains = trimmed_samples,
trait = trimmed_values,
- control = self.control)
+ control = str(self.control))
else:
reaper_results = genotype.regression(strains = trimmed_samples,
trait = trimmed_values)
diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
index a48ac2b7..3637233e 100755
--- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
@@ -223,14 +223,6 @@
};
})(this));
- $("#interval_mapping_compute").on("mouseover", (function(_this) {
- return function() {
- if ($(".outlier").length && $(".outlier-alert").length < 1) {
- return showalert(outlier_text, "alert-success outlier-alert");
- }
- };
- })(this));
-
$("#interval_mapping_compute").on("click", (function(_this) {
return function() {
var form_data, url;
@@ -250,6 +242,14 @@
};
})(this));
+ $("#interval_mapping_compute").on("mouseover", (function(_this) {
+ return function() {
+ if ($(".outlier").length && $(".outlier-alert").length < 1) {
+ return showalert(outlier_text, "alert-success outlier-alert");
+ }
+ };
+ })(this));
+
composite_mapping_fields = function() {
return $(".composite_fields").toggle();
};