diff options
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression_gn1.py | 4 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/marker_regression_gn1.html | 17 | ||||
| -rw-r--r-- | wqflask/wqflask/views.py | 1 |
3 files changed, 14 insertions, 8 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py index 74474cb0..08332e7d 100644 --- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py +++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py @@ -447,7 +447,7 @@ class MarkerRegression(object): if self.haplotypeAnalystChecked and self.selectedChr > -1: #thisTrait = self.traitList[0] thisTrait = self.this_trait - _strains, _vals, _vars = thisTrait.export_informative() + _strains, _vals, _vars, _aliases = thisTrait.export_informative() smd=[] for ii, _val in enumerate(_vals): temp = GeneralObject(name=_strains[ii], value=_val) @@ -1440,7 +1440,7 @@ class MarkerRegression(object): #thisTrait = self.traitList[0] thisTrait = self.this_trait - _strains, _vals, _vars = thisTrait.export_informative() + _strains, _vals, _vars, _aliases = thisTrait.export_informative() smd=[] for ii, _val in enumerate(_vals): diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html index ae922389..5afd134a 100644 --- a/wqflask/wqflask/templates/marker_regression_gn1.html +++ b/wqflask/wqflask/templates/marker_regression_gn1.html @@ -174,7 +174,7 @@ </form> {% if selectedChr == -1 %} - <div style="width:{% if 'additive' in trimmed_markers[0] %}40%{% else %}30%{% endif %};"> + <div style="width:{% if 'additive' in trimmed_markers[0] %}45%{% else %}35%{% endif %};"> <h2>Results</h2> <div id="table_container"> <table id="qtl_results" class="table table-hover table-striped nowrap"> @@ -185,7 +185,7 @@ <th>Locus</th> <th>{{ LRS_LOD }}</th> <th>Chr</th> - {% if plotScale == "centimorgan" %} + {% if plotScale != "physic" %} <th>cM</th> {% else %} <th>Mb</th> @@ -222,7 +222,11 @@ {% endif %} {% endif %} <td align="right">{{marker.chr}}</td> + {% if plotScale != "physic" %} + <td align="right">{{ '%0.3f' | format(marker.Mb|float) }}</td> + {% else %} <td align="right">{{ '%0.6f' | format(marker.Mb|float) }}</td> + {% endif %} {% if 'additive' in marker %} <td align="right">{{ '%0.3f' | format(marker.additive|float) }}</td> {% endif %} @@ -235,8 +239,8 @@ </table> </div> </div> - {% elif selectedChr != -1 and (dataset.group.species == 'mouse' or dataset.group.species == 'rat') %} - <div> + {% elif selectedChr != -1 and plotScale =="physic" and (dataset.group.species == 'mouse' or dataset.group.species == 'rat') %} + <div style="width: 100%;"> <h2>Interval Analyst</h2> <div id="table_container"> <table id="interval_analyst" class="table table-hover table-striped nowrap"> @@ -350,9 +354,10 @@ "order": [[3, "asc" ]], "sDom": "RZtir", "iDisplayLength": -1, - "bDeferRender": true, + "autoWidth": false, + "deferRender": true, "bSortClasses": false, - "scrollY": true, + "scrollY": "600px", "scrollCollapse": false, "paging": false } ); diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index ca7f04e9..83496000 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -558,6 +558,7 @@ def marker_regression_page(): 'selected_chr', 'chromosomes', 'mapping_scale', + 'plotScale', 'score_type', 'suggestive', 'significant', |