dcim-topology2d 2.2.3 → 3.0.2

package/core/src/middles/nodes/pentagon.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../models';
+import { Rect } from '../../models/rect';
 export function pentagonIconRect(node) {
     var w = node.rect.width / 2;
     var h = node.rect.height / 2;

package/core/src/middles/nodes/rectangle.js

@@ -1,62 +1,23 @@
 export function rectangle(ctx, node) {
-
-    var topLeftR = node.borderRadiusTopLeft;
-    var topRightR = node.borderRadiusTopRight;
-    var bottomLeftR = node.borderRadiusBottomLeft;
-    var bottomRightR = node.borderRadiusBottomRight;
-
-
-    var w = node.rect.width > node.rect.height ? node.rect.height : node.rect.width;
-
-
-    if (node.borderRadiusTopLeft < 1) {
-
-        topLeftR = w * node.borderRadiusTopLeft;
-
+    var wr = node.borderRadius;
+    var hr = node.borderRadius;
+    if (node.borderRadius < 1) {
+        wr = node.rect.width * node.borderRadius;
+        hr = node.rect.height * node.borderRadius;
     }
-    if (node.borderRadiusTopRight < 1) {
-
-        topRightR = w * node.borderRadiusTopRight;
-
+    var r = wr < hr ? wr : hr;
+    if (node.rect.width < 2 * r) {
+        r = node.rect.width / 2;
     }
-    if (node.borderRadiusBottomLeft < 1) {
-
-        bottomLeftR = w * node.borderRadiusBottomLeft;
-
+    if (node.rect.height < 2 * r) {
+        r = node.rect.height / 2;
     }
-    if (node.borderRadiusBottomRight < 1) {
-
-        bottomRightR = w * node.borderRadiusBottomRight;
-
-    }
-
-    var tlr = topLeftR;
-    if (w < 2 * tlr) {
-        tlr = w / 2
-    }
-
-    var trr = topRightR;
-    if (w < 2 * trr) {
-        trr = w / 2
-    }
-
-    var blr = bottomLeftR;
-    if (w < 2 * blr) {
-        blr = w / 2
-    }
-
-    var brr = bottomRightR;
-    if (w < 2 * brr) {
-        brr = w / 2
-    }
-
     ctx.beginPath();
-
-    ctx.moveTo(node.rect.x + tlr, node.rect.y);
-    ctx.arcTo(node.rect.x + node.rect.width, node.rect.y, node.rect.x + node.rect.width, node.rect.y + node.rect.height, trr);
-    ctx.arcTo(node.rect.x + node.rect.width, node.rect.y + node.rect.height, node.rect.x, node.rect.y + node.rect.height, brr);
-    ctx.arcTo(node.rect.x, node.rect.y + node.rect.height, node.rect.x, node.rect.y, blr);
-    ctx.arcTo(node.rect.x, node.rect.y, node.rect.x + node.rect.width, node.rect.y, tlr);
+    ctx.moveTo(node.rect.x + r, node.rect.y);
+    ctx.arcTo(node.rect.x + node.rect.width, node.rect.y, node.rect.x + node.rect.width, node.rect.y + node.rect.height, r);
+    ctx.arcTo(node.rect.x + node.rect.width, node.rect.y + node.rect.height, node.rect.x, node.rect.y + node.rect.height, r);
+    ctx.arcTo(node.rect.x, node.rect.y + node.rect.height, node.rect.x, node.rect.y, r);
+    ctx.arcTo(node.rect.x, node.rect.y, node.rect.x + node.rect.width, node.rect.y, r);
     ctx.closePath();
     (node.fillStyle || node.bkType) && ctx.fill();
     ctx.stroke();

package/core/src/middles/nodes/rectangle.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../models';
+import { Rect } from '../../models/rect';
 export function rectangleIconRect(node) {
     node.iconRect = new Rect(node.rect.x + node.paddingLeftNum, node.rect.y + node.paddingTopNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum);
     node.fullIconRect = new Rect(node.rect.x + node.paddingLeftNum, node.rect.y + node.paddingTopNum, node.rect.width - node.paddingLeftNum - node.paddingRightNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum);

package/core/src/models/data.d.ts

@@ -0,0 +1,26 @@
+import { Pen } from './pen';
+import { Lock } from './status';
+export declare class TopologyData {
+    pens: Pen[];
+    lineName: string;
+    fromArrowType: string;
+    toArrowType: string;
+    scale: number;
+    locked: Lock;
+    bkImage: string;
+    bkColor: string;
+    grid?: boolean;
+    websocket?: string;
+    mqttUrl?: string;
+    mqttOptions?: {
+        clientId?: string;
+        username?: string;
+        password?: string;
+    };
+    mqttTopics?: string;
+    manualCps?: boolean;
+    dataConstruct?: any;
+    data?: any;
+    bkImageRect?: any;
+    constructor(json?: any);
+}

package/core/src/models/data.js

@@ -0,0 +1,77 @@
+import { Node } from './node';
+import { Line } from './line';
+import { Lock } from './status';
+import { s8 } from '../utils';
+var TopologyData = /** @class */ (function () {
+    function TopologyData(json) {
+        this.pens = [];
+        this.lineName = 'curve';
+        this.fromArrowType = '';
+        this.toArrowType = 'triangleSolid';
+        this.scale = 1;
+        this.locked = Lock.None;
+        this.bkImageRect = null;
+        this.mqttOptions = {
+            clientId: s8()
+        };
+        this.dataConstruct = {};
+        if (json) {
+            this.pens = [];
+            json.dataConstruct = {};
+            for (var _i = 0, _a = json.pens; _i < _a.length; _i++) {
+                var item = _a[_i];
+                if (item.from) {
+                    this.pens.push(new Line(item));
+                }
+                else {
+                    if(item.name === 'formTable') {
+                        json.dataConstruct[item.id] = {
+                            id: item.id,
+                            name: 'table'
+                        }
+                    }
+                    this.pens.push(new Node(item));
+                }
+            }
+            this.lineName = json.lineName || 'curve';
+            this.fromArrowType = json.fromArrowType || '';
+            this.toArrowType = json.toArrowType || 'triangleSolid';
+            this.scale = json.scale || 1;
+            this.locked = json.locked || Lock.None;
+            this.bkImage = json.bkImage;
+            this.bkColor = json.bkColor;
+            this.grid = json.grid;
+            this.manualCps = json.manualCps;
+            this.websocket = json.websocket;
+            this.mqttUrl = json.mqttUrl;
+            this.bkImageRect = json.bkImageRect;
+            if (json.mqttOptions) {
+                var opts = '';
+                if (typeof json.mqttOptions === 'object') {
+                    opts = JSON.stringify(json.mqttOptions);
+                }
+                else {
+                    opts = json.mqttOptions + '';
+                }
+                this.mqttOptions = JSON.parse(opts);
+            }
+            else {
+                this.mqttOptions = { clientId: s8() };
+            }
+            this.dataConstruct = json.dataConstruct ? json.dataConstruct : {};
+            this.mqttTopics = json.mqttTopics;
+            if (typeof json.data === 'object') {
+                this.data = JSON.parse(JSON.stringify(json.data));
+            }
+            else {
+                this.data = json.data || '';
+            }
+        }
+        if (!this.mqttOptions) {
+            this.mqttOptions = { clientId: s8() };
+        }
+    }
+    return TopologyData;
+}());
+export { TopologyData };
+//# sourceMappingURL=data.js.map

package/core/src/models/data.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../../packages/core/src/models/data.ts"],"names":[],"mappings":"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"}

package/core/src/models/index.d.ts

@@ -1,3 +1,4 @@
+export * from './data';
 export * from './pen';
 export * from './node';
 export * from './line';

package/core/src/models/index.js

@@ -1,3 +1,4 @@
+export * from './data';
 export * from './pen';
 export * from './node';
 export * from './line';

package/core/src/models/line.js

@@ -417,19 +417,19 @@ var Line = /** @class */ (function (_super) {
         }
         Store.set(this.generateStoreKey('pts-') + this.id, null);
     };
-    Line.prototype.scale = function (scale, center, w, h) {
-        this.from.x = center.x - (center.x - this.from.x) * w;
-        this.from.y = center.y - (center.y - this.from.y) * h;
-        this.to.x = center.x - (center.x - this.to.x) * w;
-        this.to.y = center.y - (center.y - this.to.y) * h;
+    Line.prototype.scale = function (scale, center) {
+        this.from.x = center.x - (center.x - this.from.x) * scale;
+        this.from.y = center.y - (center.y - this.from.y) * scale;
+        this.to.x = center.x - (center.x - this.to.x) * scale;
+        this.to.y = center.y - (center.y - this.to.y) * scale;
         if (this.text && this.font && this.font.fontSize) {
             this.font.fontSize *= scale;
             this.textRect = null;
         }
         for (var _i = 0, _a = this.controlPoints; _i < _a.length; _i++) {
             var pt = _a[_i];
-            pt.x = center.x - (center.x - pt.x) * w;
-            pt.y = center.y - (center.y - pt.y) * h;
+            pt.x = center.x - (center.x - pt.x) * scale;
+            pt.y = center.y - (center.y - pt.y) * scale;
         }
         Store.set(this.generateStoreKey('pts-') + this.id, null);
     };

package/core/src/models/node.d.ts

@@ -7,12 +7,6 @@ export declare const images: {
         cnt: number;
     };
 };
-export declare const defaultImages: {
-    [key: string]: {
-        img: string;
-        status: number;
-    };
-};
 export declare class Node extends Pen {
     is3D: boolean;
     z: number;
@@ -58,10 +52,6 @@ export declare class Node extends Pen {
         linear: boolean;
         state: Node;
     }[];
-    formData: {
-        bindBlockId: string;
-        theme: number;
-    };
     animateAlone: boolean;
     gif: boolean;
     video: string;