From f50b54cc58462860546aa529ff24eb7cea2396df Mon Sep 17 00:00:00 2001 From: zsloan Date: Wed, 20 Apr 2016 18:42:06 +0000 Subject: Interval Mapping now correctly does interval mapping if Marker Regression isn't checked (it used to just "connect the dots" of the marker regression output) Changed "Manhattan Plot" label to "Marker Regr." to accurately reflect what the option does --- wqflask/wqflask/marker_regression/marker_regression.py | 3 +++ wqflask/wqflask/templates/show_trait_mapping_tools.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py index af320f65..32cdb9af 100644 --- a/wqflask/wqflask/marker_regression/marker_regression.py +++ b/wqflask/wqflask/marker_regression/marker_regression.py @@ -664,6 +664,9 @@ class MarkerRegression(object): def gen_reaper_results(self): genotype = self.dataset.group.read_genotype_file() + if self.manhattan_plot != True: + genotype = genotype.addinterval() + samples, values, variances = self.this_trait.export_informative() trimmed_samples = [] diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html index 620a4631..5d9b0278 100755 --- a/wqflask/wqflask/templates/show_trait_mapping_tools.html +++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html @@ -239,7 +239,7 @@
- +