Clock and polarity markings.

tilk · Aug 21, 2018 · 6298da2 · 6298da2
1 parent f448df5
commit 6298da2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/src/cells/base.js b/src/cells/base.js
@@ -206,6 +206,7 @@ joint.shapes.digital.WireView = joint.dia.LinkView.extend({
 joint.shapes.digital.Gate.define('digital.Box', {
     attrs: {
         'text.iolabel': { fill: 'black', 'y-alignment': 'middle', ref: '.body' },
+        'path.decor': { stroke: 'black', fill: 'transparent' }
     }
 }, {
     addLabelledWire: function(args, lblmarkup, side, loc, port) {
@@ -215,8 +216,23 @@ joint.shapes.digital.Gate.define('digital.Box', {
         const textattrs = {
             'ref-y': loc, 'x-alignment': side, text: 'label' in port ? port.label : port.id
         };
-        if (side == 'left') textattrs['ref-x'] = 5;
-        else if (side == 'right') textattrs['ref-dx'] = -5;
+        const dist = port.clock ? 10 : 5;
+        if (side == 'left') textattrs['ref-x'] = dist;
+        else if (side == 'right') textattrs['ref-dx'] = -dist;
+        if (port.polarity === false) textattrs['text-decoration'] = 'overline';
+        if (port.clock) {
+            console.assert(side == 'left');
+            let vpath = [
+                [0, -6],
+                [6, 0],
+                [0, 6]
+            ];
+            const path = 'M' + vpath.map(l => l.join(' ')).join(' L');
+            lblmarkup.push('<path class="decor port_' + port.id + '" d="' + path + '" />');
+            _.set(args, ['attrs', 'path.decor.port_' + port.id], {
+                ref: '.body', 'ref-x': 0, 'ref-y': loc
+            });
+        }
         _.set(args, ['attrs', 'text.iolabel.port_' + port.id], textattrs);
         return ret;
     }

diff --git a/src/cells/dff.js b/src/cells/dff.js
@@ -18,11 +18,11 @@ joint.shapes.digital.Box.define('digital.Dff', {
         let num = 0;
         markup.push(this.addLabelledWire(args, lblmarkup, 'left', (num++*16)+12, { id: 'in', dir: 'in', bits: args.bits, label: 'D' }));
         if ('clock' in args.polarity)
-            markup.push(this.addLabelledWire(args, lblmarkup, 'left', (num++*16)+12, { id: 'clk', dir: 'in', bits: 1 }));
+            markup.push(this.addLabelledWire(args, lblmarkup, 'left', (num++*16)+12, { id: 'clk', dir: 'in', bits: 1, polarity: args.polarity.clock, clock: true }));
         if ('arst' in args.polarity)
-            markup.push(this.addLabelledWire(args, lblmarkup, 'left', (num++*16)+12, { id: 'arst', dir: 'in', bits: 1 }));
+            markup.push(this.addLabelledWire(args, lblmarkup, 'left', (num++*16)+12, { id: 'arst', dir: 'in', bits: 1, polarity: args.polarity.arst }));
         if ('enable' in args.polarity)
-            markup.push(this.addLabelledWire(args, lblmarkup, 'left', (num++*16)+12, { id: 'en', dir: 'in', bits: 1 }));
+            markup.push(this.addLabelledWire(args, lblmarkup, 'left', (num++*16)+12, { id: 'en', dir: 'in', bits: 1, polarity: args.polarity.enable }));
         markup.push('<g class="scalable"><rect class="body"/></g><text class="label"/>');
         markup.push(lblmarkup.join(''));
         markup.push('</g>');

diff --git a/src/cells/memory.js b/src/cells/memory.js
@@ -37,9 +37,9 @@ joint.shapes.digital.Box.define('digital.Memory', {
             markup.push(this.addLabelledWire(args, lblmarkup, 'right', num_y(num), { id: portname + 'data', dir: 'out', bits: args.bits, label: 'data' }));
             markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'addr', dir: 'in', bits: args.abits, label: 'addr' }));
             if ('enable_polarity' in port)
-                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'en', dir: 'in', bits: 1, label: 'en' }));
+                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'en', dir: 'in', bits: 1, label: 'en', polarity: port.enable_polarity }));
             if ('clock_polarity' in port) {
-                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'clk', dir: 'in', bits: 1, label: 'clk' }));
+                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'clk', dir: 'in', bits: 1, label: 'clk', polarity: port.clock_polarity, clock: true }));
                 this.last_clk[portname + 'clk'] = 0;
             } else {
                 port.transparent = true;
@@ -51,9 +51,9 @@ joint.shapes.digital.Box.define('digital.Memory', {
             markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'data', dir: 'in', bits: args.bits, label: 'data' }));
             markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'addr', dir: 'in', bits: args.abits, label: 'addr' }));
             if ('enable_polarity' in port)
-                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'en', dir: 'in', bits: args.bits, label: 'en' }));
+                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'en', dir: 'in', bits: args.bits, label: 'en', polarity: port.enable_polarity }));
             if ('clock_polarity' in port) {
-                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'clk', dir: 'in', bits: 1, label: 'clk' }));
+                markup.push(this.addLabelledWire(args, lblmarkup, 'left', num_y(num++), { id: portname + 'clk', dir: 'in', bits: 1, label: 'clk', polarity: port.clock_polarity, clock: true }));
                 this.last_clk[portname + 'clk'] = 0;
             }
             portsplits.push(num);