From 5fa946c9da7896fbc5c588f339653e1b5c749269 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 21 Mar 2024 20:46:14 +0000
Subject: Fix issue where Haplotype band could overlap with Homology band (plus
 other spacing issues related to the Homology band)

Change Homology track colors to be more color-blind friendly
---
 gn2/wqflask/marker_regression/display_mapping_results.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'gn2')

diff --git a/gn2/wqflask/marker_regression/display_mapping_results.py b/gn2/wqflask/marker_regression/display_mapping_results.py
index b55b772e..0f1df3ec 100644
--- a/gn2/wqflask/marker_regression/display_mapping_results.py
+++ b/gn2/wqflask/marker_regression/display_mapping_results.py
@@ -213,9 +213,9 @@ class DisplayMappingResults:
     DOMINANCE_COLOR_NEGATIVE = RED
 
     # BEGIN HaplotypeAnalyst
-    HAPLOTYPE_POSITIVE = GREEN
-    HAPLOTYPE_NEGATIVE = RED
-    HAPLOTYPE_HETEROZYGOUS = BLUE
+    HAPLOTYPE_POSITIVE = BLUE
+    HAPLOTYPE_NEGATIVE = YELLOW
+    HAPLOTYPE_HETEROZYGOUS = GREEN
     HAPLOTYPE_RECOMBINATION = DARKGRAY
     # END HaplotypeAnalyst
 
@@ -1824,8 +1824,11 @@ class DisplayMappingResults:
 
                         # Draw Genes
 
-                        geneYLocation = yPaddingTop + self.NUM_GENE_ROWS * \
-                            (self.EACH_GENE_HEIGHT) * zoom
+                        geneYLocation = yPaddingTop
+                        if (self.geneChecked and self.geneCol):
+                            geneYLocation += self.NUM_GENE_ROWS * self.EACH_GENE_HEIGHT * zoom
+                        if (self.homologyChecked and self.homology):
+                            geneYLocation += self.NUM_GENE_ROWS * self.EACH_GENE_HEIGHT * zoom
                         if self.dataset.group.species == "mouse" or self.dataset.group.species == "rat":
                             geneYLocation += 4 * self.BAND_HEIGHT + 4 * self.BAND_SPACING
                         else:
-- 
cgit v1.2.3