From 8c9a25122606c9715465c54b8bb706068fa578ae Mon Sep 17 00:00:00 2001
From: zsloan
Date: Mon, 22 Jun 2015 15:23:36 +0000
Subject: Just a few minor changes before pulling Artem's fix to the mapping
issue.
---
wqflask/wqflask/interval_mapping/interval_mapping.py | 5 ++++-
wqflask/wqflask/templates/interval_mapping.html | 13 +++++++------
wqflask/wqflask/templates/marker_regression.html | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
(limited to 'wqflask')
diff --git a/wqflask/wqflask/interval_mapping/interval_mapping.py b/wqflask/wqflask/interval_mapping/interval_mapping.py
index 4b4b7f73..5f491652 100755
--- a/wqflask/wqflask/interval_mapping/interval_mapping.py
+++ b/wqflask/wqflask/interval_mapping/interval_mapping.py
@@ -85,7 +85,10 @@ class IntervalMapping(object):
def set_options(self, start_vars):
"""Sets various options (physical/genetic mapping, # permutations, which chromosome"""
- self.num_permutations = int(start_vars['num_perm'])
+ if start_vars['num_perm'] == "":
+ self.num_permutations = 0
+ else:
+ self.num_permutations = start_vars['num_perm']
if start_vars['manhattan_plot'] == "true":
self.manhattan_plot = True
else:
diff --git a/wqflask/wqflask/templates/interval_mapping.html b/wqflask/wqflask/templates/interval_mapping.html
index 4d99d2e7..b0866a35 100755
--- a/wqflask/wqflask/templates/interval_mapping.html
+++ b/wqflask/wqflask/templates/interval_mapping.html
@@ -1,5 +1,6 @@
{% block css %}
-
+
+
@@ -71,16 +72,16 @@
js_data = {{ js_data | safe }}
-
-
+
+
+
+
-
+
-
diff --git a/wqflask/wqflask/templates/marker_regression.html b/wqflask/wqflask/templates/marker_regression.html
index 62146662..ec344611 100755
--- a/wqflask/wqflask/templates/marker_regression.html
+++ b/wqflask/wqflask/templates/marker_regression.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% block title %}Interval Mapping{% endblock %}
+{% block title %}Marker Regression{% endblock %}
{% block css %}
--
cgit 1.4.1