From b3058f8c3710c65288d88ed777aa0fcad8429aef Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Mon, 21 Jul 2014 17:59:28 +0000
Subject: Fixed issue where sample values were ordered on the trait page

---
 wqflask/base/webqtlCaseData.py           | 1 +
 wqflask/wqflask/show_trait/SampleList.py | 2 +-
 wqflask/wqflask/show_trait/show_trait.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py
index 6dc0c145..5927b0f4 100755
--- a/wqflask/base/webqtlCaseData.py
+++ b/wqflask/base/webqtlCaseData.py
@@ -34,6 +34,7 @@ class webqtlCaseData(object):
         self.value = value                  # Trait Value
         self.variance = variance            # Trait Variance
         self.num_cases = num_cases          # Number of individuals/cases
+        self.prob_plot_value = None         # Ordered value for probability plot; this is sort of wrong but not sure how else to do this
         self.z_score = None
         self.extra_attributes = None
         self.this_id = None   # Set a sane default (can't be just "id" cause that's a reserved word)
diff --git a/wqflask/wqflask/show_trait/SampleList.py b/wqflask/wqflask/show_trait/SampleList.py
index 8e57e210..d196e722 100755
--- a/wqflask/wqflask/show_trait/SampleList.py
+++ b/wqflask/wqflask/show_trait/SampleList.py
@@ -116,7 +116,7 @@ class SampleList(object):
         for i, sample in enumerate([sample for sample in self.sample_list if sample.value != None]):
             print("sample is:", sample)
             sample.z_score = z_scores[i]
-            sample.value = values[i]
+            sample.prob_plot_value = values[i]
         
     def do_outliers(self):
         values = [sample.value for sample in self.sample_list if sample.value != None]
diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index 8356753b..3034dec8 100755
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -121,7 +121,7 @@ class ShowTrait(object):
         sample_z_scores = []
         for sample_list in sample_lists:
             for sample in sample_list:
-                sample_vals.append(sample.value)
+                sample_vals.append(sample.prob_plot_value)
                 sample_z_scores.append(sample.z_score)
         probability_plot_data.append(sample_z_scores)        
         probability_plot_data.append(sample_vals)
-- 
cgit v1.2.3