aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2017-02-06 20:24:10 +0000
committerzsloan2017-02-06 20:24:10 +0000
commit160503c3c04ca19c9262d5c3b6100b7ac2242e0e (patch)
treef94b06fe136f2b021e1fc63717643ec901ca4844 /wqflask
parent21b964eca809a1468459ac3bbfc3ee0b2b8545fa (diff)
downloadgenenetwork2-160503c3c04ca19c9262d5c3b6100b7ac2242e0e.tar.gz
Mapping results figure now correctly says whether GEMMA was used as mapping method.
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/marker_regression/marker_regression_gn1.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
index 814ffb30..392ad745 100644
--- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py
+++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
@@ -1188,7 +1188,10 @@ class MarkerRegression(object):
if self.controlLocus and self.doControl != "false":
string2 = 'Using %s as control' % self.controlLocus
else:
- string2 = 'Using Haldane mapping function with no control for other QTLs'
+ if self.mapping_method == "gemma":
+ string2 = 'Using GEMMA mapping method with no control for other QTLs.'
+ else:
+ string2 = 'Using Haldane mapping function with no control for other QTLs'
d = 4+ max(canvas.stringWidth(string1,font=labelFont),canvas.stringWidth(string2,font=labelFont))
if self.this_trait.name:
identification = "Trait ID: %s : %s" % (self.dataset.fullname, self.this_trait.name)