From 160503c3c04ca19c9262d5c3b6100b7ac2242e0e Mon Sep 17 00:00:00 2001
From: zsloan
Date: Mon, 6 Feb 2017 20:24:10 +0000
Subject: Mapping results figure now correctly says whether GEMMA was used as
 mapping method.

---
 wqflask/wqflask/marker_regression/marker_regression_gn1.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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)
-- 
cgit v1.2.3