Merge pull request #213 from frg-fossee/develop

Merge develop to master

Author: fresearchgroup

ArduinoFrontend/package.json

@@ -23,8 +23,11 @@
     "@angular/platform-browser": "~7.2.0",
     "@angular/platform-browser-dynamic": "~7.2.0",
     "@angular/router": "~7.2.0",
+    "chroma-js": "^1.3.5",
     "core-js": "^2.5.4",
     "is-promise": "2.2.2",
+    "lodash": "^4.17.19",
+    "lodash-transpose": "^0.2.1",
     "ngx-monaco-editor": "^7.0.0",
     "rxjs": "~6.3.3",
     "tslib": "^1.9.0",

ArduinoFrontend/src/app/Libs/CircuitElement.ts

@@ -1,6 +1,7 @@
 import { Point } from './Point';
 import { Wire } from './Wire';
 import { isNull } from 'util';
+import { BoundingBox } from './Geometry';
 
 /**
  * Abstract Class Circuit Elements
@@ -110,6 +111,14 @@ export abstract class CircuitElement {
         });
     }
   }
+
+  /**
+   * Returns bounding box of the circuit element
+   */
+  getBoundingBox(): BoundingBox {
+    return BoundingBox.loadFromRaphaelBbox(this.elements.getBBox());
+  }
+
   /**
    * Draws circuit nodes
    * @param canvas Raphael Canvas
@@ -136,26 +145,23 @@ export abstract class CircuitElement {
    * @param drawData Draw Data
    */
   DrawElement(canvas: any, drawData: any) {
+    const elementsDrawn = [];
     for (const item of drawData) {
+      let element;
       // Draw image
       if (item.type === 'image') {
-        this.elements.push(
-          canvas.image(
+        element = canvas.image(
             item.url,
             this.x + item.x,
             this.y + item.y,
             item.width,
             item.height
-          )
-        );
+          );
       } else if (item.type === 'path') {
-        this.elements.push(
-          this.DrawPath(canvas, item)
-        );
+        element = this.DrawPath(canvas, item);
       } else if (item.type === 'rectangle') {
         // Draw rectangle
-        this.elements.push(
-          canvas.rect(
+        element = canvas.rect(
             this.x + item.x,
             this.y + item.y,
             item.width,
@@ -164,24 +170,24 @@ export abstract class CircuitElement {
           ).attr({
             fill: item.fill || 'none',
             stroke: item.stroke || 'none'
-          })
-        );
+          });
       } else if (item.type === 'circle') {
         // Draw a circle
-        this.elements.push(
-          canvas.circle(
+        element = canvas.circle(
             this.x + item.x,
             this.y + item.y,
             item.radius,
           ).attr({
             fill: item.fill || 'none',
             stroke: item.stroke || 'none'
-          })
-        );
+          });
       } else if (item.type === 'polygon') {
-        this.DrawPolygon(canvas, item);
+        element = this.DrawPolygon(canvas, item);
       }
+      this.elements.push(element);
+      elementsDrawn.push(element);
     }
+    return elementsDrawn;
   }
   /**
    * Draws an Polygon
@@ -198,13 +204,11 @@ export abstract class CircuitElement {
       tmp += `${this.x + point[0]},${this.y + point[1]}L`;
     }
     tmp = tmp.substr(0, tmp.length - 1) + 'z';
-    this.elements.push(
-      canvas.path(tmp)
-        .attr({
-          fill: item.fill || 'none',
-          stroke: item.stroke || 'none'
-        })
-    );
+    return canvas.path(tmp)
+                  .attr({
+                    fill: item.fill || 'none',
+                    stroke: item.stroke || 'none'
+                  });
   }
   /**
    * Draw a Path
@@ -227,13 +231,11 @@ export abstract class CircuitElement {
     str = this.calcRelative(str, horizontal, canvas);
     str = this.calcRelative(str, vertical, canvas);
     str = this.calcRelative(str, sCurve, canvas);
-    this.elements.push(
-      canvas.path(str)
-        .attr({
-          fill: item.fill || 'none',
-          stroke: item.stroke || 'none'
-        })
-    );
+    return canvas.path(str)
+                    .attr({
+                      fill: item.fill || 'none',
+                      stroke: item.stroke || 'none'
+                    });
   }
   /**
    * Draw path relative to the component
@@ -291,6 +293,7 @@ export abstract class CircuitElement {
       for (let i = 0; i < this.nodes.length; ++i) {
         this.nodes[i].move(tmpar[i][0] + dx, tmpar[i][1] + dy);
       }
+      window['onDragEvent'](this);
     }, () => {
       fdx = 0;
       fdy = 0;
@@ -308,6 +311,7 @@ export abstract class CircuitElement {
       // }
       this.tx += fdx;
       this.ty += fdy;
+      window['onDragStopEvent'](this);
     });
   }
   /**