Object active flag

NikitchenkoSergey · Mar 19, 2018 · 787057d · 787057d
1 parent 1fed4de
commit 787057d
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -171,8 +171,13 @@ schemeDesigner.render();
     </tr>
      <tr>
         <td>rotation: number</td>
-        <td></td>
+        <td>0</td>
         <td>Rotation</td>
+    </tr>
+     <tr>
+        <td>active: boolean</td>
+        <td>true</td>
+        <td>Active object can hanlde events.</td>
     </tr>
      <tr>
         <td>cursorStyle: string</td>

diff --git a/dist/scheme-designer.js b/dist/scheme-designer.js
@@ -89,10 +89,10 @@ var SchemeDesigner;
             return this.visible;
         };
         /**
-         * Get active
+         * Get is active
          * @return {boolean}
          */
-        Layer.prototype.getActive = function () {
+        Layer.prototype.isActive = function () {
             return this.active;
         };
         /**
@@ -502,6 +502,10 @@ var SchemeDesigner;
          * @param {Object} params
          */
         function SchemeObject(params) {
+            /**
+             * Is active
+             */
+            this.active = true;
             /**
              * Rotation
              */
@@ -698,6 +702,20 @@ var SchemeDesigner;
         SchemeObject.prototype.getRotation = function () {
             return this.rotation;
         };
+        /**
+         * Get is active
+         * @return {boolean}
+         */
+        SchemeObject.prototype.isActive = function () {
+            return this.active;
+        };
+        /**
+         * Set active
+         * @param {boolean} value
+         */
+        SchemeObject.prototype.setActive = function (value) {
+            this.active = value;
+        };
         return SchemeObject;
     }());
     SchemeDesigner.SchemeObject = SchemeObject;
@@ -1915,12 +1933,15 @@ var SchemeDesigner;
             // search object in node
             for (var layerId in nodeObjectsByLayers) {
                 var layer = this.getLayerById(layerId);
-                if (!layer.getActive()) {
+                if (!layer.isActive()) {
                     continue;
                 }
                 var objects = nodeObjectsByLayers[layerId];
                 for (var _i = 0, objects_1 = objects; _i < objects_1.length; _i++) {
                     var schemeObject = objects_1[_i];
+                    if (!schemeObject.isActive()) {
+                        continue;
+                    }
                     var boundingRect = schemeObject.getBoundingRect();
                     if (SchemeDesigner.Tools.pointInRect({ x: x, y: y }, boundingRect, schemeObject.getRotation())) {
                         result.push(schemeObject);

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?16"></script>
+    <script src="../dist/scheme-designer.min.js?17"></script>
 
     <!-- data for scheme -->
     <script src="./scheme-data.js?1"></script>
@@ -194,6 +194,7 @@ <h2>Hall scheme example</h2>
             y: 0.5 + topOffset,
             width: width,
             height: height,
+            active: objectData.ObjectType == 'Place'? true : false,
             renderFunction: objectData.ObjectType == 'Place' ? renderPlace : renderLabel,
             cursorStyle: objectData.ObjectType == 'Place' ? 'pointer' : 'default',
 

diff --git a/src/Layer.ts b/src/Layer.ts
@@ -119,10 +119,10 @@ namespace SchemeDesigner {
         }
 
         /**
-         * Get active
+         * Get is active
          * @return {boolean}
          */
-        public getActive(): boolean
+        public isActive(): boolean
         {
             return this.active;
         }

diff --git a/src/SchemeObject.ts b/src/SchemeObject.ts
@@ -30,6 +30,11 @@ namespace SchemeDesigner {
          */
         protected height: number;
 
+        /**
+         * Is active
+         */
+        protected active: boolean = true;
+
         /**
          * Rotation
          */
@@ -313,5 +318,23 @@ namespace SchemeDesigner {
         {
             return this.rotation;
         }
+
+        /**
+         * Get is active
+         * @return {boolean}
+         */
+        public isActive(): boolean
+        {
+            return this.active;
+        }
+
+        /**
+         * Set active
+         * @param {boolean} value
+         */
+        public setActive(value: boolean): void
+        {
+            this.active = value;
+        }
     }
 }
diff --git a/src/managers/StorageManager.ts b/src/managers/StorageManager.ts
@@ -252,12 +252,17 @@ namespace SchemeDesigner {
             // search object in node
             for (let layerId in nodeObjectsByLayers) {
                 let layer = this.getLayerById(layerId);
-                if (!layer.getActive()) {
+                if (!layer.isActive()) {
                     continue;
                 }
 
                 let objects = nodeObjectsByLayers[layerId];
                 for (let schemeObject of objects) {
+
+                    if (!schemeObject.isActive()) {
+                        continue;
+                    }
+
                     let boundingRect = schemeObject.getBoundingRect();
                     if (Tools.pointInRect({x: x, y: y}, boundingRect, schemeObject.getRotation())) {
                         result.push(schemeObject)