From 492710baa6710b13bf17715bc96b1942bfe3f5ff Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Sun, 24 May 2020 13:54:02 +0200 Subject: [PATCH] Update examples, change output file extension from .dot to .gv --- examples/example1.gv | 20 ++++ examples/example2.gv | 56 +++++++++ examples/example3.gv | 185 +++++++++++++++++++++++++++++ idea/{example1.dot => example1.gv} | 0 idea/{example2.dot => example2.gv} | 0 src/wireviz.py | 1 + 6 files changed, 262 insertions(+) create mode 100644 examples/example1.gv create mode 100644 examples/example2.gv create mode 100644 examples/example3.gv rename idea/{example1.dot => example1.gv} (100%) rename idea/{example2.dot => example2.gv} (100%) diff --git a/examples/example1.gv b/examples/example1.gv new file mode 100644 index 0000000..4c36ab6 --- /dev/null +++ b/examples/example1.gv @@ -0,0 +1,20 @@ +graph { + graph [bgcolor=transparent fontname=arial rankdir=LR ranksep=2] + node [fillcolor=white fontname=arial shape=record style="rounded,filled"] + edge [fontname=arial style=bold] + X1 [label="X1|{D-Sub|female|9-pin}|{{DCD|RX|TX|DTR|GND|DSR|RTS|CTS|RI}|{1|2|3|4|5|6|7|8|9}}"] + X2 [label="X2|{Molex KK 254|female|6-pin}|{{1|2|3|4|5|6}|{GND|RX|TX|NC|OUT|IN}}"] + X2:p5:w -- X2:p6:w + W1 [label="W1|{3x|0.25 mm²|+ S|0.2 m}|{{1|2|3|}|{WH|BN|GN|Shield}|{1|2|3|}}"] + edge [color="#000000:#ffffff:#000000"] + X1:p5 -- W1:w1i + W1:w1o -- X2:p1 + edge [color="#000000:#666600:#000000"] + X1:p2 -- W1:w2i + W1:w2o -- X2:p3 + edge [color="#000000:#00ff00:#000000"] + X1:p3 -- W1:w3i + W1:w3o -- X2:p2 + edge [color="#000000"] + X1:p5 -- W1:wsi +} diff --git a/examples/example2.gv b/examples/example2.gv new file mode 100644 index 0000000..8cb99aa --- /dev/null +++ b/examples/example2.gv @@ -0,0 +1,56 @@ +graph { + graph [bgcolor=transparent fontname=arial rankdir=LR ranksep=2] + node [fillcolor=white fontname=arial shape=record style="rounded,filled"] + edge [fontname=arial style=bold] + X1 [label="X1|{Molex KK 254|female|8-pin}|{{GND|+5V|SCL|SDA|MISO|MOSI|SCK|N/C}|{1|2|3|4|5|6|7|8}}"] + X2 [label="X2|{Molex KK 254|female|4-pin}|{{1|2|3|4}|{GND|+5V|SCL|SDA}}"] + X3 [label="X3|{Molex KK 254|female|4-pin}|{{1|2|3|4}|{GND|+5V|SCL|SDA}}"] + X4 [label="X4|{Molex KK 254|female|5-pin}|{{1|2|3|4|5}|{GND|+12V|MISO|MOSI|SCK}}"] + X5 [label="X5|{Molex Micro-Fit|male|2-pin}|{{GND|+12V}|{1|2}}"] + W1 [label="{4x|0.14 mm² (26 AWG)|0.2 m}|{{BK|RD|YE|GN}}"] + edge [color="#000000:#000000:#000000"] + X1:p1 -- W1:w1 + W1:w1 -- X2:p1 + edge [color="#000000:#ff0000:#000000"] + X1:p2 -- W1:w2 + W1:w2 -- X2:p2 + edge [color="#000000:#ffff00:#000000"] + X1:p3 -- W1:w3 + W1:w3 -- X2:p3 + edge [color="#000000:#00ff00:#000000"] + X1:p4 -- W1:w4 + W1:w4 -- X2:p4 + W2 [label="{4x|0.14 mm² (26 AWG)|0.2 m}|{{BK|RD|YE|GN}}"] + edge [color="#000000:#000000:#000000"] + X1:p1 -- W2:w1 + W2:w1 -- X3:p1 + edge [color="#000000:#ff0000:#000000"] + X1:p2 -- W2:w2 + W2:w2 -- X3:p2 + edge [color="#000000:#ffff00:#000000"] + X1:p3 -- W2:w3 + W2:w3 -- X3:p3 + edge [color="#000000:#00ff00:#000000"] + X1:p4 -- W2:w4 + W2:w4 -- X3:p4 + W3 [label="{4x|0.14 mm² (26 AWG)|0.2 m}|{{BK|BU|OG|VT}}"] + edge [color="#000000:#000000:#000000"] + X1:p1 -- W3:w1 + W3:w1 -- X4:p1 + edge [color="#000000:#0000ff:#000000"] + X1:p5 -- W3:w2 + W3:w2 -- X4:p3 + edge [color="#000000:#ff8000:#000000"] + X1:p6 -- W3:w3 + W3:w3 -- X4:p4 + edge [color="#000000:#8000ff:#000000"] + X1:p7 -- W3:w4 + W3:w4 -- X4:p5 + W4 [label="{2x|0.5 mm² (21 AWG)|0.35 m}|{{BK|RD}}"] + edge [color="#000000:#000000:#000000"] + X5:p1 -- W4:w1 + W4:w1 -- X4:p1 + edge [color="#000000:#ff0000:#000000"] + X5:p2 -- W4:w2 + W4:w2 -- X4:p2 +} diff --git a/examples/example3.gv b/examples/example3.gv new file mode 100644 index 0000000..843338e --- /dev/null +++ b/examples/example3.gv @@ -0,0 +1,185 @@ +graph { + graph [bgcolor=transparent fontname=arial rankdir=LR ranksep=2] + node [fillcolor=white fontname=arial shape=record style="rounded,filled"] + edge [fontname=arial style=bold] + X1 [label="X1|{10-pin}|{{}|{1|2|3|4|5|6|7|8|9|10}}"] + X2 [label="X2|{10-pin}|{{1|2|3|4|5|6|7|8|9|10}|{}}"] + X3 [label="X3|{20-pin}|{{}|{1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20}}"] + X4 [label="X4|{20-pin}|{{1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20}|{}}"] + X5 [label="X5|{20-pin}|{{}|{1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20}}"] + X6 [label="X6|{20-pin}|{{1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20}|{}}"] + X7 [label="X7|{6-pin}|{{}|{1|2|3|4|5|6}}"] + X8 [label="X8|{6-pin}|{{1|2|3|4|5|6}|{}}"] + W1 [label="{10x|None mm²|0 m}|{{brown|red|orange|yellow|green|blue|violet|grey|white|black}}"] + edge [color="#000000:#666600:#000000"] + X1:p1 -- W1:w1 + W1:w1 -- X2:p1 + edge [color="#000000:#ff0000:#000000"] + X1:p2 -- W1:w2 + W1:w2 -- X2:p2 + edge [color="#000000:#ff8000:#000000"] + X1:p3 -- W1:w3 + W1:w3 -- X2:p3 + edge [color="#000000:#ffff00:#000000"] + X1:p4 -- W1:w4 + W1:w4 -- X2:p4 + edge [color="#000000:#00ff00:#000000"] + X1:p5 -- W1:w5 + W1:w5 -- X2:p5 + edge [color="#000000:#0000ff:#000000"] + X1:p6 -- W1:w6 + W1:w6 -- X2:p6 + edge [color="#000000:#8000ff:#000000"] + X1:p7 -- W1:w7 + W1:w7 -- X2:p7 + edge [color="#000000:#808080:#000000"] + X1:p8 -- W1:w8 + W1:w8 -- X2:p8 + edge [color="#000000:#ffffff:#000000"] + X1:p9 -- W1:w9 + W1:w9 -- X2:p9 + edge [color="#000000:#000000:#000000"] + X1:p10 -- W1:w10 + W1:w10 -- X2:p10 + W2 [label="{20x|None mm²|0 m}|{{white|brown|green|yellow|grey|pink|blue|red|black|violet|white|brown|green|yellow|grey|pink|blue|red|black|violet}}"] + edge [color="#000000:#ffffff:#000000"] + X3:p1 -- W2:w1 + W2:w1 -- X4:p1 + edge [color="#000000:#666600:#000000"] + X3:p2 -- W2:w2 + W2:w2 -- X4:p2 + edge [color="#000000:#00ff00:#000000"] + X3:p3 -- W2:w3 + W2:w3 -- X4:p3 + edge [color="#000000:#ffff00:#000000"] + X3:p4 -- W2:w4 + W2:w4 -- X4:p4 + edge [color="#000000:#808080:#000000"] + X3:p5 -- W2:w5 + W2:w5 -- X4:p5 + edge [color="#000000:#ff80c0:#000000"] + X3:p6 -- W2:w6 + W2:w6 -- X4:p6 + edge [color="#000000:#0000ff:#000000"] + X3:p7 -- W2:w7 + W2:w7 -- X4:p7 + edge [color="#000000:#ff0000:#000000"] + X3:p8 -- W2:w8 + W2:w8 -- X4:p8 + edge [color="#000000:#000000:#000000"] + X3:p9 -- W2:w9 + W2:w9 -- X4:p9 + edge [color="#000000:#8000ff:#000000"] + X3:p10 -- W2:w10 + W2:w10 -- X4:p10 + edge [color="#000000:#ffffff:#000000"] + X3:p11 -- W2:w11 + W2:w11 -- X4:p11 + edge [color="#000000:#666600:#000000"] + X3:p12 -- W2:w12 + W2:w12 -- X4:p12 + edge [color="#000000:#00ff00:#000000"] + X3:p13 -- W2:w13 + W2:w13 -- X4:p13 + edge [color="#000000:#ffff00:#000000"] + X3:p14 -- W2:w14 + W2:w14 -- X4:p14 + edge [color="#000000:#808080:#000000"] + X3:p15 -- W2:w15 + W2:w15 -- X4:p15 + edge [color="#000000:#ff80c0:#000000"] + X3:p16 -- W2:w16 + W2:w16 -- X4:p16 + edge [color="#000000:#0000ff:#000000"] + X3:p17 -- W2:w17 + W2:w17 -- X4:p17 + edge [color="#000000:#ff0000:#000000"] + X3:p18 -- W2:w18 + W2:w18 -- X4:p18 + edge [color="#000000:#000000:#000000"] + X3:p19 -- W2:w19 + W2:w19 -- X4:p19 + edge [color="#000000:#8000ff:#000000"] + X3:p20 -- W2:w20 + W2:w20 -- X4:p20 + W3 [label="{20x|None mm²|0 m}|{{red|yellow|blue|red|yellow|blue|red|yellow|blue|red|yellow|blue|red|yellow|blue|red|yellow|blue|red|yellow}}"] + edge [color="#000000:#ff0000:#000000"] + X5:p1 -- W3:w1 + W3:w1 -- X6:p1 + edge [color="#000000:#ffff00:#000000"] + X5:p2 -- W3:w2 + W3:w2 -- X6:p2 + edge [color="#000000:#0000ff:#000000"] + X5:p3 -- W3:w3 + W3:w3 -- X6:p3 + edge [color="#000000:#ff0000:#000000"] + X5:p4 -- W3:w4 + W3:w4 -- X6:p4 + edge [color="#000000:#ffff00:#000000"] + X5:p5 -- W3:w5 + W3:w5 -- X6:p5 + edge [color="#000000:#0000ff:#000000"] + X5:p6 -- W3:w6 + W3:w6 -- X6:p6 + edge [color="#000000:#ff0000:#000000"] + X5:p7 -- W3:w7 + W3:w7 -- X6:p7 + edge [color="#000000:#ffff00:#000000"] + X5:p8 -- W3:w8 + W3:w8 -- X6:p8 + edge [color="#000000:#0000ff:#000000"] + X5:p9 -- W3:w9 + W3:w9 -- X6:p9 + edge [color="#000000:#ff0000:#000000"] + X5:p10 -- W3:w10 + W3:w10 -- X6:p10 + edge [color="#000000:#ffff00:#000000"] + X5:p11 -- W3:w11 + W3:w11 -- X6:p11 + edge [color="#000000:#0000ff:#000000"] + X5:p12 -- W3:w12 + W3:w12 -- X6:p12 + edge [color="#000000:#ff0000:#000000"] + X5:p13 -- W3:w13 + W3:w13 -- X6:p13 + edge [color="#000000:#ffff00:#000000"] + X5:p14 -- W3:w14 + W3:w14 -- X6:p14 + edge [color="#000000:#0000ff:#000000"] + X5:p15 -- W3:w15 + W3:w15 -- X6:p15 + edge [color="#000000:#ff0000:#000000"] + X5:p16 -- W3:w16 + W3:w16 -- X6:p16 + edge [color="#000000:#ffff00:#000000"] + X5:p17 -- W3:w17 + W3:w17 -- X6:p17 + edge [color="#000000:#0000ff:#000000"] + X5:p18 -- W3:w18 + W3:w18 -- X6:p18 + edge [color="#000000:#ff0000:#000000"] + X5:p19 -- W3:w19 + W3:w19 -- X6:p19 + edge [color="#000000:#ffff00:#000000"] + X5:p20 -- W3:w20 + W3:w20 -- X6:p20 + W4 [label="{6x|1 mm²|1 m}|{{|||||}}"] + edge [color="#000000"] + X7:p1 -- W4:w1 + W4:w1 -- X8:p1 + edge [color="#000000"] + X7:p2 -- W4:w2 + W4:w2 -- X8:p2 + edge [color="#000000"] + X7:p3 -- W4:w3 + W4:w3 -- X8:p3 + edge [color="#000000"] + X7:p4 -- W4:w4 + W4:w4 -- X8:p4 + edge [color="#000000"] + X7:p5 -- W4:w5 + W4:w5 -- X8:p5 + edge [color="#000000"] + X7:p6 -- W4:w6 + W4:w6 -- X8:p6 +} diff --git a/idea/example1.dot b/idea/example1.gv similarity index 100% rename from idea/example1.dot rename to idea/example1.gv diff --git a/idea/example2.dot b/idea/example2.gv similarity index 100% rename from idea/example2.dot rename to idea/example2.gv diff --git a/src/wireviz.py b/src/wireviz.py index a4096bb..f13e91b 100644 --- a/src/wireviz.py +++ b/src/wireviz.py @@ -151,6 +151,7 @@ class Harness: for f in format: d.format = f d.render(filename=filename, directory=directory, view=view, cleanup=cleanup) + d.save(filename='{}.gv'.format(filename), directory=directory) class Node: