aboutsummaryrefslogtreecommitdiff
path: root/gn2/wqflask/marker_regression
diff options
context:
space:
mode:
authorzsloan2024-03-21 20:46:14 +0000
committerzsloan2024-03-21 20:46:14 +0000
commit5fa946c9da7896fbc5c588f339653e1b5c749269 (patch)
treec61cfef767ea0ab5e5495feee83ff2d1ea650503 /gn2/wqflask/marker_regression
parent55ab13bd0c60b5399485360fc76115d574e1a2e6 (diff)
downloadgenenetwork2-5fa946c9da7896fbc5c588f339653e1b5c749269.tar.gz
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
Diffstat (limited to 'gn2/wqflask/marker_regression')
-rw-r--r--gn2/wqflask/marker_regression/display_mapping_results.py13
1 files changed, 8 insertions, 5 deletions
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: