diff options
author | Lei Yan | 2013-10-17 16:55:07 -0500 |
---|---|---|
committer | Lei Yan | 2013-10-17 16:55:07 -0500 |
commit | 2a1f08bcecf6273390997d122d552a01e0311e40 (patch) | |
tree | 610b3048493c64b9b93fba14ceaa7981237d9e5f /web | |
parent | 2085f376bc1a6fbb1a2d66f2220552e7c2baffdb (diff) | |
parent | da0526b9d870ba937fcf860c40731c9d96eb9f63 (diff) | |
download | genenetwork2-2a1f08bcecf6273390997d122d552a01e0311e40.tar.gz |
Merge /home/zas1024/gene
Conflicts:
wqflask/wqflask/views.py
Diffstat (limited to 'web')
-rwxr-xr-x | web/webqtl/intervalMapping/IntervalMappingPage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/webqtl/intervalMapping/IntervalMappingPage.py b/web/webqtl/intervalMapping/IntervalMappingPage.py index 4bdf45ab..c3ef1cbd 100755 --- a/web/webqtl/intervalMapping/IntervalMappingPage.py +++ b/web/webqtl/intervalMapping/IntervalMappingPage.py @@ -2038,7 +2038,7 @@ class IntervalMappingPage(templatePage): qtlresult = self.genotype.regression(strains = _strains, trait = _vals) self.qtlresults.append(qtlresult) - + if not self.multipleInterval: if self.controlLocus and self.selectedChr > -1: self.genotype.chromosome = [self.genotype[self.selectedChr]] |