diff options
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression.py | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression_gn1.py | 7 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/marker_regression_gn1.html | 8 | ||||
| -rw-r--r-- | wqflask/wqflask/views.py | 1 |
4 files changed, 15 insertions, 3 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py index 26ba212d..af320f65 100644 --- a/wqflask/wqflask/marker_regression/marker_regression.py +++ b/wqflask/wqflask/marker_regression/marker_regression.py @@ -94,6 +94,8 @@ class MarkerRegression(object): self.endMb = start_vars['endMb'] if "graphWidth" in start_vars: self.graphWidth = start_vars['graphWidth'] + if "lrsMax" in start_vars: + self.lrsMax = start_vars['lrsMax'] if "haplotypeAnalystCheck" in start_vars: self.haplotypeAnalystCheck = start_vars['haplotypeAnalystCheck'] if "startMb" in start_vars: #ZS: This is to ensure showGenes, Legend, etc are checked the first time you open the mapping page, since startMb will only not be set during the first load diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py index ec4f79aa..63f62411 100644 --- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py +++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py @@ -296,6 +296,7 @@ class MarkerRegression(object): self.LRS_LOD = start_vars['LRSCheck'] self.cutoff = start_vars['cutoff'] self.intervalAnalystChecked = False + self.draw2X = False if 'additiveCheck' in start_vars.keys(): self.additiveChecked = start_vars['additiveCheck'] else: @@ -312,8 +313,6 @@ class MarkerRegression(object): self.geneChecked = start_vars['showGenes'] else: self.geneChecked = False - self.draw2X = False - self.lrsMax = 0 try: self.startMb = float(start_vars['startMb']) except: @@ -322,6 +321,10 @@ class MarkerRegression(object): self.endMb = float(start_vars['endMb']) except: self.endMb = -1 + try: + self.lrsMax = float(start_vars['lrsMax']) + except: + self.lrsMax = 0 #self.additiveChecked = fd.formdata.getvalue('additiveCheck') #self.dominanceChecked = fd.formdata.getvalue('dominanceCheck') diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html index 67f5e010..d7950754 100644 --- a/wqflask/wqflask/templates/marker_regression_gn1.html +++ b/wqflask/wqflask/templates/marker_regression_gn1.html @@ -75,9 +75,15 @@ </td> </tr> <tr> + <td></td> + <td style="padding: 5px;"> + <input type="text" name="lrsMax" value="{{ '%0.1f' | format(lrsMax|float) }}" size="3"> <span style="font-size: 12px;">units on the y-axis (0 for default)</span> + </td> + </tr> + <tr> <td><b>Width: </b></td> <td> - <input type="text" name="graphWidth" value="{% if graphWidth is defined %}{{ graphWidth }}{% else %}1600{% endif %}" size="5"><span style="font-size: 11px;"> pixels (minimum=900)</span> + <input type="text" name="graphWidth" value="{% if graphWidth is defined %}{{ graphWidth }}{% else %}1600{% endif %}" size="5"><span style="font-size: 12px;"> pixels (minimum=900)</span> </td> </tr> </table> diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index acc46137..3bf64a18 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -364,6 +364,7 @@ def marker_regression_page(): 'startMb', 'endMb', 'graphWidth', + 'lrsMax', 'additiveCheck', 'showSNP', 'showGenes', |