From 85a384dc779a49f02ccee3088356e4873eacbd9a Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 6 Aug 2020 12:29:13 -0500
Subject: Made a change that should fix the issue with the Y axis ticks
 extending too high in mapping results *
 wqflask/wqflask/marker_regression/display_mapping_results.py - When in ful
 genome view, I changed it to subject the yTopOffset when drawing the Y axis;
 single chromosome view seems to work okay so it's conditional on that

---
 .../wqflask/marker_regression/display_mapping_results.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/marker_regression/display_mapping_results.py b/wqflask/wqflask/marker_regression/display_mapping_results.py
index 9ac4946b..75c1a8cd 100644
--- a/wqflask/wqflask/marker_regression/display_mapping_results.py
+++ b/wqflask/wqflask/marker_regression/display_mapping_results.py
@@ -1737,9 +1737,17 @@ class DisplayMappingResults(object):
         LRSLODFont=pid.Font(ttf="verdana", size=18*zoom*1.5, bold=0)
 
         yZero = yTopOffset + plotHeight
-        LRSHeightThresh = drawAreaHeight
-        AdditiveHeightThresh = drawAreaHeight/2
-        DominanceHeightThresh = drawAreaHeight/2
+        # LRSHeightThresh = drawAreaHeight
+        # AdditiveHeightThresh = drawAreaHeight/2
+        # DominanceHeightThresh = drawAreaHeight/2
+        if self.selectedChr == 1:
+            LRSHeightThresh = drawAreaHeight - yTopOffset + 30*(zoom - 1)
+            AdditiveHeightThresh = LRSHeightThresh/2
+            DominanceHeightThresh = LRSHeightThresh/2
+        else:
+            LRSHeightThresh = drawAreaHeight
+            AdditiveHeightThresh = drawAreaHeight/2
+            DominanceHeightThresh = drawAreaHeight/2
         # LRSHeightThresh = (yZero - yTopOffset + 30*(zoom - 1))
         # AdditiveHeightThresh = LRSHeightThresh/2
         # DominanceHeightThresh = LRSHeightThresh/2
@@ -1900,7 +1908,7 @@ class DisplayMappingResults(object):
                     startPosX += newStartPosX
                     oldStartPosX = newStartPosX
 
-            #ZS: This is beause the chromosome value stored in qtlresult['chr'] can be (for example) either X or 20 depending upon the mapping method/scale used
+            #ZS: This is because the chromosome value stored in qtlresult['chr'] can be (for example) either X or 20 depending upon the mapping method/scale used
             this_chr = str(self.ChrList[self.selectedChr][0])
             if self.plotScale != "physic":
                 this_chr = str(self.ChrList[self.selectedChr][1]+1)
-- 
cgit v1.2.3