diff options
| author | Lei Yan | 2014-08-21 18:56:29 +0000 |
|---|---|---|
| committer | Lei Yan | 2014-08-21 18:56:29 +0000 |
| commit | 7ff0dcda04dc853620bb5162180f18db596f1574 (patch) | |
| tree | 0d4c0160607badcc800e6ee27cc32d5a4bbbd04c /wqflask/wqflask | |
| parent | 41fb705cc57c94276573fd19b50c91c095fe76a9 (diff) | |
| download | genenetwork2-7ff0dcda04dc853620bb5162180f18db596f1574.tar.gz | |
Committer: Lei Yan <lei@penguin.uthsc.edu>
On branch master
Diffstat (limited to 'wqflask/wqflask')
| -rwxr-xr-x | wqflask/wqflask/correlation/show_corr_results.py | 6 | ||||
| -rwxr-xr-x | wqflask/wqflask/templates/correlation_page.html | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py index 06cf1915..f35fe075 100755 --- a/wqflask/wqflask/correlation/show_corr_results.py +++ b/wqflask/wqflask/correlation/show_corr_results.py @@ -164,7 +164,7 @@ class CorrelationResults(object): for _trait_counter, trait in enumerate(self.correlation_data.keys()[:self.return_number]): print("trait name:", trait) - trait_object = GeneralTrait(dataset=self.dataset, name=trait, get_qtl_info=True) + trait_object = GeneralTrait(dataset=self.target_dataset, name=trait, get_qtl_info=True) (trait_object.sample_r, trait_object.sample_p, @@ -474,10 +474,6 @@ class CorrelationResults(object): this_trait_vals.append(sample_value) target_vals.append(target_sample_value) - # print("trait:", trait) - print("this_trait_vals: %s" % this_trait_vals) - print("target_vals: %s" % target_vals) - this_trait_vals, target_vals, num_overlap = corr_result_helpers.normalize_values( this_trait_vals, target_vals) diff --git a/wqflask/wqflask/templates/correlation_page.html b/wqflask/wqflask/templates/correlation_page.html index 88f6d65a..fc5aca42 100755 --- a/wqflask/wqflask/templates/correlation_page.html +++ b/wqflask/wqflask/templates/correlation_page.html @@ -24,7 +24,7 @@ <table id="corr_results" class="table table-hover table-striped table-bordered"> <thead> <tr> - {% if dataset.type == 'ProbeSet' %} + {% if target_dataset.type == 'ProbeSet' %} <th>Trait</th> <th>Symbol</th> <th>Description</th> @@ -47,7 +47,7 @@ <th>Tissue rho</th> <th>Tissue p(rho)</th> {% endif %} - {% elif dataset.type == "Publish" %} + {% elif target_dataset.type == "Publish" %} <th>Record ID</th> <th>Phenotype</th> <th>Authors</th> @@ -67,7 +67,7 @@ <tbody> {% for trait in correlation_results %} <tr> - {% if dataset.type == 'ProbeSet' %} + {% if target_dataset.type == 'ProbeSet' %} <td><a href="/show_trait?trait_id={{trait.name}}&dataset={{trait.dataset.name}}">{{ trait.name }}</a></td> <td>{{ trait.symbol }}</td> <td>{{ trait.description }} <br><br> <b>Aliases</b>: {{ trait.alias }}</td> @@ -81,7 +81,7 @@ <td>{{'%0.3f'|format(trait.lit_corr)}}</td> <td>{{'%0.3f'|format(trait.tissue_corr)}}</td> <td>{{'%0.3e'|format(trait.tissue_pvalue)}}</td> - {% elif dataset.type == "Publish" %} + {% elif target_dataset.type == "Publish" %} <td><a href="/show_trait?trait_id={{trait.name}}&dataset={{trait.dataset.name}}">{{ trait.name }}</a></td> <td>{{ trait.post_publication_description }}</td> <td>{{ trait.authors }}</td> |