From d666a8da6bd9573cb79655810da437cc14086e4e Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 24 Sep 2019 13:12:34 -0500
Subject: Fixed issue that caused zooming for mapping to not work (that was
 caused by the fix for zooming into temp trait mapping results)

---
 wqflask/wqflask/marker_regression/display_mapping_results.py | 2 +-
 wqflask/wqflask/marker_regression/run_mapping.py             | 3 +--
 2 files changed, 2 insertions(+), 3 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 ef0cfdc5..f3755758 100644
--- a/wqflask/wqflask/marker_regression/display_mapping_results.py
+++ b/wqflask/wqflask/marker_regression/display_mapping_results.py
@@ -159,7 +159,7 @@ class DisplayMappingResults(object):
         if 'first_run' in start_vars:
             self.first_run = start_vars['first_run']
 
-        if 'temp_trait' in start_vars:
+        if 'temp_trait' in start_vars and start_vars['temp_trait'] != "False":
             self.temp_trait = "True"
             self.group = start_vars['group']
 
diff --git a/wqflask/wqflask/marker_regression/run_mapping.py b/wqflask/wqflask/marker_regression/run_mapping.py
index 7c526f33..9e06aa00 100644
--- a/wqflask/wqflask/marker_regression/run_mapping.py
+++ b/wqflask/wqflask/marker_regression/run_mapping.py
@@ -49,13 +49,12 @@ logger = utility.logger.getLogger(__name__ )
 class RunMapping(object):
 
     def __init__(self, start_vars, temp_uuid):
-
         helper_functions.get_species_dataset_trait(self, start_vars)
 
         self.temp_uuid = temp_uuid #needed to pass temp_uuid to gn1 mapping code (marker_regression_gn1.py)
 
         #ZS: Needed to zoom in or remap temp traits like PCA traits
-        if "temp_trait" in start_vars:
+        if "temp_trait" in start_vars and start_vars['temp_trait'] != "False":
             self.temp_trait = "True"
             self.group = self.dataset.group.name
 
-- 
cgit v1.2.3