From 667c45ac54d4faab396723d1649dff1e27686b1f Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Tue, 25 Sep 2012 18:26:15 -0500
Subject: Got trait data page running for human dataset, changed list of sample
 objects to a SampleList object

---
 wqflask/base/webqtlCaseData.py | 2 +-
 wqflask/base/webqtlDataset.py  | 4 ++--
 wqflask/base/webqtlFormData.py | 9 ++++++---
 wqflask/base/webqtlTrait.py    | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py
index 25665c55..c805a95c 100755
--- a/wqflask/base/webqtlCaseData.py
+++ b/wqflask/base/webqtlCaseData.py
@@ -40,7 +40,7 @@ class webqtlCaseData(object):
         self.outlier = None   # Not set to True/False until later
 
     def __repr__(self):
-        str = ""
+        str = "<webqtlCaseData> "
         if self.value != None:
             str += "value=%2.3f" % self.value
         if self.variance != None:
diff --git a/wqflask/base/webqtlDataset.py b/wqflask/base/webqtlDataset.py
index f8491bb1..4f98e90c 100755
--- a/wqflask/base/webqtlDataset.py
+++ b/wqflask/base/webqtlDataset.py
@@ -32,8 +32,8 @@ import webqtlConfig
 
 class webqtlDataset:
     """
-    Database class defines a database in webqtl, can be either Microarray,
-    Published phenotype, genotype, or user input database(temp)
+    Dataset class defines a dataset in webqtl, can be either Microarray,
+    Published phenotype, genotype, or user input dataset(temp)
     """
 
     def __init__(self, dbName, cursor=None):
diff --git a/wqflask/base/webqtlFormData.py b/wqflask/base/webqtlFormData.py
index eb1ebd5e..63263895 100755
--- a/wqflask/base/webqtlFormData.py
+++ b/wqflask/base/webqtlFormData.py
@@ -46,9 +46,9 @@ from utility import webqtlUtil
 class webqtlFormData:
     'Represents data from a WebQTL form page, needed to generate the next page'
     
-    attrs = ('formID','RISet','genotype','samplelist','allsamplelist',
-    'suggestive','significance','submitID','identification', 'enablevariance',
-    'nperm','nboot','email','incparentsf1','genotype_1','genotype_2','traitInfo')
+    attrs = ('formID','RISet','genotype','samplelist','allsamplelist', 'display_variance'
+                'suggestive','significance','submitID','identification', 'enablevariance',
+                'nperm','nboot','email','incparentsf1','genotype_1','genotype_2','traitInfo')
 
     #XZ: Attention! All attribute values must be picklable!
 
@@ -61,6 +61,9 @@ class webqtlFormData:
         print("in webqtlFormData start_vars are:", pf(start_vars))
         for item in webqtlFormData.attrs:
             self.__dict__[item] = None
+        
+        #ZS: This is only used in DataEditingPage.py (as far as I know)
+        self.varianceDispName = None
 
         for item in start_vars:
             self.__dict__[item] = start_vars[item]
diff --git a/wqflask/base/webqtlTrait.py b/wqflask/base/webqtlTrait.py
index 4d642ffe..efbc1464 100755
--- a/wqflask/base/webqtlTrait.py
+++ b/wqflask/base/webqtlTrait.py
@@ -157,8 +157,8 @@ class webqtlTrait:
     #def __str__(self):
     #       #return "%s %s" % (self.getName(), self.riset)
     #       return self.getName()
-    __str__ = getName
-    __repr__ = __str__
+    #__str__ = getName
+    #__repr__ = __str__
 
     def exportData(self, samplelist, type="val"):
         """
-- 
cgit v1.2.3