Added missing variables.

This reverts commit 012fe4bc4a.

bin/testrunner.js

@@ -1,9 +1,9 @@
 /**
- * 
- * make screenshots and log errors to 
+ *
+ * make screenshots and log errors to
  * console
  * (c) 2019 - Leibniz-Insitut für Wissensmedien
- * 
+ *
  */
 
 const puppeteer = require('puppeteer');
@@ -24,13 +24,13 @@ function logPageEvent(event){
 }
 
 async function makeScreenshot(href){
-    
+
     const browser = await puppeteer.launch({args: [
         '–allow-file-access-from-files',
       ],});
 
     const page = await browser.newPage();
-    
+
     await page.setViewport({width: 1024,height : 624})
 
     // register events
@@ -53,9 +53,9 @@ async function makeScreenshot(href){
     }
     // image_url = image_url.replace("file:///","")
     // fpath = fpath.replace("file:///","")
-    
+
     page.removeAllListeners()
-    
+
     fs.ensureDir(fpath)
 
     await page.screenshot({path: image_url});
@@ -63,10 +63,10 @@ async function makeScreenshot(href){
 }
 
 /**
- * 
+ *
  * collect all navigational links in all documents
- *  
- * */ 
+ *
+ * */
 
 async function collectLinks(href,reflist)
 {
@@ -76,12 +76,12 @@ async function collectLinks(href,reflist)
 
     await page.goto(href)
     let hrefs = await page.$$('a.wrapper')
-    
+
     for (var i=0; i < hrefs.length; i++) {
         let hrefValue = await hrefs[i].getProperty('href')
         let linkText = await hrefValue.jsonValue();
         if (!linkText.startsWith("file:"))
-        { 
+        {
             continue;
         }
         if(linkText.endsWith("#")) continue;
@@ -113,4 +113,4 @@ async function collectLinks(href,reflist)
         await makeScreenshot(reflist[i])
         console.log(i,reflist[i])
     }
-})()
+})()

dist/iwmlib.pixi.js

@@ -7260,7 +7260,7 @@
                 let resizeW = r * Math.cos(Angle.degree2radian(phiCorrected));
                 let resizeH = -r * Math.sin(Angle.degree2radian(phiCorrected));
 
-                if (this.element.offsetWidth + resizeW / this.scale > this.width * 0.3 && this.element.offsetHeight + resizeH / this.scale > this.height * 0.3) TweenLite.to(this.element, 0, { width: this.element.offsetWidth + resizeW / this.scale, height: this.element.offsetHeight + resizeH / this.scale });
+                if ((this.element.offsetWidth + resizeW) / this.scale > this.width * 0.5 / this.scale && (this.element.offsetHeight + resizeH) / this.scale > this.height * 0.3  / this.scale) TweenLite.to(this.element, 0, { width: this.element.offsetWidth + resizeW / this.scale, height: this.element.offsetHeight + resizeH / this.scale });
 
                 this.oldX = e.clientX;
                 this.oldY = e.clientY;
@@ -7805,7 +7805,7 @@
     /* globals PIXI, console*/
 
     const registeredTiles = new Map();
-    const pendingTiles = new Map();
+    // const pendingTiles = new Map()
     /** Implements a baseTexture cache. The last textures are kept for reuse  */
     let keepTextures = 0;
     const keptTextures = [];
@@ -7840,14 +7840,35 @@
          * @param {*} url
          * @memberof Tile
          */
-        static schedule(url) {
-            let count = 0;
+       /* static schedule(url) {
+            let count = 0
             if (pendingTiles.has(url)) {
-                count = pendingTiles.get(url);
+                count = pendingTiles.get(url)
             }
-            pendingTiles.set(url, count + 1);
+            pendingTiles.set(url, count + 1)
             // console.log("Tile.scheduled", url, pendingTiles.size)
-        }
+        } */
+
+        /**
+         * Removes the given url from pending urls.
+         *
+         * @static
+         * @param {*} url
+         * @memberof Tile
+         */
+        /* static unschedule(url) {
+            if (pendingTiles.has(url)) {
+                let count = pendingTiles.get(url)
+                if (count > 1) {
+                    pendingTiles.set(url, count - 1)
+                }
+                else {
+                    pendingTiles.clear(url)
+                }
+            }
+            // console.log("Tile.unscheduled", url, pendingTiles.size)
+        } */
+
 
         /**
          * Returns true iff the url is pending
@@ -7857,9 +7878,9 @@
          * @returns
          * @memberof Tile
          */
-        static isPending(url) {
+        /*static isPending(url) {
             return pendingTiles.has(url) && pendingTiles.get(url) > 0
-        }
+        } */
 
         static isObsolete(url) {
             if (registeredTiles.has(url) && registeredTiles.get(url) > 0) {
@@ -7868,26 +7889,6 @@
             return true
         }
 
-        /**
-         * Removes the given url from pending urls.
-         *
-         * @static
-         * @param {*} url
-         * @memberof Tile
-         */
-        static unschedule(url) {
-            if (pendingTiles.has(url)) {
-                let count = pendingTiles.get(url);
-                if (count > 1) {
-                    pendingTiles.set(url, count - 1);
-                }
-                else {
-                    pendingTiles.clear(url);
-                }
-            }
-            // console.log("Tile.unscheduled", url, pendingTiles.size)
-        }
-
         /**
          * Loads a tile from image using the PIXI.Texture.fromImage method.
          *
@@ -7910,7 +7911,7 @@
          * @memberof Tile
          */
         register(url, debug = false) {
-            Tile.unschedule(url);
+            //Tile.unschedule(url)
             if (registeredTiles.has(url)) {
                 let tiles = registeredTiles.get(url);
                 tiles.add(this);
@@ -7964,7 +7965,7 @@
             }
             else {
                 // No longer registered and not pending
-                if (count <= 0 && !Tile.isPending(this.url)) {
+                if (count <= 0) { // && !Tile.isPending(this.url)
                     let opts = { children: true, texture: true, baseTexture: true };
                     super.destroy(opts);
                     if (debug) console.log("Tile.destroy", registeredTiles.size, opts);
@@ -8053,7 +8054,7 @@
             if (this.loaded.has(url)) return false
             if (this.loading.has(url)) return false
 
-            Tile.schedule(url);
+            //Tile.schedule(url)
             this.map.set(url, [col, row]);
             this.loading.add(url);
             this.loadQueue.push(url);
@@ -8063,7 +8064,7 @@
         unschedule(url) {
             if (this.loaded.has(url)) this.loaded.delete(url);
             if (this.loading.has(url)) this.loading.delete(url);
-            Tile.unschedule(url);
+            //Tile.unschedule(url)
             this.loadQueue = this.loadQueue.filter(item => item != url);
         }
 
@@ -8123,7 +8124,7 @@
             if (this.loaded.has(url)) return false
             if (this.loading.has(url)) return false
 
-            Tile.schedule(url);
+            //Tile.schedule(url)
             let reusableTexture = Tile.textureAvailable(url);
             if (reusableTexture) {
                 if (this.debug) console.log('Texture reusable', reusableTexture);
@@ -8646,9 +8647,6 @@
         return n % 2 == 0
     }
 
-    function printTileCacheInfos() {
-        Tile.printInfos();
-    }
     /**
      * A utility class that holds information typically provided by DZI files, i.e.
      * height and width of the overall image, overlap, and image type.
@@ -9275,9 +9273,9 @@
         }
 
         worldBounds() {
-            let viewBounds = this.app.scene.bounds; // UO: Never use getBounds()
+            let viewBounds = this.app.scene.bounds || this.app.scene.getBounds(); 
             // Using getBounds extends visible scope after loading tiles and leads
-            // to excessive loading
+            // to excessive loading. So we prefer bounds over getBounds()
             if (this.world != null) {
                 let bounds = this.world.bounds;
                 let x = Math.max(-bounds.width, bounds.x);
@@ -9722,7 +9720,6 @@
             this.active = false;
             this.destroyAllTiles();
             this.tileContainer.destroy({ children: true });
-            printTileCacheInfos();
         }
 
         throwFinished() {
@@ -9732,20 +9729,7 @@
             if (typeof currentTiles == 'undefined') {
                 return
             }
-
             this.ensureTiles(this.currentLevel);
-            // let all = new Set()
-            // for (let tile of currentTiles.children) {
-            //     all.add(tile.url)
-            // }
-            // let { centerCol, centerRow, needed } = this.neededTiles(currentTiles, this.currentLevel)
-            // for (let [url, col, row] of needed) {
-            //     all.delete(url)
-            // }
-            // for (let url of all) {
-            //     currentTiles.destroyTileByUrl(url)
-            // }
-            // currentTiles.loader.loader.reset()
         }
     }
 

lib/logging.js

@@ -1,11 +1,17 @@
 let ipc = null
+let logMessages = new Set()
 
 try {
     ipc = require('electron').ipcRenderer
-} catch (e) {}
+} catch (e) {
+    console.log("Cannot use electron logging.")
+}
 
 /** Basic class for app specific logging requirements.
  * Can be used to implement persistent logging in electron apps.
+ * Uses a logMessage cache to prevent error overflows. This is 
+ * needed since errors may occur very frequently
+ * (e.g. display update loops at 60fps, programmatic loops, ...).
  */
 export default class Logging {
 
@@ -20,4 +26,36 @@ export default class Logging {
             console.log(message)
         }
     }
+
+    /**
+     * Static warn function. 
+     * Emits each warning only once per session.
+     * @param {*} message 
+     */
+    static warn(message) {
+        if (!logMessages.has(message)) {
+            logMessages.add(message)
+            if (ipc) {
+                ipc.send('warn', message)
+            } else {
+                console.warn(message)
+            }
+        }
+    }
+
+    /**
+    * Static error function. 
+    * Emits each error message only once per session.
+    * @param {*} message 
+    */
+    static error(message) {
+        if (!logMessages.has(message)) {
+            logMessages.add(message)
+            if (ipc) {
+                ipc.send('error', message)
+            } else {
+                console.error(message)
+            }
+        }
+    }
 }

lib/pixi/deepzoom/image.js

@@ -7,9 +7,6 @@ function isEven(n) {
     return n % 2 == 0
 }
 
-function printTileCacheInfos() {
-    Tile.printInfos()
-}
 /**
  * A utility class that holds information typically provided by DZI files, i.e.
  * height and width of the overall image, overlap, and image type.
@@ -636,9 +633,9 @@ export class DeepZoomImage extends PIXI.Container {
     }
 
     worldBounds() {
-        let viewBounds = this.app.scene.bounds // UO: Never use getBounds()
+        let viewBounds = this.app.scene.bounds || this.app.scene.getBounds() 
         // Using getBounds extends visible scope after loading tiles and leads
-        // to excessive loading
+        // to excessive loading. So we prefer bounds over getBounds()
         if (this.world != null) {
             let bounds = this.world.bounds
             let x = Math.max(-bounds.width, bounds.x)
@@ -1083,7 +1080,6 @@ export class DeepZoomImage extends PIXI.Container {
         this.active = false
         this.destroyAllTiles()
         this.tileContainer.destroy({ children: true })
-        printTileCacheInfos()
     }
 
     throwFinished() {
@@ -1093,19 +1089,6 @@ export class DeepZoomImage extends PIXI.Container {
         if (typeof currentTiles == 'undefined') {
             return
         }
-
         this.ensureTiles(this.currentLevel)
-        // let all = new Set()
-        // for (let tile of currentTiles.children) {
-        //     all.add(tile.url)
-        // }
-        // let { centerCol, centerRow, needed } = this.neededTiles(currentTiles, this.currentLevel)
-        // for (let [url, col, row] of needed) {
-        //     all.delete(url)
-        // }
-        // for (let url of all) {
-        //     currentTiles.destroyTileByUrl(url)
-        // }
-        // currentTiles.loader.loader.reset()
     }
 }

lib/pixi/deepzoom/loader.js

@@ -29,7 +29,7 @@ export class TileLoader {
         if (this.loaded.has(url)) return false
         if (this.loading.has(url)) return false
 
-        Tile.schedule(url)
+        //Tile.schedule(url)
         this.map.set(url, [col, row])
         this.loading.add(url)
         this.loadQueue.push(url)
@@ -39,7 +39,7 @@ export class TileLoader {
     unschedule(url) {
         if (this.loaded.has(url)) this.loaded.delete(url)
         if (this.loading.has(url)) this.loading.delete(url)
-        Tile.unschedule(url)
+        //Tile.unschedule(url)
         this.loadQueue = this.loadQueue.filter(item => item != url)
     }
 
@@ -99,7 +99,7 @@ export class PIXITileLoader extends TileLoader {
         if (this.loaded.has(url)) return false
         if (this.loading.has(url)) return false
 
-        Tile.schedule(url)
+        //Tile.schedule(url)
         let reusableTexture = Tile.textureAvailable(url)
         if (reusableTexture) {
             if (this.debug) console.log('Texture reusable', reusableTexture)

lib/pixi/deepzoom/tile.js

@@ -2,10 +2,12 @@
 /* globals PIXI, console*/
 
 const registeredTiles = new Map()
-const pendingTiles = new Map()
 /** Implements a baseTexture cache. The last textures are kept for reuse  */
 let keepTextures = 0
 const keptTextures = []
+const lateTextures = new Map()
+let lastSweepTime = 0
+let sweepInterval = 2000.0
 
 /** The current Tile implementation simply uses PIXI.Sprites.
  *
@@ -30,22 +32,6 @@ export default class Tile extends PIXI.Sprite {
         keepTextures = value
     }
 
-    /**
-     * Marks the given url as pending. Pending tiles should not be destroyed
-     *
-     * @static
-     * @param {*} url
-     * @memberof Tile
-     */
-    static schedule(url) {
-        let count = 0
-        if (pendingTiles.has(url)) {
-            count = pendingTiles.get(url)
-        }
-        pendingTiles.set(url, count + 1)
-        // console.log("Tile.scheduled", url, pendingTiles.size)
-    }
-
     /**
      * Returns true iff the url is pending
      *
@@ -54,9 +40,9 @@ export default class Tile extends PIXI.Sprite {
      * @returns
      * @memberof Tile
      */
-    static isPending(url) {
+    /*static isPending(url) {
         return pendingTiles.has(url) && pendingTiles.get(url) > 0
-    }
+    } */
 
     static isObsolete(url) {
         if (registeredTiles.has(url) && registeredTiles.get(url) > 0) {
@@ -65,26 +51,6 @@ export default class Tile extends PIXI.Sprite {
         return true
     }
 
-    /**
-     * Removes the given url from pending urls.
-     *
-     * @static
-     * @param {*} url
-     * @memberof Tile
-     */
-    static unschedule(url) {
-        if (pendingTiles.has(url)) {
-            let count = pendingTiles.get(url)
-            if (count > 1) {
-                pendingTiles.set(url, count - 1)
-            }
-            else {
-                pendingTiles.clear(url)
-            }
-        }
-        // console.log("Tile.unscheduled", url, pendingTiles.size)
-    }
-
     /**
      * Loads a tile from image using the PIXI.Texture.fromImage method.
      *
@@ -107,7 +73,7 @@ export default class Tile extends PIXI.Sprite {
      * @memberof Tile
      */
     register(url, debug = false) {
-        Tile.unschedule(url)
+        //Tile.unschedule(url)
         if (registeredTiles.has(url)) {
             let tiles = registeredTiles.get(url)
             tiles.add(this)
@@ -161,7 +127,7 @@ export default class Tile extends PIXI.Sprite {
         }
         else {
             // No longer registered and not pending
-            if (count <= 0 && !Tile.isPending(this.url)) {
+            if (count <= 0) { // && !Tile.isPending(this.url)
                 let opts = { children: true, texture: true, baseTexture: true }
                 super.destroy(opts)
                 if (debug) console.log("Tile.destroy", registeredTiles.size, opts)
@@ -197,14 +163,60 @@ export default class Tile extends PIXI.Sprite {
         return null
     }
 
+    /**
+     * Specialized renderWebGL to avoid freezing system
+     *
+     * @param {*} renderer
+     * @memberof Tile
+     */
+    renderWebGL(renderer) {
+        try {
+            super.renderWebGL(renderer)
+        }
+        catch (e) {
+            // We want persistent logging here
+            Logging.error("Error in Tile.renderWebGL: " + e.message)
+        }
+    }
+
+    /**
+     * Removes lately arrived texture if they have not been touched in the meanwhile.
+     *
+     * @static
+     * @memberof Tile
+     */
+    static sweepLateTextures() {
+        let now = performance.now()
+        if (now > lastSweepTime + sweepInterval) {
+            lastSweepTime = now
+            let count = 0
+            for (let [url, texture] of lateTextures.entries()) {
+                if (texture) {
+                    let base = texture.baseTexture
+                    if (base != null && base.touched == 0) {
+                        texture.destroy(true)
+                        //console.info("Sweeping ", url)
+                        count += 1
+                        lateTextures.delete(url)
+                    }
+                }
+            }
+            if (count > 0)
+                console.log("Sweeping textures", count)
+        }
+    }
+
     /**
      * Texture received too late. We do not need it.
      * @param {*} url 
      * @param {*} texture 
      */
     static lateTexture(url, texture) {
-        let destroyBase = !registeredTiles.has(url)
-        texture.destroy(destroyBase)
+        lateTextures.set(url, texture)
+        //console.warn("Tile.lateTexture")
+        // We cannot destroy the texture since we got errors in t.renderWebGL.
+        // Perhaps we can destroy unsed textures later on
+        Tile.sweepLateTextures()
     }
 
     static printInfos() {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "iwmlib",
-    "version": "1.0.12",
+    "version": "1.0.14",
     "description": "An Open Source library for multi-touch, WebGL powered applications.",
     "main": "index.js",
     "directories": {