aboutsummaryrefslogtreecommitdiff
path: root/web/webqtl
diff options
context:
space:
mode:
authorZachary Sloan2014-06-25 20:19:02 +0000
committerZachary Sloan2014-06-25 20:19:02 +0000
commitdf6a70c9a06bc30856a1bc46023bd67e5325f5c9 (patch)
treec7ed438dbc627043785337c0a81ce7988e16d50c /web/webqtl
parent33cf7a7dafc0bf338f98eb793ffd87d4442a58fd (diff)
downloadgenenetwork2-df6a70c9a06bc30856a1bc46023bd67e5325f5c9.tar.gz
Added Karl's correlation matrix code
Improved the "scatterplot matrix" feature on the trait page so that it matches the chosen trait against every selected trait
Diffstat (limited to 'web/webqtl')
-rwxr-xr-xweb/webqtl/showTrait/DataEditingPage.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/web/webqtl/showTrait/DataEditingPage.py b/web/webqtl/showTrait/DataEditingPage.py
index c240d8a0..20231429 100755
--- a/web/webqtl/showTrait/DataEditingPage.py
+++ b/web/webqtl/showTrait/DataEditingPage.py
@@ -1552,13 +1552,21 @@ class DataEditingPage(templatePage):
attribute_ids = []
attribute_names = []
try:
+
+ if thisTrait.db.type=='ProbeSet':
#ZS: Id values for this trait's extra attributes; used to create "Exclude" dropdown and query for attribute values and create
- self.cursor.execute("""SELECT CaseAttribute.Id, CaseAttribute.Name
- FROM CaseAttribute, CaseAttributeXRef
- WHERE CaseAttributeXRef.ProbeSetFreezeId = '%s' AND
- CaseAttribute.Id = CaseAttributeXRef.CaseAttributeId
- group by CaseAttributeXRef.CaseAttributeId""" % (str(thisTrait.db.id)))
-
+ self.cursor.execute("""SELECT CaseAttribute.Id, CaseAttribute.Name
+ FROM CaseAttribute, CaseAttributeXRef
+ WHERE CaseAttributeXRef.ProbeSetFreezeId = '%s' AND
+ CaseAttribute.Id = CaseAttributeXRef.CaseAttributeId
+ group by CaseAttributeXRef.CaseAttributeId""" % (str(thisTrait.db.id)))
+ elif thisTrait.db.type=='Publish':
+ self.cursor.execute("""SELECT CaseAttribute.Id, CaseAttribute.Name
+ FROM CaseAttribute, CaseAttributeXRef
+ WHERE CaseAttributeXRef.PublishFreezeId = '%s' AND
+ CaseAttribute.Id = CaseAttributeXRef.CaseAttributeId
+ group by CaseAttributeXRef.CaseAttributeId""" % (str(thisTrait.db.id)))
+
exclude_menu = HT.Select(name="exclude_menu")
dropdown_menus = [] #ZS: list of dropdown menus with the distinct values of each attribute (contained in DIVs so the style parameter can be edited and they can be hidden)