throttle added

abc91199 · Oct 9, 2015 · 83b493e · 83b493e
1 parent 20b7f9f
commit 83b493e
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 35 deletions.
diff --git a/demo.html b/demo.html
@@ -15,6 +15,16 @@
         fileref.setAttribute("shim-shadowdom", ' ');
         fileref.setAttribute("href", 'themes/' + theme + '.css');
         document.getElementsByTagName("head")[0].appendChild(fileref);
+
+
+    var updatePermuteRate = function(slider) {
+        var output = document.querySelector('#permuteInterval');
+        var inMemoryGrid = document.querySelector('#in-memory-example');
+        output.innerHTML = slider.value;
+        inMemoryGrid.getBehavior().permuteInterval = parseInt(slider.value);
+    };
+
+
     </script>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
   <title>fin-hypergrid Demo</title>
@@ -151,9 +161,9 @@
             <h3>fin-hypergrid-behavior-in-memory
 
 
-            </h3> This element is a custom Polymer web component that is a demonstration of a simple subclass of the fin-hypergrid-behavior-default.  It demonstrates live high frequency updating of data, variable width columns, alternate cell renderers, and alternate cell editors(double click in various cells of column 'J').  Press Alt/Option to toggle the column picker.  Also, Take note that hypergrid supports <a href="https://polymerthemes.com/">polymer themes</a> and one can be selected from the top left menu.
-            <br>
+            </h3> This element is a custom Polymer web component that is a demonstration of a simple subclass of the fin-hypergrid-behavior-default.  It demonstrates live high frequency updating of data, variable width columns, alternate cell renderers, and alternate cell editors(double click in various cells of column 'J').  Press Alt/Option to toggle the column picker.  Also, Take note that hypergrid supports <a href="https://polymerthemes.com/">polymer themes</a> and one can be selected from the top left menu.  The data permute interval is the rate that the data is being randomly changed. Keep in mind the CPU utilization is from this and NOT hypergrid overhead.<br>Data Permute Interval<input style="margin: 15px" oninput="updatePermuteRate(this)" id="slider" type="range" value="50" min="16" max="1000" step="1" /><span style="font-size: large" id="permuteInterval"></span>
             <br>
+
           </div>
           <core-splitter direction="up"></core-splitter>
           <div flex class="rel">
@@ -347,6 +357,9 @@ <h3>fin-hypergrid-behavior-gol</h3> This element is another custom Polymer web c
             //get ahold of our in memory example
             var inMemoryGrid = document.querySelector('#in-memory-example');
 
+            var output = document.querySelector('#permuteInterval');
+            output.innerHTML = inMemoryGrid.getBehavior().permuteInterval;
+
             //lets turn his scrollbars to always on....
             var lnfOverrides = {
                 scrollbarHoverOver: 'visible',

diff --git a/examples/cmz.html b/examples/cmz.html
@@ -0,0 +1,43 @@
+<html>
+<head>
+  <script src="../../webcomponentsjs/webcomponents.js"></script>
+  <!-- <link rel="stylesheet" href="../themes/excel.css"> -->
+  <link rel="import" href="../polymer/html/fin-hypergrid.html">
+
+<!--   <link rel="import" href="../fin-hypergrid.dev.html"> -->
+  <script src="../js/sampledata.js"></script>
+<style>
+
+ body {
+    position: absolute;
+    top: 0%;
+    right: 0%;
+    bottom: 0%;
+    left: 0%;
+    padding: 0%;
+    margin: 15px 0 0 0;
+    background-color: #ffffff;
+ }
+ fin-hypergrid {
+    width: 100%;
+    height: 100%;
+    position: relative;
+ }
+ table {
+
+ }
+</style>
+</head>
+<body>
+<fin-hypergrid id="json-grid" style="position:absolute;width:100%;height:100%">
+    <fin-hypergrid-behavior-json ></fin-hypergrid-behavior-json>
+</fin-hypergrid>
+</body>
+<script>
+window.addEventListener('polymer-ready',function() {
+        var table = document.querySelector('#json-grid');
+        var behavior = table.getBehavior();
+        behavior.setData(window.people);
+});
+</script>
+</html>
diff --git a/fin-hypergrid.dev.html b/fin-hypergrid.dev.html
@@ -15484,7 +15484,7 @@
  *
  * @property {SimpleLRU} textWidthCache - a LRU cache of 10000 of text widths
  */
-var textWidthCache = new SimpleLRU(10000);
+var textWidthCache = new SimpleLRU(4000);
 
 /**
  *
@@ -24568,14 +24568,18 @@
             var myWidths = tableState.columnWidths;
             var repaint = false;
             var a, b, c, d = 0;
+            var newVal;
             for (c = 0; c < fixedMinWidths.length; c++) {
                 a = myFixed[c];
                 b = fixedMinWidths[c];
                 d = tableState.fixedColumnAutosized[c];
                 if (a !== b || !d) {
-                    myFixed[c] = !d ? b : Math.max(a, b);
-                    tableState.fixedColumnAutosized[c] = true;
-                    repaint = true;
+                    newVal = !d ? b : Math.max(a, b);
+                    if (myFixed[c] !== newVal) {
+                        myFixed[c] = newVal;
+                        tableState.fixedColumnAutosized[c] = true;
+                        repaint = true;
+                    }
                 }
             }
             for (c = 0; c < minWidths.length; c++) {
@@ -24584,9 +24588,12 @@
                 b = minWidths[c];
                 d = tableState.columnAutosized[c];
                 if (a !== b || !d) {
-                    myWidths[ti] = !d ? b : Math.max(a, b);
-                    tableState.columnAutosized[c] = true;
-                    repaint = true;
+                    newVal = !d ? b : Math.max(a, b);
+                    if (myWidths[ti] !== newVal) {
+                        myWidths[ti] = newVal;
+                        tableState.columnAutosized[c] = true;
+                        repaint = true;
+                    }
                 }
             }
             if (repaint) {
@@ -32297,9 +32304,9 @@
             this.fire('load');
             this.isScrollButtonClick = false;
 
-            setInterval(function() {
-                self.checkRepaint();
-            }, 16);
+            // setInterval(function() {
+            //     self.checkRepaint();
+            // }, 16);
 
         },
 
@@ -32949,6 +32956,7 @@
          */
         repaint: function() {
             this.repaintFlag = true;
+            this.checkRepaint();
         },
 
         /**

diff --git a/fin-hypergrid.min.html b/fin-hypergrid.min.html
diff --git a/js/sampledata.js b/js/sampledata.js
@@ -26,15 +26,51 @@
         var income = randomFunc() * 100000;
         var employed = Math.round(randomFunc());
         var person = {
-            last_name: lastNames[lastName], //jshint ignore:line
-            first_name: firstNames[firstName], //jshint ignore:line
-            pets: pets,
-            birthDate: birthyear + '-' + months[birthmonth] + '-' + days[birthday],
-            birthState: states[birthstate],
-            residenceState: states[residencestate],
-            employed: employed === 1,
-            income: income,
-            travel: travel
+            last_name0: lastNames[lastName], //jshint ignore:line
+            first_name0: firstNames[firstName], //jshint ignore:line
+            pets0: pets,
+            birthDate0: birthyear + '-' + months[birthmonth] + '-' + days[birthday],
+            birthState0: states[birthstate],
+            residenceState0: states[residencestate],
+            employed0: employed === 1,
+            income0: income,
+            travel0: travel,
+            last_name1: lastNames[lastName], //jshint ignore:line
+            first_name1: firstNames[firstName], //jshint ignore:line
+            pets1: pets,
+            birthDate1: birthyear + '-' + months[birthmonth] + '-' + days[birthday],
+            birthState1: states[birthstate],
+            residenceState1: states[residencestate],
+            employed1: employed === 1,
+            income1: income,
+            travel1: travel,
+            last_name2: lastNames[lastName], //jshint ignore:line
+            first_name2: firstNames[firstName], //jshint ignore:line
+            pets2: pets,
+            birthDate2: birthyear + '-' + months[birthmonth] + '-' + days[birthday],
+            birthState2: states[birthstate],
+            residenceState2: states[residencestate],
+            employed2: employed === 1,
+            income2: income,
+            travel2: travel,
+            last_name3: lastNames[lastName], //jshint ignore:line
+            first_name3: firstNames[firstName], //jshint ignore:line
+            pets3: pets,
+            birthDate3: birthyear + '-' + months[birthmonth] + '-' + days[birthday],
+            birthState3: states[birthstate],
+            residenceState3: states[residencestate],
+            employed3: employed === 1,
+            income3: income,
+            travel3: travel,
+            last_name4: lastNames[lastName], //jshint ignore:line
+            first_name4: firstNames[firstName], //jshint ignore:line
+            pets4: pets,
+            birthDate4: birthyear + '-' + months[birthmonth] + '-' + days[birthday],
+            birthState4: states[birthstate],
+            residenceState4: states[residencestate],
+            employed4: employed === 1,
+            income4: income,
+            travel4: travel
         };
         return person;
     };

diff --git a/polymer/js/behaviors/fin-hypergrid-behavior-base.js b/polymer/js/behaviors/fin-hypergrid-behavior-base.js
@@ -1651,14 +1651,18 @@ it contains all code/data that's necessary for easily implementing a virtual dat
             var myWidths = tableState.columnWidths;
             var repaint = false;
             var a, b, c, d = 0;
+            var newVal;
             for (c = 0; c < fixedMinWidths.length; c++) {
                 a = myFixed[c];
                 b = fixedMinWidths[c];
                 d = tableState.fixedColumnAutosized[c];
                 if (a !== b || !d) {
-                    myFixed[c] = !d ? b : Math.max(a, b);
-                    tableState.fixedColumnAutosized[c] = true;
-                    repaint = true;
+                    newVal = !d ? b : Math.max(a, b);
+                    if (myFixed[c] !== newVal) {
+                        myFixed[c] = newVal;
+                        tableState.fixedColumnAutosized[c] = true;
+                        repaint = true;
+                    }
                 }
             }
             for (c = 0; c < minWidths.length; c++) {
@@ -1667,9 +1671,12 @@ it contains all code/data that's necessary for easily implementing a virtual dat
                 b = minWidths[c];
                 d = tableState.columnAutosized[c];
                 if (a !== b || !d) {
-                    myWidths[ti] = !d ? b : Math.max(a, b);
-                    tableState.columnAutosized[c] = true;
-                    repaint = true;
+                    newVal = !d ? b : Math.max(a, b);
+                    if (myWidths[ti] !== newVal) {
+                        myWidths[ti] = newVal;
+                        tableState.columnAutosized[c] = true;
+                        repaint = true;
+                    }
                 }
             }
             if (repaint) {

diff --git a/polymer/js/fin-hypergrid-renderer.js b/polymer/js/fin-hypergrid-renderer.js
@@ -37,7 +37,7 @@ var fontData = {};
  *
  * @property {SimpleLRU} textWidthCache - a LRU cache of 10000 of text widths
  */
-var textWidthCache = new SimpleLRU(10000);
+var textWidthCache = new SimpleLRU(4000);
 
 /**
  *

diff --git a/polymer/js/fin-hypergrid.js b/polymer/js/fin-hypergrid.js
@@ -434,9 +434,9 @@
             this.fire('load');
             this.isScrollButtonClick = false;
 
-            setInterval(function() {
-                self.checkRepaint();
-            }, 16);
+            // setInterval(function() {
+            //     self.checkRepaint();
+            // }, 16);
 
         },
 
@@ -1086,6 +1086,7 @@
          */
         repaint: function() {
             this.repaintFlag = true;
+            this.checkRepaint();
         },
 
         /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ var fontData = {}; @@
      *
      * @property {SimpleLRU} textWidthCache - a LRU cache of 10000 of text widths
      */
-    var textWidthCache = new SimpleLRU(10000);
+    var textWidthCache = new SimpleLRU(4000);
     /**
      *
@@ Expand Down @@