From 8a09358e98dbf88deb101d13107a40bac371de5c Mon Sep 17 00:00:00 2001
From: Lei Yan
Date: Thu, 10 Oct 2013 17:09:21 -0500
Subject: Almost have correlation working for non-primary strain/group

There's just some issue with parents/f1s not being included if
you select non-BXD (or whatever the group is). All Samples, however
does work.
---
 wqflask/base/data_set.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 20c9a24f..beb62bd7 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -436,8 +436,13 @@ class DataSet(object):
             print("Dataset {} is not yet available in GeneNetwork.".format(self.name))
             pass
         
-    def get_trait_data(self):
-        self.samplelist = self.group.samplelist + self.group.parlist + self.group.f1list
+    def get_trait_data(self, sample_list=None):
+        if sample_list:
+            self.samplelist = sample_list + self.group.parlist + self.group.f1list
+        else:
+            self.samplelist = self.group.samplelist + self.group.parlist + self.group.f1list
+        
+        
         query = """
             SELECT Strain.Name, Strain.Id FROM Strain, Species
             WHERE Strain.Name IN {}
@@ -1085,16 +1090,8 @@ class MrnaAssayDataSet(DataSet):
                     ProbeSetXRef.ProbeSetId=ProbeSet.Id;
                 """ % (column_name, escape(str(self.id)))
         results = g.db.execute(query).fetchall()
-        print("in retrieve_genes results {}: {}".format(type(results), results))
         
         return dict(results)
-    
-        #return {item[0]: item[1] for item in results}
-        
-        #symbol_dict = {}
-        #for item in results:
-        #    symbol_dict[item[0]] = item[1]
-        #return symbol_dict
 
     #def retrieve_gene_symbols(self):
     #    query = """
-- 
cgit v1.2.3