Fix update cache of changed objects

NikitchenkoSergey · Apr 3, 2018 · 59144e8 · 59144e8
1 parent eb5d176
commit 59144e8
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 17 deletions.
diff --git a/dist/scheme-designer.js b/dist/scheme-designer.js
@@ -58,6 +58,7 @@ var SchemeDesigner;
          * @param {SchemeObject} object
          */
         Layer.prototype.addObject = function (object) {
+            object.setLayerId(this.id);
             this.objects.push(object);
         };
         /**
@@ -82,10 +83,10 @@ var SchemeDesigner;
             this.visible = value;
         };
         /**
-         * Get visible
+         * Get is visible
          * @return {boolean}
          */
-        Layer.prototype.getVisible = function () {
+        Layer.prototype.isVisible = function () {
             return this.visible;
         };
         /**
@@ -420,8 +421,12 @@ var SchemeDesigner;
             if (onlyChanged) {
                 for (var _i = 0, _a = this.changedObjects; _i < _a.length; _i++) {
                     var schemeObject = _a[_i];
-                    schemeObject.clear(this, this.cacheView);
-                    schemeObject.render(this, this.cacheView);
+                    var layer = this.storageManager.getLayerById(schemeObject.getLayerId());
+                    console.log(layer);
+                    if (layer instanceof SchemeDesigner.Layer && layer.isVisible()) {
+                        schemeObject.clear(this, this.cacheView);
+                        schemeObject.render(this, this.cacheView);
+                    }
                 }
             }
             else {
@@ -522,6 +527,20 @@ var SchemeDesigner;
             SchemeDesigner.Tools.configure(this, params);
             this.params = params;
         }
+        /**
+         * Set layer id
+         * @param {string} layerId
+         */
+        SchemeObject.prototype.setLayerId = function (layerId) {
+            this.layerId = layerId;
+        };
+        /**
+         * Get layer id
+         * @return {string}
+         */
+        SchemeObject.prototype.getLayerId = function () {
+            return this.layerId;
+        };
         /**
          * Get id
          * @returns {number}
@@ -1799,7 +1818,7 @@ var SchemeDesigner;
             var layers = this.getSortedLayers();
             for (var _i = 0, layers_1 = layers; _i < layers_1.length; _i++) {
                 var layer = layers_1[_i];
-                if (layer.getVisible()) {
+                if (layer.isVisible()) {
                     var objects = layer.getObjects();
                     if (typeof objects !== 'undefined' && objects.length) {
                         result[layer.getId()] = objects;
@@ -1833,7 +1852,7 @@ var SchemeDesigner;
             var layers = [];
             for (var layerId in this.layers) {
                 var layer = this.layers[layerId];
-                if (layer.getVisible()) {
+                if (layer.isVisible()) {
                     layers.push(layer);
                 }
             }

diff --git a/dist/scheme-designer.min.js b/dist/scheme-designer.min.js
diff --git a/examples/index.html b/examples/index.html
@@ -8,7 +8,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
-    <script src="../dist/scheme-designer.min.js?17"></script>
+    <script src="../dist/scheme-designer.min.js?18"></script>
 
     <!-- data for scheme -->
     <script src="./scheme-data.js?1"></script>
@@ -313,7 +313,7 @@ <h2>Hall scheme example</h2>
     }, false);
 
     canvas.addEventListener('schemeDesigner.zoom', function (e) {
-       // console.log('zoom', e.detail);
+        //  console.log('zoom', e.detail);
     }, false);
 </script>
 </body>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scheme-designer",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Canvas scheme designer, scheme constructor on javascript (typescript)",
   "main": "scheme-designer.js",
   "scripts": {

diff --git a/src/Layer.ts b/src/Layer.ts
@@ -78,6 +78,7 @@ namespace SchemeDesigner {
          */
         public addObject(object: SchemeObject): void
         {
+            object.setLayerId(this.id);
             this.objects.push(object);
         }
 
@@ -110,10 +111,10 @@ namespace SchemeDesigner {
         }
 
         /**
-         * Get visible
+         * Get is visible
          * @return {boolean}
          */
-        public getVisible(): boolean
+        public isVisible(): boolean
         {
             return this.visible;
         }

diff --git a/src/Scheme.ts b/src/Scheme.ts
@@ -433,8 +433,12 @@ namespace SchemeDesigner {
 
             if (onlyChanged) {
                 for (let schemeObject of this.changedObjects) {
-                    schemeObject.clear(this, this.cacheView);
-                    schemeObject.render(this, this.cacheView);
+                    let layer = this.storageManager.getLayerById(schemeObject.getLayerId());
+
+                    if (layer instanceof Layer && layer.isVisible()) {
+                        schemeObject.clear(this, this.cacheView);
+                        schemeObject.render(this, this.cacheView);
+                    }
                 }
             } else {
                 let boundingRect = this.storageManager.getObjectsBoundingRect();

diff --git a/src/SchemeObject.ts b/src/SchemeObject.ts
@@ -80,6 +80,11 @@ namespace SchemeDesigner {
          */
         protected params: any;
 
+        /**
+         * Layer id
+         */
+        protected layerId: string;
+
         /**
          * Constructor
          * @param {Object} params
@@ -93,6 +98,24 @@ namespace SchemeDesigner {
             this.params = params;
         }
 
+        /**
+         * Set layer id
+         * @param {string} layerId
+         */
+        public setLayerId(layerId: string)
+        {
+            this.layerId = layerId;
+        }
+
+        /**
+         * Get layer id
+         * @return {string}
+         */
+        public getLayerId(): string
+        {
+            return this.layerId;
+        }
+
         /**
          * Get id
          * @returns {number}

diff --git a/src/managers/StorageManager.ts b/src/managers/StorageManager.ts
@@ -83,7 +83,7 @@ namespace SchemeDesigner {
             let layers = this.getSortedLayers();
 
             for (let layer of layers) {
-                if (layer.getVisible()) {
+                if (layer.isVisible()) {
                     let objects = layer.getObjects();
                     if (typeof objects !== 'undefined' && objects.length) {
                         result[layer.getId()] = objects;
@@ -123,7 +123,7 @@ namespace SchemeDesigner {
             let layers: Layer[] = [];
             for (let layerId in this.layers) {
                 let layer = this.layers[layerId];
-                if (layer.getVisible()) {
+                if (layer.isVisible()) {
                     layers.push(layer);
                 }
             }