From 678e9aca5011644131701ec1d494ad754ddd7d56 Mon Sep 17 00:00:00 2001 From: zsloan Date: Tue, 5 Mar 2019 11:27:46 -0600 Subject: Made R/qtl metho/model names better and added some javascript to disable wrong combinations of options --- wqflask/wqflask/marker_regression/run_mapping.py | 5 ++- wqflask/wqflask/show_trait/show_trait.py | 3 ++ .../new/javascript/show_trait_mapping_tools.js | 22 +++++++++++ .../templates/show_trait_mapping_tools.html | 43 +++++++++++++--------- 4 files changed, 55 insertions(+), 18 deletions(-) diff --git a/wqflask/wqflask/marker_regression/run_mapping.py b/wqflask/wqflask/marker_regression/run_mapping.py index 7ee3ac01..c0d6dc0b 100644 --- a/wqflask/wqflask/marker_regression/run_mapping.py +++ b/wqflask/wqflask/marker_regression/run_mapping.py @@ -187,7 +187,10 @@ class RunMapping(object): self.mapping_scale = "morgan" self.control_marker = start_vars['control_marker'] self.do_control = start_vars['do_control'] - self.method = start_vars['mapmethod_rqtl_geno'] + if 'mapmethod_rqtl_geno' in start_vars: + self.method = start_vars['mapmethod_rqtl_geno'] + else: + self.method = "em" self.model = start_vars['mapmodel_rqtl_geno'] #if start_vars['pair_scan'] == "true": # self.pair_scan = True diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py index 932260de..c7e6be4c 100644 --- a/wqflask/wqflask/show_trait/show_trait.py +++ b/wqflask/wqflask/show_trait/show_trait.py @@ -199,6 +199,7 @@ class ShowTrait(object): #ZS: Needed to know whether to display bar chart + get max sample name length in order to set table column width self.num_values = 0 + self.binary = "true" #ZS: So it knows whether to display the Binary R/qtl mapping method, which doesn't work unless all values are 0 or 1 max_samplename_width = 1 for group in self.sample_groups: for sample in group.sample_list: @@ -206,6 +207,8 @@ class ShowTrait(object): max_samplename_width = len(sample.name) if sample.display_value != "x": self.num_values += 1 + if sample.display_value != 0 or sample.display_value != 1: + self.binary = "false" sample_column_width = max_samplename_width * 8 diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js index 3eb34d03..2ab87d03 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js +++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js @@ -245,6 +245,28 @@ $("#mapping_method_choice").change(mapping_method_fields); + $("#mapmodel_rqtl_geno").change(function() { + if ($(this).val() == "np"){ + $("#mapmethod_rqtl_geno").attr('disabled', 'disabled'); + $("#mapmethod_rqtl_geno").css('background-color', '#CCC'); + $("#missing_geno").attr('disabled', 'disabled'); + $("#missing_geno").css('background-color', '#CCC'); + } else { + $("#mapmethod_rqtl_geno").removeAttr('disabled'); + $("#mapmethod_rqtl_geno").css('background-color', '#FFF'); + $("#missing_geno").removeAttr('disabled'); + $("#missing_geno").css('background-color', '#FFF'); + } + }); + + $("#mapmethod_rqtl_geno").change(function() { + if ($(this).val() == "mr"){ + $("#missing_geno_div").css('display', 'block'); + } else { + $("#missing_geno_div").css('display', 'none'); + } + }); + toggle_enable_disable = function(elem) { return $(elem).prop("disabled", !$(elem).prop("disabled")); }; diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html index e79cf1ab..c7fd2612 100644 --- a/wqflask/wqflask/templates/show_trait_mapping_tools.html +++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html @@ -265,31 +265,40 @@
- +
- + + {% if binary == "true" %}{% endif %} + +
- -
- + + + + +
+ +
- +