diff options
| author | zsloan | 2016-04-20 18:42:06 +0000 |
|---|---|---|
| committer | zsloan | 2016-04-20 18:42:06 +0000 |
| commit | f50b54cc58462860546aa529ff24eb7cea2396df (patch) | |
| tree | d77e3a40d3d362f254fac388599ae2cbd76fe949 /wqflask | |
| parent | 18a444eef6253d425bf2e6dc613ca64ec881544e (diff) | |
| download | genenetwork2-f50b54cc58462860546aa529ff24eb7cea2396df.tar.gz | |
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
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression.py | 3 | ||||
| -rwxr-xr-x | wqflask/wqflask/templates/show_trait_mapping_tools.html | 2 |
2 files changed, 4 insertions, 1 deletions
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 @@ <div class="mapping_method_fields form-group"> - <label style="text-align:left;" class="col-xs-12 control-label">Manhattan Plot</label> + <label style="text-align:left;" class="col-xs-12 control-label">Marker Regr.</label> <div class="col-xs-12 controls"> <label class="radio-inline"> <input type="radio" name="manhattan_plot_reaper" value="true"> |