aboutsummaryrefslogtreecommitdiff
path: root/gn2/wqflask/marker_regression
diff options
context:
space:
mode:
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: