diff options
| author | zsloan | 2017-02-06 14:25:45 -0600 |
|---|---|---|
| committer | GitHub | 2017-02-06 14:25:45 -0600 |
| commit | 89bf4e8f32f52f412f5208961f311d25334f5975 (patch) | |
| tree | f94b06fe136f2b021e1fc63717643ec901ca4844 /wqflask | |
| parent | 401484b1ffc5251029d8e5c7643bfc0dbf415488 (diff) | |
| parent | 160503c3c04ca19c9262d5c3b6100b7ac2242e0e (diff) | |
| download | genenetwork2-89bf4e8f32f52f412f5208961f311d25334f5975.tar.gz | |
Merge pull request #242 from zsloan/master
Mapping results figure now correctly says whether GEMMA was used as m…
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression_gn1.py | 5 |
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) |