diff options
| author | Zachary Sloan | 2014-07-18 17:31:41 +0000 |
|---|---|---|
| committer | Zachary Sloan | 2014-07-18 17:31:41 +0000 |
| commit | 8c45fcf1e9228108034fab96bc7e7eaa7740f06c (patch) | |
| tree | 679680c80d2b3d9f24f16741b17a09c8823d8af6 /wqflask/base | |
| parent | 8646d5fabd5e87f189f1429d71a872f8da80ba8c (diff) | |
| download | genenetwork2-8c45fcf1e9228108034fab96bc7e7eaa7740f06c.tar.gz | |
Added outlier highlighting
Changed order of tabs in statistics panel on trait page
Started working on heatmap
Diffstat (limited to 'wqflask/base')
| -rwxr-xr-x | wqflask/base/data_set.py | 13 | ||||
| -rwxr-xr-x | wqflask/base/webqtlCaseData.py | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 2a79dc9c..e6bd61c1 100755 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -563,12 +563,15 @@ class DataSet(object): """.format(*mescape(self.type, item, item, self.type, item, item)) if self.type == "Publish": + #query += """ + # WHERE {}XRef.InbredSetId = '{}' + # """.format(*mescape(self.type, self.group.name)) + query += """ - WHERE {}XRef.PublicationId = {}Freeze.Id - and {}Freeze.Name = '{}' + WHERE {}XRef.InbredSetId = '{}' and {}.Id = {}XRef.{}Id order by {}.Id - """.format(*mescape(self.type, self.type, self.type, self.name, + """.format(*mescape(self.type, self.group.name, dataset_type, self.type, dataset_type, dataset_type)) else: query += """ @@ -579,10 +582,10 @@ class DataSet(object): """.format(*mescape(self.type, self.type, self.type, self.type, self.name, dataset_type, self.type, self.type, dataset_type)) - #print("trait data query: ", query) + print("trait data query: ", query) results = g.db.execute(query).fetchall() - #print("query results:", results) + print("query results:", results) trait_sample_data.append(results) trait_count = len(trait_sample_data[0]) diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py index 42763aed..6dc0c145 100755 --- a/wqflask/base/webqtlCaseData.py +++ b/wqflask/base/webqtlCaseData.py @@ -34,6 +34,7 @@ class webqtlCaseData(object): self.value = value # Trait Value self.variance = variance # Trait Variance self.num_cases = num_cases # Number of individuals/cases + self.z_score = None self.extra_attributes = None self.this_id = None # Set a sane default (can't be just "id" cause that's a reserved word) self.outlier = None # Not set to True/False until later |