Still single layer - just some minor fixes

phamvanvung · phamvanvung · commit 30e0b6b5ea4f · 2018-03-13T10:12:42.000+07:00
diff --git a/lib/d3.layout.wordstream.js b/lib/d3.layout.wordstream.js
@@ -3,8 +3,8 @@
 d3.layout.wordStream = function(){
     var data = [],
         size = [1200, 500],
-        maxFontSize = 32,
-        minFontSize = 4,
+        maxFontSize = 40,
+        minFontSize = 6,
         fontScale = d3.scale.linear(),
         frequencyScale = d3.scale.linear(),
         spiral = achemedeanSpiral,
@@ -39,7 +39,6 @@ d3.layout.wordStream = function(){
                 place(words[i], board);
             }
         }
-        
         //return board;
         delete board.sprite;
         return boxes;
@@ -76,7 +75,7 @@ d3.layout.wordStream = function(){
         //#region creating boxes
         var numberOfBoxes = data.length;
         var boxes = Array();
-        var boxWidth =  size[0]/numberOfBoxes;
+        var boxWidth =  ~~(size[0]/numberOfBoxes);
         //Calculating the total frequencies and put into the scale
         var totalFrequencies  = calculatetotalFrequenciesABox(data);
         frequencyScale.domain(d3.extent(totalFrequencies)).range([minBoxHeight, size[1]]);
@@ -86,7 +85,7 @@ d3.layout.wordStream = function(){
                 width: boxWidth, 
                 height: ~~frequencyScale(totalFrequencies[i]),
                 x: boxWidth * i,
-                y: (size[1] - frequencyScale(totalFrequencies[i]))/2,
+                y: ~~(size[1] - frequencyScale(totalFrequencies[i]))/2,
                 words: d.words
             });
         });
@@ -292,7 +291,7 @@ d3.layout.wordStream = function(){
                 d.rotate = (~~(Math.random() * 6) - 3) * 30;
                 c.font = ~~(d.fontSize + 1) + "px " + font;
                 
-                var w = c.measureText(d.text).width,
+                var w = ~~(c.measureText(d.text).width),
                     h = d.fontSize;
                 if (d.rotate) {
                   var sr = Math.sin(d.rotate * cloudRadians),
diff --git a/test/finalboard.html b/test/finalboard.html
@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>WordStream</title>
-    <script src="../d3.min.js"></script>
-    <script src="../d3.layout.wordstream.js"></script>
+    <script src="../lib/d3.min.js"></script>
+    <script src="../lib/d3.layout.wordstream.js"></script>
     <script src="./testutil.js"></script>
 </head>
 <body>
     <script>
-        var url = "./emptywheel.csv";
+        var url = "../data/emptywheel.csv";
         d3.csv(url, function(error, rawData) {
             if (error) throw error;
             var inputFormat = d3.time.format('%Y-%m-%dT%H:%M:%S');
@@ -56,7 +56,7 @@
                     }).sort(function(a, b){//sort the terms by frequency
                         return b.frequency-a.frequency;
                     }).filter(function(d){return d.text; })//filter out empty words
-                    .slice(0, 5);
+                    .slice(0, 15);
                 });
                 return {
                     date: date,
diff --git a/test/sprite.html b/test/sprite.html
@@ -4,12 +4,12 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>WordStream</title>
-    <script src="../d3.min.js"></script>
-    <script src="../d3.layout.wordstream.js"></script>
+    <script src="../lib/d3.min.js"></script>
+    <script src="../lib/d3.layout.wordstream.js"></script>
 </head>
 <body>
     <script>
-        var url = "./emptywheel.csv";
+        var url = "../data/emptywheel.csv";
         d3.csv(url, function(error, rawData) {
             if (error) throw error;
             var inputFormat = d3.time.format('%Y-%m-%dT%H:%M:%S');
