From 3a7caecf4c7d30f693ba838e1983d03a742fe5ba Mon Sep 17 00:00:00 2001
From: Lei Yan
Date: Wed, 28 Jun 2017 17:02:38 +0000
Subject: Update Correlation Scatterplot

---
 .../wqflask/static/new/css/corr_scatter_plot2.css  | 27 +++++++++++++++++-----
 .../new/javascript/draw_corr_scatterplot-2.js      |  4 ++--
 2 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/css/corr_scatter_plot2.css b/wqflask/wqflask/static/new/css/corr_scatter_plot2.css
index e21d828f..5aa9b9bf 100644
--- a/wqflask/wqflask/static/new/css/corr_scatter_plot2.css
+++ b/wqflask/wqflask/static/new/css/corr_scatter_plot2.css
@@ -1,25 +1,40 @@
 .nvd3 .nv-axis.nv-x text {
-  font-size: 17px;
+  font-size: 16px;
   font-weight: normal;
   fill: black;
 }
 
 .nvd3 .nv-axis.nv-y text {
-  font-size: 17px;
+  font-size: 16px;
   font-weight: normal;
   fill:black;
 }
 
 .nv-x .nv-axis g path.domain {
-	stroke: black;
-	stroke-width: 2;
+    stroke: black;
+    stroke-width: 2;
 }
 
 .nv-y .nv-axis g path.domain {
-	stroke: black;
-	stroke-width: 2;
+    stroke: black;
+    stroke-width: 2;
 }
 
 .nvd3 .nv-axis.nv-x path.domain {
     stroke-opacity: 1;
 }
+
+.nvd3 .nv-axis.nv-y path.domain {
+    stroke-opacity: 1;
+}
+
+line.nv-regLine {
+    stroke: red !important;
+}
+
+.nv-axisMin-x,
+.nv-axisMax-x,
+.nv-axisMin-y,
+.nv-axisMax-y {
+    display: none;
+}
diff --git a/wqflask/wqflask/static/new/javascript/draw_corr_scatterplot-2.js b/wqflask/wqflask/static/new/javascript/draw_corr_scatterplot-2.js
index f88e7d5d..ad6c7d6b 100644
--- a/wqflask/wqflask/static/new/javascript/draw_corr_scatterplot-2.js
+++ b/wqflask/wqflask/static/new/javascript/draw_corr_scatterplot-2.js
@@ -9,8 +9,8 @@ nv.addGraph(function() {
     chart.color(d3.scale.category10().range());
     chart.pointRange([200,0]);
     //
-    chart.xAxis.tickFormat(d3.format('.02f'));
-    chart.yAxis.tickFormat(d3.format('.02f'));
+    chart.xAxis.tickFormat(d3.format('r'));
+    chart.yAxis.tickFormat(d3.format('r'));
     chart.xAxis.axisLabel(js_data.trait_1);
     chart.xAxis.axisLabelDistance(11);
     chart.yAxis.axisLabel(js_data.trait_2);
-- 
cgit v1.2.3