Merge pull request #381 from robertcv/fixes/word_cloud_size

[FIX] OWWordCloud: scale visualization

Author: ajdapretnar

orangecontrib/text/widgets/owwordcloud.py

@@ -169,6 +169,23 @@ def on_cloud_pref_change(self):
         self.webview.evalJS('OPTIONS["minRotation"] = {}; \
                              OPTIONS["maxRotation"] = {};'.format(-tilt_amount, tilt_amount))
         self.webview.evalJS('OPTIONS["rotateRatio"] = {};'.format(tilt_ratio))
+        self.webview.evalJS('''
+        OPTIONS["gridSize"] = function () {
+          return Math.round( 
+            Math.min(
+              document.getElementById("canvas").clientWidth,
+              document.getElementById("canvas").clientHeight
+            ) / 48
+          );
+        };''')
+        self.webview.evalJS('''
+        OPTIONS["weightFactor"] = function (size) {
+          return size * 
+            Math.min(
+              document.getElementById("canvas").clientWidth,
+              document.getElementById("canvas").clientHeight
+            ) / 512;
+        };''')
         # Trigger cloud redrawing by constructing new webview, because everything else fail Macintosh
         self.webview.evalJS('OPTIONS["list"] = {};'.format(self.wordlist))
         self.webview.evalJS('redrawWordCloud();')

orangecontrib/text/widgets/resources/wordcloud2.js

@@ -312,7 +312,7 @@ if (!window.clearImmediate) {
     }
 
     /* Make sure gridSize is a whole number and is not smaller than 4px */
-    settings.gridSize = Math.max(Math.floor(settings.gridSize), 4);
+    settings.gridSize = Math.max(Math.floor(settings.gridSize()), 4);
 
     /* shorthand */
     var g = settings.gridSize;