Adding current probe

Author: 28raining

circuitSolver/images/shapeIprobe.js

@@ -0,0 +1,14 @@
+var shapeIprobe = draw2d.SVGFigure.extend({
+  init: function (attr) {
+    this._super(extend({ width: 64, height: 32 }, attr));
+    this.ressvgs = `
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 139 71">
+          <path stroke-linecap="round" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="10" d="M2,60h48m32,0h48m-80,-16v16m32,-16v16" pointer-events="stroke"/>
+          <path stroke-linecap="round" fill="#FFF" stroke="#000" stroke-width="10" d="M26,0h80v44h-80z" pointer-events="all"/>
+        </svg>
+              `;
+  },
+  getSVG: function () {
+    return this.ressvgs;
+  },
+});

circuitSolver/index.html

@@ -37,6 +37,7 @@
     <script src="images/shapeVin.js"></script>
     <script src="images/shapeIin.js"></script>
     <script src="images/shapeVout.js"></script>
+    <script src="images/shapeIprobe.js"></script>
     <script src="images/shapeInductor.js"></script>
     <script src="images/opAmp.js"></script>
     <link href="style.css" rel="stylesheet" />

circuitSolver/js/draw2d.js

@@ -1,37 +1,37 @@
 var startupSchematic =[
         {
             "type": "component",
-            "firstLetter": "v",
+            "id": "vin",
             "x": 128,
             "y": 144
         },
         {
             "type": "component",
-            "firstLetter": "L",
+            "id": "L0",
             "x": 192,
             "y": 80
         },
         {
             "type": "component",
-            "firstLetter": "R",
+            "id": "R0",
             "x": 352,
             "y": 80
         },
         {
             "type": "component",
-            "firstLetter": "C",
+            "id": "C0",
             "x": 416,
             "y": 112
         },
         {
             "type": "component",
-            "firstLetter": "g",
+            "id": "gnd",
             "x": 416,
             "y": 192
         },
         {
             "type": "component",
-            "firstLetter": "x",
+            "id": "xvout",
             "x": 352,
             "y": 16
         },

circuitSolver/js/startupSchematic.js

@@ -21,6 +21,7 @@ export class View extends draw2d.Canvas {
     this.rCounter = 0;
     this.cCounter = 0;
     this.lCounter = 0;
+    this.iprbCounter = 0;
     this.elements = [];
     this.dropCb = dropCB;
     this.getElements = getElements;
@@ -58,7 +59,7 @@ export class View extends draw2d.Canvas {
     } else return name;
   }
 
-  addShapeToSchem(type, x, y) {
+  addShapeToSchem(type, x, y, id) {
     // console.log(type, x, y)
     // console.log(this.getElements());
 
@@ -82,6 +83,17 @@ export class View extends draw2d.Canvas {
       },
     });
 
+    if (id) {
+      if ((type == "res") || (type == "cap") || (type == "ind") || (type == "iprobe") || (type == "op")) {
+        var newCount = parseInt(id.slice(1))
+        if (type == "res") this.rCounter = Math.max(this.rCounter, newCount);
+        if (type == "cap") this.cCounter = Math.max(this.cCounter, newCount);
+        if (type == "ind") this.lCounter = Math.max(this.lCounter, newCount);
+        if (type == "iprobe") this.iprbCounter = Math.max(this.iprbCounter, newCount);
+        if (type == "op") this.opCounter = Math.max(this.opCounter, newCount);
+      }
+    }
+
     // console.log(x, y)
     x = 16 * Math.round(x / 16);
     y = 16 * Math.round(y / 16);
@@ -92,7 +104,8 @@ export class View extends draw2d.Canvas {
       var outputLocator = new MyInputPortLocator(48, 16);
       e.createPort("hybrid", inputLocator);
       e.createPort("hybrid", outputLocator);
-      e.id = `R${this.rCounter}`;
+      if (id) e.id = id;
+      else e.id = `R${this.rCounter}`;
       e.add(new draw2d.shape.basic.Text({ text: this.getName(e.id, this.getElements()), stroke: 0 }), new draw2d.layout.locator.TopLocator());
       this.rCounter = this.rCounter + 1;
       e.installEditPolicy(new SelectionMenuPolicy());
@@ -102,7 +115,8 @@ export class View extends draw2d.Canvas {
       var outputLocator = new MyInputPortLocator(16, 48);
       e.createPort("hybrid", inputLocator);
       e.createPort("hybrid", outputLocator);
-      e.id = `C${this.cCounter}`;
+      if (id) e.id = id;
+      else e.id = `C${this.cCounter}`;
       e.add(new draw2d.shape.basic.Text({ text: this.getName(e.id, this.getElements()), stroke: 0 }), new draw2d.layout.locator.RightLocator());
       this.cCounter = this.cCounter + 1;
       e.installEditPolicy(new SelectionMenuPolicy());
@@ -112,7 +126,8 @@ export class View extends draw2d.Canvas {
       var outputLocator = new MyInputPortLocator(65, 16);
       e.createPort("hybrid", inputLocator);
       e.createPort("hybrid", outputLocator);
-      e.id = `L${this.lCounter}`;
+      if (id) e.id = id;
+      else e.id = `L${this.lCounter}`;
       e.add(new draw2d.shape.basic.Text({ text: this.getName(e.id, this.getElements()), stroke: 0 }), new draw2d.layout.locator.TopLocator());
       this.lCounter = this.lCounter + 1;
       e.installEditPolicy(new SelectionMenuPolicy());
@@ -139,6 +154,17 @@ export class View extends draw2d.Canvas {
       e.createPort("hybrid", inputLocator);
       // e.createPort("hybrid",outputLocator);
       e.id = `xvout`;
+    } else if (type == "iprobe") {
+      var e = new shapeIprobe({ x: x, y: y });
+      var inputLocator = new MyInputPortLocator(0, 32);
+      e.createPort("hybrid", inputLocator);
+      e.createPort("hybrid", new MyInputPortLocator(64, 32));
+      // e.createPort("hybrid",outputLocator);
+      if (id) e.id = id;
+      else e.id = `Y${this.iprbCounter}`;
+      e.add(new draw2d.shape.basic.Text({ text: this.getName(`iPrb${this.iprbCounter}`, this.getElements()), stroke: 0 }), new draw2d.layout.locator.TopLocator());
+      this.iprbCounter = this.iprbCounter + 1;
+
     } else if (type == "op") {
       var e = new shapeOpamp({ x: x, y: y });
       var inputALocator = new MyInputPortLocator(0, 32);
@@ -147,16 +173,17 @@ export class View extends draw2d.Canvas {
       e.createPort("hybrid", inputALocator);
       e.createPort("hybrid", inputBLocator);
       e.createPort("hybrid", outputLocator);
-      e.id = `op${this.opCounter}`;
+      if (id) e.id = id;
+      else e.id = `op${this.opCounter}`;
       this.opCounter = this.opCounter + 1;
     } else console.log("ERROR: You gave a bad type: ", type);
 
     this.x = x;
     this.y = y;
     e.resizeable = false;
+    // console.log('add', add);
     var add = this.dropCb(e, (a) => this.addToSchematic(a));
     // add = true;
-    // console.log('add', add);
 
     // if (add) {
     //   e.resizeable = false;
@@ -175,6 +202,7 @@ export class View extends draw2d.Canvas {
     this.cCounter = 0;
     this.lCounter = 0;
     this.opCounter = 0;
+    this.iprbCounter = 0;
     console.log("cleared, now adding this", startupSchematic);
 
     var connections = [];
@@ -188,18 +216,22 @@ export class View extends draw2d.Canvas {
         connections.push(newConn);
         id = id + 1;
       } else {
+        // console.log(item)
         var type;
-        var firstLetter = item.firstLetter;
+        var firstLetter = Array.from(item.id)[0];
+
+        // var firstLetter = item.firstLetter;
         if (firstLetter == "R") type = "res";
         else if (firstLetter == "C") type = "cap";
         else if (firstLetter == "L") type = "ind";
         else if (firstLetter == "g") type = "gnd";
         else if (firstLetter == "v") type = "vin";
         else if (firstLetter == "i") type = "iin";
         else if (firstLetter == "x") type = "xvout";
+        else if (firstLetter == "Y") type = "iprobe";
         // console.log(item, type)
 
-        this.addShapeToSchem(type, item.x, item.y);
+        this.addShapeToSchem(type, item.x, item.y, item.id);
       }
     });