From be458ca49557b93d2e5b8a0407d42f0a2fe9673f Mon Sep 17 00:00:00 2001
From: zsloan
Date: Fri, 9 Jun 2017 17:19:36 +0000
Subject: - Changed the way the genofile is set so different genofiles can be
 selected for mapping - Now shows error page for Correlation Matrix if traits
 aren't all from the same group (later need to make it check for shared
 samples, since different groups may contain some of the same samples -
 Mapping results page now displays the genofile in the information section -
 Only show Interval Analyst if species is mouse or rat (previously it would
 show a blank table for other species) - Network Graph now only shows links in
 a node's info if the relevant information (for example geneid) exists, and
 the label changes depending on the type of data set - Other minor changes to
 the appearance of the Network Graph menu (less white space, plus clickable
 descriptions for a couple options) - Improved Correlations Results page to
 shorten Description and Authors cell content for Phenotype traits (to keep
 table width manageable) - Changed the glossary links for LRS and Additive
 Effect columns for Gene Global Search - Improved appearance for Phenotype
 Global Search results - Temporarily removed Mapping options/features that
 don't work from the trait page

---
 wqflask/base/data_set.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 4959457a..dbdbb51c 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -169,7 +169,7 @@ def mescape(*items):
 class Markers(object):
     """Todo: Build in cacheing so it saves us reading the same file more than once"""
     def __init__(self, name):
-        json_data_fh = open(locate(name + '.json','genotype/json'))
+        json_data_fh = open(locate(name + ".json",'genotype/json'))
         try:
             markers = json.load(json_data_fh)
         except:
@@ -334,7 +334,10 @@ class DatasetGroup(object):
         else:
             marker_class = Markers            
 
-        self.markers = marker_class(self.name)
+        if self.genofile:
+            self.markers = marker_class(self.genofile[:-5])
+        else:
+            self.markers = marker_class(self.name)
 
     def get_f1_parent_strains(self):
         try:
-- 
cgit v1.2.3