Merge master and testing master

1 files changed, 8 insertions, 1 deletions

diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py
index 24de8dcb..d8487f01 100644
--- a/wqflask/base/webqtlCaseData.py
+++ b/wqflask/base/webqtlCaseData.py
@@ -49,7 +49,7 @@ class webqtlCaseData(object):
         if self.variance != None:
             str += " variance=%2.3f" % self.variance
         if self.num_cases:
-            str += " ndata=%d" % self.num_cases
+            str += " ndata=%s" % self.num_cases
         if self.name:
             str += " name=%s" % self.name
         if self.name2:
@@ -77,3 +77,10 @@ class webqtlCaseData(object):
             return "%2.3f" % self.variance
         else:
             return "x"
+
+    @property
+    def display_num_cases(self):
+        if self.num_cases != None:
+            return "%s" % self.num_cases
+        else:
+            return "x"