Update config

Author: huyen-nguyen

.DS_Store

@@ -28,8 +28,8 @@
 <div class="title ">
     WordStream: Interactive Tool for Topic Evolution
     <!--<span>-->
-    <a href="index.html" class="button still">Video</a>
-    <a href="demo.html" class="button active">Demo</a>
+    <a href="index.html" class="button active">Video</a>
+    <a href="demo.html" class="button still">Demo</a>
     <!--</span>-->
 </div>
 <center><iframe style="margin-top: 100px" width="95%" height="800" src="media/ws.mp4" frameborder="0"

index.html

@@ -1,5 +1,5 @@
 const initWidth = 1500,
-    initHeight = 520,
+    initHeight = 550,
     initMinFont = 14,
     initMaxFont = 36,
     initFlag = "none";// none / fa/ f / a
@@ -91,4 +91,4 @@ let metric2 = d3.select("body").append("svg")
     .attr("width",100)
     .attr("height", 300)
     .attr("class","metricSVG2")
-    .attr("id","metricSVG2");
+    .attr("id","metricSVG2");

javascripts/init.js

@@ -1,11 +1,11 @@
-let svg = d3.select("body").append('svg').attr({
-    width: globalWidth,
-    height: globalHeight,
-    id: "mainsvg"
-});
 // let fileList = ["WikiNews","Huffington","CrooksAndLiars","EmptyWheel","Esquire","FactCheck"
 //                 ,"VIS_papers","IMDB","PopCha","Cards_PC","Cards_Fries"]
-
+let svg = d3.select("body").append('svg')
+    .attr({
+        id: "mainsvg",
+        width: 1540,
+        height: 658
+    });
 let fileList = ["WikiNews", "Huffington", "CrooksAndLiars", "EmptyWheel", "Esquire", "FactCheck", "VIS_papers", "IMDB", "PopCha", "Cards_PC", "Cards_Fries", "QuantumComputing"]
 
 let initialDataset = "EmptyWheel";
@@ -101,6 +101,7 @@ function draw(data) {
         .minFontSize(initMinFont)
         .maxFontSize(initMaxFont)
         .data(data)
+        .flag(globalFlag)
         .font(font);
     let boxes = ws.boxes();
     let minSud = ws.minSud();
@@ -110,10 +111,11 @@ function draw(data) {
     //Display data
     let legendFontSize = 12;
     let legendHeight = boxes.topics.length * legendFontSize;
+
     //set svg data.
     svg.attr({
-        width: width + margins.left + margins.top,
-        height: height + margins.top + margins.bottom + axisPadding + legendHeight
+        width: globalWidth + margins.left + margins.top,
+        height: globalHeight + +margins.top + margins.bottom + axisPadding + legendHeight
     });
 
     let area = d3.svg.area()

javascripts/main.js

@@ -83,7 +83,6 @@ function getDisplayRate(allW, maxFreq){
     var weightedRate = displayFreq_1 / totalFreq_1;
     var averageNormFreq = displayNormFreq_2 / numbers_2;
 
-    console.log([weightedRate, averageNormFreq]);
     return [weightedRate, averageNormFreq]
 }
 // path:      an SVG <path> element

javascripts/metric.js

@@ -70,7 +70,7 @@ function updateData() {
     const newboxes = ws.boxes();
     let minSud = ws.minSud();
     let maxSud = ws.maxSud();
-    const legendFontSize = 20;
+    const legendFontSize = 12;
     let legendHeight = newboxes.topics.length * legendFontSize;
 
     mainGroup = d3.select("#mainsvg");

javascripts/update.js

@@ -316,6 +316,6 @@ input:checked + .toggle:before {
 .computeMetric {
     z-index: 100;
     position: absolute;
-    top: 425px;
+    top: 424px;
     left: 200px;
 }

styles/d3.slider.css

@@ -95,7 +95,7 @@ a.button:hover{
 
 .metricSVG {
     position: absolute;
-    top: 508px;
+    top: 507px;
     background-color: white;
     border: 1px solid #cbcbcb;
     padding: 10px;