Manufacturing typescripting, z & substrate offsets

src/app/core/component.ts

@@ -55,9 +55,9 @@ export default class Component {
 
         // Create and set the ports here itself
 
-        const cleanparamdata = this._params.parameters;
+        const cleanparamdata = this._params.toMap();
         if ((mint !== "" && mint !== "TEXT") || mint === null) {
-            const ports = ComponentAPI.getComponentPorts(MapUtils.toMap(cleanparamdata), mint);
+            const ports = ComponentAPI.getComponentPorts(cleanparamdata, mint);
             if (ports != undefined && ports.length >= 0 && ports !== null) {
                 for (const i in ports) {
                     this.setPort(ports[i].label, ports[i]);
@@ -560,11 +560,8 @@ export default class Component {
      */
     updateComponentPorts(): void {
         // updating the Component Ports
-
         const params = this.params.toMap();
-
         const cleanparamdata = params;
-
         const ports = ComponentAPI.getComponentPorts(cleanparamdata, this._entity);
 
         for (const i in ports) {

src/app/core/componentPort.ts

@@ -1,6 +1,5 @@
 import uuid from "node-uuid";
 import paper from "paper";
-import Layer from "./layer";
 import Component from "./component";
 import { ComponentPortInterchangeV1, Point } from "./init";
 
@@ -9,16 +8,16 @@ export default class ComponentPort {
     protected _x: number;
     protected _y: number;
     protected _label: string;
-    protected _layer: Layer;
+    protected _layer: string;
 
     /**
      * Default constructor for ComponentPorts
      * @param {Number} x X coordinate
      * @param {Number} y Y coordinate
      * @param {String} label Name of the component
-     * @param {Layer} layer
+     * @param {string} layer
      */
-    constructor(x: number, y: number, label: string, layer: Layer) {
+    constructor(x: number, y: number, label: string, layer: string) {
         this._id = uuid.v1();
         this._x = x;
         this._y = y;
@@ -28,7 +27,7 @@ export default class ComponentPort {
 
     /**
      * Gets the layer of the component port
-     * @returns {layer} Returns layer
+     * @returns {string} Returns layer
      * @memberof ComponentPort
      */
     get layer() {
@@ -37,7 +36,7 @@ export default class ComponentPort {
 
     /**
      * Sets the layer
-     * @param {} value Value of the layer
+     * @param {string} value Value of the layer
      * @memberof ComponentPort
      * @returns {void}
      */

src/app/core/connection.ts

@@ -153,6 +153,19 @@ export default class Connection {
      */
     updateParameter(key: string, value: any): void {
         this._params.updateParameter(key, value);
+
+        console.log("Key: ", key, " Val: ", value);
+
+        if (key != "segments") {
+            for (const i in this._featureIDs) {
+                const featureidtochange = this._featureIDs[i];
+
+                // Get the feature id and modify it
+                const feature = ConnectionUtils.getFeatureFromID(featureidtochange);
+                feature.updateParameter(key, value);
+            }
+        }
+
         // this._params[key] = value;
         // this.updateView();
     }

src/app/core/feature.ts

@@ -5,11 +5,12 @@ import Layer from "./layer";
 import DXFObject from "./dxfObject";
 import { ComponentAPI } from "@/componentAPI";
 import MapUtils from "../utils/mapUtils";
-import { FeatureInterchangeV0 } from "./init";
+import { FeatureInterchangeV0, LogicalLayerType } from "./init";
 import Parameter from "./parameter";
 import EventBus from "@/events/events";
 import RenderLayer from "../view/renderLayer";
-import { DFMType, ManufacturingInfo } from "@/app/manufacturing/manufacturingInfo";
+import { DFMType, ManufacturingInfo } from "../manufacturing/manufacturingInfo";
+import FeatureUtils from "@/app/utils/featureUtils";
 
 /**
  * Feature class
@@ -45,12 +46,18 @@ export default class Feature {
         this._referenceID = null;
         this.layer = null;
         const tempRenderName: string = this.deriveRenderName();
+        let modifierName: string;
+        if (this.type == "Port") modifierName = "PORT";
+        else modifierName = "COMPONENT";
         this._manufacturingInfo = {
             fabtype: fabtype,
             layertype: null,
             rendername: tempRenderName,
             "z-offset-key": ComponentAPI.library[this.type].object.zOffsetKey(tempRenderName),
-            "substrate-offset": ComponentAPI.library[this.type].object.substrateOffset(tempRenderName)
+            depth: this.getValue(ComponentAPI.library[this.type].object.zOffsetKey(tempRenderName)),
+            "substrate-offset": ComponentAPI.library[this.type].object.substrateOffset(tempRenderName),
+            substrate: null,
+            modifier: modifierName
         };
     }
 
@@ -107,10 +114,18 @@ export default class Feature {
         return this._manufacturingInfo;
     }
 
-    // Ensures that all values in manufacturingInfo have been set
-    setManufacturingInfoLayer() {
+    /**
+     * Ensures that layer and substrate values in manufacturingInfo have been set
+     * @return {void}
+     * @memberof Feature
+     */
+    setManufacturingInfoLayer(): void {
+        this._manufacturingInfo.depth = this.getValue(ComponentAPI.library[this.type].object.zOffsetKey(this.deriveRenderName()));
         if (this.layer != null) {
             this._manufacturingInfo.layertype = this.layer.type;
+            this._manufacturingInfo.substrate = FeatureUtils.setSubstrate(this, this._manufacturingInfo["substrate-offset"]);
+        } else {
+            throw new Error("Layer not set in feature " + this.ID + " so manufacturingInfo cannot be set");
         }
     }
 
@@ -339,10 +354,11 @@ export default class Feature {
      */
 
     deriveRenderName(): string {
+        console.log(this._type);
         if (this._type.includes("_integration")) {
-            return "INTEGRATION";
             console.log("INTEGRATION");
-        } else if (this._type.includes("_control")) {
+            return "INTEGRATION";
+        } else if (this._type.includes("_control") || this._type == "Valve") {
             console.log("CONTROL");
             return "CONTROL";
         } else if (this._type.includes("_cell")) {

src/app/core/init.ts

@@ -2,7 +2,7 @@ export type Point = [number, number];
 
 export type Segment = [Point, Point];
 
-export type paperObject = paper.CompoundPath | paper.Path | paper.PointText;
+export type ToolPaperObject = paper.CompoundPath | paper.Path | paper.PointText;
 
 export type ScratchInterchangeV1 = {
     name: string;

src/app/featureSets/basic/render2D.js

@@ -525,6 +525,33 @@ export const render2D = {
         targetPrimitiveType: "MixerTarget",
         targetPrimitiveSet: "Basic2D"
     },
+    ToroidalMixer: {
+        featureParams: {
+            componentSpacing: "componentSpacing",
+            position: "position",
+            channelWidth: "channelWidth",
+            neckAngle: "neckAngle",
+            neckLength: "neckLength",
+            neckWidth: "neckWidth",
+            numberOfMixers: "numberOfMixers",
+            rotation: "rotation",
+            innerDiameter: "innerDiameter"
+        },
+        targetParams: {
+            componentSpacing: "componentSpacing",
+            channelWidth: "channelWidth",
+            neckAngle: "neckAngle",
+            neckLength: "neckLength",
+            neckWidth: "neckWidth",
+            numberOfMixers: "numberOfMixers",
+            rotation: "rotation",
+            innerDiameter: "innerDiameter"
+        },
+        featurePrimitiveType: "ToroidalMixer",
+        featurePrimitiveSet: "Basic2D",
+        targetPrimitiveType: "MixerTarget",
+        targetPrimitiveSet: "Basic2D"
+    },
     GradientGenerator: {
         featureParams: {
             position: "position",

src/app/featureSets/featureSet.js

@@ -46,6 +46,7 @@ import Node from "../library/node";
 import DropletGeneratorT from "../library/dropletGeneratorT";
 import DropletGeneratorFlowFocus from "../library/dropletGeneratorFlowFocus";
 import LogicArray from "../library/logicArray";
+import ToroidalMixer from "../library/toroidalMixer";
 
 export default class FeatureSet {
     constructor(definitions, tools, render2D, render3D, setString) {
@@ -90,6 +91,7 @@ export default class FeatureSet {
             Pump3D_control: { object: new Pump3D(), key: "CONTROL" },
             RoundedChannel: { object: new RoundedChannel(), key: null },
             thermoCycler: { object: new thermoCycler(), key: "FLOW" },
+            ToroidalMixer: { object: new ToroidalMixer(), key: "FLOW" },
             Transition: { object: new Transition(), key: null },
             Transposer: { object: new Transposer(), key: "FLOW" },
             Transposer_control: { object: new Transposer(), key: "CONTROL" },

src/app/library/template.ts

@@ -59,7 +59,7 @@ export default class Template {
         } else if (this.__zOffsetKeys.hasOwnProperty(key)) {
             return this.__zOffsetKeys[key];
         } else {
-            throw new Error("zOffsetKey does not contain given key");
+            throw new Error("zOffsetKey does not contain key " + key);
         }
     }
 
@@ -71,11 +71,11 @@ export default class Template {
      */
     substrateOffset(key: string): string {
         if (this.__substrateOffset === null) {
-            throw new Error("zOffsetKey cannot be null instantiate in the __setupDefinitions");
+            throw new Error("substrateOffset cannot be null instantiate in the __setupDefinitions");
         } else if (this.__substrateOffset.hasOwnProperty(key)) {
             return this.__substrateOffset[key];
         } else {
-            throw new Error("substrateOffset does not contain given key");
+            throw new Error("substrateOffset does not contain key " + key);
         }
     }