diff --git a/examples/demo01.gv b/examples/demo01.gv index 8b9144d..7142f4f 100644 --- a/examples/demo01.gv +++ b/examples/demo01.gv @@ -70,6 +70,8 @@ graph { > shape=box style=filled] + edge [color="#000000"] + X1:p7r:e -- X1:p8r:e [label=" " color="#000000" noLabel=noLabel] X2 [label=< @@ -149,19 +151,7 @@ graph { - + @@ -171,19 +161,7 @@ graph { - + @@ -193,19 +171,7 @@ graph { - + @@ -218,13 +184,7 @@ graph { - + @@ -245,4 +205,8 @@ graph { W1:w3:e -- X2:p2l:w edge [color="#000000"] X1:p5r:e -- W1:w4:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#895956:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000" straight=straight] } diff --git a/examples/demo01.html b/examples/demo01.html index f33a787..f1cc9fa 100644 --- a/examples/demo01.html +++ b/examples/demo01.html @@ -30,184 +30,205 @@
- - - - + + + X1 - - - -X1 - -D-Sub - -female - -9-pin - -DCD - -1 - -RX - -2 - -TX - -3 - -DTR - -4 - -GND - -5 - -DSR - -6 - -RTS - -7 - -CTS - -8 - -RI - -9 + + + +X1 + +D-Sub + +female + +9-pin + +DCD + +1 + +RX + +2 + +TX + +3 + +DTR + +4 + +GND + +5 + +DSR + +6 + +RTS + +7 + +CTS + +8 + +RI + +9 + + + +X1:e--X1:e + - + W1 - - - -W1 - -3x - -0.25 mm² - -+ S - -0.2 m -  - X1:5:GND - -1:WH - -X2:1:GND - - - - X1:2:RX - -2:BN - -X2:3:TX - - - - X1:3:TX - -3:GN - -X2:2:RX - - - -  - X1:5:GND - -Shield - - - -  + + + +W1 + +3x + +0.25 mm² + ++ S + +0.2 m +  + X1:5:GND + +1:WH + +X2:1:GND + X1:2:RX + +2:BN + +X2:3:TX + X1:3:TX + +3:GN + +X2:2:RX +  + X1:5:GND + +Shield + + +  - + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -Molex KK 254 - -female - -3-pin - -1 - -GND - -2 - -RX - -3 - -TX + + + +X2 + +Molex KK 254 + +female + +3-pin + +1 + +GND + +2 + +RX + +3 + +TX - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/examples/demo01.png b/examples/demo01.png index 12bb94e..9b81975 100644 Binary files a/examples/demo01.png and b/examples/demo01.png differ diff --git a/examples/demo01.svg b/examples/demo01.svg index fea5cb3..4f691a0 100644 --- a/examples/demo01.svg +++ b/examples/demo01.svg @@ -1,184 +1,205 @@ - - - - + + + X1 - - - -X1 - -D-Sub - -female - -9-pin - -DCD - -1 - -RX - -2 - -TX - -3 - -DTR - -4 - -GND - -5 - -DSR - -6 - -RTS - -7 - -CTS - -8 - -RI - -9 + + + +X1 + +D-Sub + +female + +9-pin + +DCD + +1 + +RX + +2 + +TX + +3 + +DTR + +4 + +GND + +5 + +DSR + +6 + +RTS + +7 + +CTS + +8 + +RI + +9 + + + +X1:e--X1:e + - + W1 - - - -W1 - -3x - -0.25 mm² - -+ S - -0.2 m -  - X1:5:GND - -1:WH - -X2:1:GND - - - - X1:2:RX - -2:BN - -X2:3:TX - - - - X1:3:TX - -3:GN - -X2:2:RX - - - -  - X1:5:GND - -Shield - - - -  + + + +W1 + +3x + +0.25 mm² + ++ S + +0.2 m +  + X1:5:GND + +1:WH + +X2:1:GND + X1:2:RX + +2:BN + +X2:3:TX + X1:3:TX + +3:GN + +X2:2:RX +  + X1:5:GND + +Shield + + +  - + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -Molex KK 254 - -female - -3-pin - -1 - -GND - -2 - -RX - -3 - -TX + + + +X2 + +Molex KK 254 + +female + +3-pin + +1 + +GND + +2 + +RX + +3 + +TX - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/examples/demo01_wv_gvpr.gvpr b/examples/demo01_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/demo01_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/demo02.gv b/examples/demo02.gv index b51cc65..8ce63ea 100644 --- a/examples/demo02.gv +++ b/examples/demo02.gv @@ -277,19 +277,7 @@ graph { X2:1:GND
- + @@ -300,19 +288,7 @@ graph { - + @@ -323,19 +299,7 @@ graph { - + @@ -346,19 +310,7 @@ graph { - + @@ -380,6 +332,10 @@ graph { edge [color="#000000:#00AA00:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#000000:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#00AA00:#000000" straight=straight] W2 [label=<
X2:1:GND
- - - - - - - - - - -
-
X1:2:RXX2:3:TX
- - - - - - - - - - -
-
X1:3:TXX2:2:RX
- - - - - - - - - - -
-
 
- - - - -
-
 
- - - - - - - - - - -
-
X1:2:+5VX2:2:+5V
- - - - - - - - - - -
-
X1:3:SCLX2:3:SCL
- - - - - - - - - - -
-
X1:4:SDAX2:4:SDA
- - - - - - - - - - -
-
 
@@ -417,19 +373,7 @@ graph { - + @@ -440,19 +384,7 @@ graph { - + @@ -463,19 +395,7 @@ graph { - + @@ -486,19 +406,7 @@ graph { - + @@ -520,6 +428,10 @@ graph { edge [color="#000000:#00AA00:#000000"] X1:p4r:e -- W2:w4:w W2:w4:e -- X3:p4l:w + W2:w1:e -- W2:w1:w [color="#000000:#000000:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#00AA00:#000000" straight=straight] W3 [label=<
X3:1:GND
- - - - - - - - - - -
-
X1:2:+5VX3:2:+5V
- - - - - - - - - - -
-
X1:3:SCLX3:3:SCL
- - - - - - - - - - -
-
X1:4:SDAX3:4:SDA
- - - - - - - - - - -
-
 
@@ -557,19 +469,7 @@ graph { - + @@ -580,19 +480,7 @@ graph { - + @@ -603,19 +491,7 @@ graph { - + @@ -626,19 +502,7 @@ graph { - + @@ -660,6 +524,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X1:p7r:e -- W3:w4:w W3:w4:e -- X4:p5l:w + W3:w1:e -- W3:w1:w [color="#000000:#000000:#000000" straight=straight] + W3:w2:e -- W3:w2:w [color="#000000:#0066FF:#000000" straight=straight] + W3:w3:e -- W3:w3:w [color="#000000:#FF8000:#000000" straight=straight] + W3:w4:e -- W3:w4:w [color="#000000:#8000FF:#000000" straight=straight] W4 [label=<
X4:1:GND
- - - - - - - - - - -
-
X1:5:MISOX4:3:MISO
- - - - - - - - - - -
-
X1:6:MOSIX4:4:MOSI
- - - - - - - - - - -
-
X1:7:SCKX4:5:SCK
- - - - - - - - - - -
-
 
@@ -696,19 +564,7 @@ graph { - + @@ -718,19 +574,7 @@ graph { - + @@ -746,4 +590,6 @@ graph { edge [color="#000000:#FF0000:#000000"] AUTOGENERATED_F_2:e -- W4:w2:w W4:w2:e -- X4:p2l:w + W4:w1:e -- W4:w1:w [color="#000000:#000000:#000000" straight=straight] + W4:w2:e -- W4:w2:w [color="#000000:#FF0000:#000000" straight=straight] } diff --git a/examples/demo02.html b/examples/demo02.html index 460efef..6eadb3b 100644 --- a/examples/demo02.html +++ b/examples/demo02.html @@ -202,552 +202,608 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -8-pin - -GND - -1 - -+5V - -2 - -SCL - -3 - -SDA - -4 - -MISO - -5 - -MOSI - -6 - -SCK - -7 - -N/C - -8 + + + +X1 + +Molex KK 254 + +female + +8-pin + +GND + +1 + ++5V + +2 + +SCL + +3 + +SDA + +4 + +MISO + +5 + +MOSI + +6 + +SCK + +7 + +N/C + +8 - + W1 - - - -W1 - -4x - -0.14 mm² (26 AWG) - -0.2 m -  - X1:1:GND - -BK - -X2:1:GND - - - - X1:2:+5V - -RD - -X2:2:+5V - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -GN - -X2:4:SDA - - - -  + + + +W1 + +4x + +0.14 mm² (26 AWG) + +0.2 m +  + X1:1:GND + +BK + +X2:1:GND + X1:2:+5V + +RD + +X2:2:+5V + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +GN + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + - + X1:e--W1:w - - - - - - -X1:e--W1:w - - - + + + - + W2 - - - -W2 - -4x - -0.14 mm² (26 AWG) - -0.4 m -  - X1:1:GND - -BK - -X3:1:GND - - - - X1:2:+5V - -RD - -X3:2:+5V - - - - X1:3:SCL - -YE - -X3:3:SCL - - - - X1:4:SDA - -GN - -X3:4:SDA - - - -  + + + +W2 + +4x + +0.14 mm² (26 AWG) + +0.4 m +  + X1:1:GND + +BK + +X3:1:GND + X1:2:+5V + +RD + +X3:2:+5V + X1:3:SCL + +YE + +X3:3:SCL + X1:4:SDA + +GN + +X3:4:SDA +  - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + W3 - - - -W3 - -4x - -0.14 mm² (26 AWG) - -0.3 m -  - X1:1:GND - -BK - -X4:1:GND - - - - X1:5:MISO - -BU - -X4:3:MISO - - - - X1:6:MOSI - -OG - -X4:4:MOSI - - - - X1:7:SCK - -VT - -X4:5:SCK - - - -  + + + +W3 + +4x + +0.14 mm² (26 AWG) + +0.3 m +  + X1:1:GND + +BK + +X4:1:GND + X1:5:MISO + +BU + +X4:3:MISO + X1:6:MOSI + +OG + +X4:4:MOSI + X1:7:SCK + +VT + +X4:5:SCK +  - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex KK 254 - -female - -5-pin - -1 - -GND - -2 - -+12V - -3 - -MISO - -4 - -MOSI - -5 - -SCK + + + +X4 + +Molex KK 254 + +female + +5-pin + +1 + +GND + +2 + ++12V + +3 + +MISO + +4 + +MOSI + +5 + +SCK + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + - + AUTOGENERATED_F_1 - - - -Crimp ferrule - -0.25 mm² - -YE - - + + + +Crimp ferrule + +0.25 mm² + +YE + + - + W4 - - - -W4 - -2x - -0.25 mm² (24 AWG) - -0.3 m -  - - -1:BK - -X4:1:GND - - - - - -2:RD - -X4:2:+12V - - - -  + + + +W4 + +2x + +0.25 mm² (24 AWG) + +0.3 m +  + + +1:BK + +X4:1:GND + + +2:RD + +X4:2:+12V +  - + AUTOGENERATED_F_1:e--W4:w - - - + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + - + AUTOGENERATED_F_2 - - - -Crimp ferrule - -0.25 mm² - -YE - - + + + +Crimp ferrule + +0.25 mm² + +YE + + - + AUTOGENERATED_F_2:e--W4:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - + + + diff --git a/examples/demo02.png b/examples/demo02.png index 1b4294a..7987b7b 100644 Binary files a/examples/demo02.png and b/examples/demo02.png differ diff --git a/examples/demo02.svg b/examples/demo02.svg index 362f66f..d171929 100644 --- a/examples/demo02.svg +++ b/examples/demo02.svg @@ -1,552 +1,608 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -8-pin - -GND - -1 - -+5V - -2 - -SCL - -3 - -SDA - -4 - -MISO - -5 - -MOSI - -6 - -SCK - -7 - -N/C - -8 + + + +X1 + +Molex KK 254 + +female + +8-pin + +GND + +1 + ++5V + +2 + +SCL + +3 + +SDA + +4 + +MISO + +5 + +MOSI + +6 + +SCK + +7 + +N/C + +8 - + W1 - - - -W1 - -4x - -0.14 mm² (26 AWG) - -0.2 m -  - X1:1:GND - -BK - -X2:1:GND - - - - X1:2:+5V - -RD - -X2:2:+5V - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -GN - -X2:4:SDA - - - -  + + + +W1 + +4x + +0.14 mm² (26 AWG) + +0.2 m +  + X1:1:GND + +BK + +X2:1:GND + X1:2:+5V + +RD + +X2:2:+5V + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +GN + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + - + X1:e--W1:w - - - - - - -X1:e--W1:w - - - + + + - + W2 - - - -W2 - -4x - -0.14 mm² (26 AWG) - -0.4 m -  - X1:1:GND - -BK - -X3:1:GND - - - - X1:2:+5V - -RD - -X3:2:+5V - - - - X1:3:SCL - -YE - -X3:3:SCL - - - - X1:4:SDA - -GN - -X3:4:SDA - - - -  + + + +W2 + +4x + +0.14 mm² (26 AWG) + +0.4 m +  + X1:1:GND + +BK + +X3:1:GND + X1:2:+5V + +RD + +X3:2:+5V + X1:3:SCL + +YE + +X3:3:SCL + X1:4:SDA + +GN + +X3:4:SDA +  - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + W3 - - - -W3 - -4x - -0.14 mm² (26 AWG) - -0.3 m -  - X1:1:GND - -BK - -X4:1:GND - - - - X1:5:MISO - -BU - -X4:3:MISO - - - - X1:6:MOSI - -OG - -X4:4:MOSI - - - - X1:7:SCK - -VT - -X4:5:SCK - - - -  + + + +W3 + +4x + +0.14 mm² (26 AWG) + +0.3 m +  + X1:1:GND + +BK + +X4:1:GND + X1:5:MISO + +BU + +X4:3:MISO + X1:6:MOSI + +OG + +X4:4:MOSI + X1:7:SCK + +VT + +X4:5:SCK +  - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex KK 254 - -female - -5-pin - -1 - -GND - -2 - -+12V - -3 - -MISO - -4 - -MOSI - -5 - -SCK + + + +X4 + +Molex KK 254 + +female + +5-pin + +1 + +GND + +2 + ++12V + +3 + +MISO + +4 + +MOSI + +5 + +SCK + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + - + AUTOGENERATED_F_1 - - - -Crimp ferrule - -0.25 mm² - -YE - - + + + +Crimp ferrule + +0.25 mm² + +YE + + - + W4 - - - -W4 - -2x - -0.25 mm² (24 AWG) - -0.3 m -  - - -1:BK - -X4:1:GND - - - - - -2:RD - -X4:2:+12V - - - -  + + + +W4 + +2x + +0.25 mm² (24 AWG) + +0.3 m +  + + +1:BK + +X4:1:GND + + +2:RD + +X4:2:+12V +  - + AUTOGENERATED_F_1:e--W4:w - - - + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + - + AUTOGENERATED_F_2 - - - -Crimp ferrule - -0.25 mm² - -YE - - + + + +Crimp ferrule + +0.25 mm² + +YE + + - + AUTOGENERATED_F_2:e--W4:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - + + + diff --git a/examples/demo02_wv_gvpr.gvpr b/examples/demo02_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/demo02_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex01.gv b/examples/ex01.gv index a622dc0..753b16d 100644 --- a/examples/ex01.gv +++ b/examples/ex01.gv @@ -134,19 +134,7 @@ graph { X2:1:GND - + @@ -156,19 +144,7 @@ graph { - + @@ -178,19 +154,7 @@ graph { - + @@ -200,19 +164,7 @@ graph { - + @@ -225,13 +177,7 @@ graph { - + @@ -255,4 +201,9 @@ graph { W1:w4:e -- X2:p3l:w edge [color="#000000"] X1:p1r:e -- W1:w5:w + W1:w1:e -- W1:w1:w [color="#000000:#895956:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FF8000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000" straight=straight] } diff --git a/examples/ex01.html b/examples/ex01.html index 22e9e30..8f2a7cb 100644 --- a/examples/ex01.html +++ b/examples/ex01.html @@ -30,192 +30,212 @@
- - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 - + W1 - - - -W1 - -Serial - -4x - -0.25 mm² (24 AWG) - -+ S - -0.2 m -  - X1:1:GND - -1:BN - -X2:1:GND - - - - X1:2:VCC - -2:RD - -X2:2:VCC - - - - X1:3:RX - -3:OG - -X2:4:TX - - - - X1:4:TX - -4:YE - -X2:3:RX - - - -  - X1:1:GND - -Shield - - - -  + + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  + X1:1:GND + +1:BN + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC + X1:3:RX + +3:OG + +X2:4:TX + X1:4:TX + +4:YE + +X2:3:RX +  + X1:1:GND + +Shield + + +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/examples/ex01.png b/examples/ex01.png index a477fd7..8d34a9a 100644 Binary files a/examples/ex01.png and b/examples/ex01.png differ diff --git a/examples/ex01.svg b/examples/ex01.svg index ff9dd8d..1f0c616 100644 --- a/examples/ex01.svg +++ b/examples/ex01.svg @@ -1,192 +1,212 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 - + W1 - - - -W1 - -Serial - -4x - -0.25 mm² (24 AWG) - -+ S - -0.2 m -  - X1:1:GND - -1:BN - -X2:1:GND - - - - X1:2:VCC - -2:RD - -X2:2:VCC - - - - X1:3:RX - -3:OG - -X2:4:TX - - - - X1:4:TX - -4:YE - -X2:3:RX - - - -  - X1:1:GND - -Shield - - - -  + + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  + X1:1:GND + +1:BN + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC + X1:3:RX + +3:OG + +X2:4:TX + X1:4:TX + +4:YE + +X2:3:RX +  + X1:1:GND + +Shield + + +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/examples/ex01_wv_gvpr.gvpr b/examples/ex01_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex01_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex02.gv b/examples/ex02.gv index 251d262..e309df4 100644 --- a/examples/ex02.gv +++ b/examples/ex02.gv @@ -192,19 +192,7 @@ graph { X2:1:GND
- + @@ -214,19 +202,7 @@ graph { - + @@ -242,6 +218,8 @@ graph { edge [color="#000000:#FF0000:#000000"] X1:p2r:e -- W1:w2:w W1:w2:e -- X2:p2l:w + W1:w1:e -- W1:w1:w [color="#000000:#000000:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] W2 [label=<
X4:1:GND
- - - - - - - - - - -
-
X4:2:+12V
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2:VCCX2:2:VCC
- - - - - - - - - - -
-
X1:3:RXX2:4:TX
- - - - - - - - - - -
-
X1:4:TXX2:3:RX
- - - - - - - - - - -
-
 
- - - - -
-
 
- - - - - - - - - - -
-
X1:2:VCCX2:2:VCC
- - - - - - - - - - -
-
 
@@ -278,19 +256,7 @@ graph { - + @@ -300,19 +266,7 @@ graph { - + @@ -328,6 +282,8 @@ graph { edge [color="#000000:#FF0000:#000000"] X1:p2r:e -- W2:w2:w W2:w2:e -- X3:p2l:w + W2:w1:e -- W2:w1:w [color="#000000:#000000:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#FF0000:#000000" straight=straight] W3 [label=<
X3:1:GND
- - - - - - - - - - -
-
X1:2:VCCX3:2:VCC
- - - - - - - - - - -
-
 
@@ -364,19 +320,7 @@ graph { - + @@ -386,19 +330,7 @@ graph { - + @@ -414,4 +346,6 @@ graph { edge [color="#000000:#FF0000:#000000"] X1:p2r:e -- W3:w2:w W3:w2:e -- X4:p2l:w + W3:w1:e -- W3:w1:w [color="#000000:#000000:#000000" straight=straight] + W3:w2:e -- W3:w2:w [color="#000000:#FF0000:#000000" straight=straight] } diff --git a/examples/ex02.html b/examples/ex02.html index 17d9151..5d0b13a 100644 --- a/examples/ex02.html +++ b/examples/ex02.html @@ -30,280 +30,304 @@
- - - - + + + X1 - - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 - + W1 - - - -W1 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  - X1:1:GND - -1:BK - -X2:1:GND - - - - X1:2:VCC - -2:RD - -X2:2:VCC - - - -  + + + +W1 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  + X1:1:GND + +1:BK + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC +  X1:e--W1:w - - - + + + - + X1:e--W1:w - - - + + + - + W2 - - - -W2 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  - X1:1:GND - -1:BK - -X3:1:GND - - - - X1:2:VCC - -2:RD - -X3:2:VCC - - - -  + + + +W2 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  + X1:1:GND + +1:BK + +X3:1:GND + X1:2:VCC + +2:RD + +X3:2:VCC +  - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + W3 - - - -W3 - -2x - -20 awg (0.75 mm²) - -0.2 m -  - X1:1:GND - -1:BK - -X4:1:GND - - - - X1:2:VCC - -2:RD - -X4:2:VCC - - - -  + + + +W3 + +2x + +20 awg (0.75 mm²) + +0.2 m +  + X1:1:GND + +1:BK + +X4:1:GND + X1:2:VCC + +2:RD + +X4:2:VCC +  - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - + + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC - + W3:e--X4:w - - - + + + - + W3:e--X4:w - - - + + + diff --git a/examples/ex02.png b/examples/ex02.png index d723cf3..e4b39d4 100644 Binary files a/examples/ex02.png and b/examples/ex02.png differ diff --git a/examples/ex02.svg b/examples/ex02.svg index 3dcff6f..8c73259 100644 --- a/examples/ex02.svg +++ b/examples/ex02.svg @@ -1,280 +1,304 @@ - - - - + + + X1 - - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 - + W1 - - - -W1 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  - X1:1:GND - -1:BK - -X2:1:GND - - - - X1:2:VCC - -2:RD - -X2:2:VCC - - - -  + + + +W1 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  + X1:1:GND + +1:BK + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC +  X1:e--W1:w - - - + + + - + X1:e--W1:w - - - + + + - + W2 - - - -W2 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  - X1:1:GND - -1:BK - -X3:1:GND - - - - X1:2:VCC - -2:RD - -X3:2:VCC - - - -  + + + +W2 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  + X1:1:GND + +1:BK + +X3:1:GND + X1:2:VCC + +2:RD + +X3:2:VCC +  - + X1:e--W2:w - - - + + + - + X1:e--W2:w - - - + + + - + W3 - - - -W3 - -2x - -20 awg (0.75 mm²) - -0.2 m -  - X1:1:GND - -1:BK - -X4:1:GND - - - - X1:2:VCC - -2:RD - -X4:2:VCC - - - -  + + + +W3 + +2x + +20 awg (0.75 mm²) + +0.2 m +  + X1:1:GND + +1:BK + +X4:1:GND + X1:2:VCC + +2:RD + +X4:2:VCC +  - + X1:e--W3:w - - - + + + - + X1:e--W3:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W2:e--X3:w + + + + + + +W2:e--X3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X3:w - - - - - - -W2:e--X3:w - - - + + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC - + W3:e--X4:w - - - + + + - + W3:e--X4:w - - - + + + diff --git a/examples/ex02_wv_gvpr.gvpr b/examples/ex02_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex02_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex03.gv b/examples/ex03.gv index 309c1d6..fb145a3 100644 --- a/examples/ex03.gv +++ b/examples/ex03.gv @@ -193,19 +193,7 @@ graph { X2:1:GND
- + @@ -216,19 +204,7 @@ graph { - + @@ -239,19 +215,7 @@ graph { - + @@ -262,19 +226,7 @@ graph { - + @@ -285,19 +237,7 @@ graph { - + @@ -308,19 +248,7 @@ graph { - + @@ -348,4 +276,10 @@ graph { edge [color="#000000:#FF0000:#000000"] X1:p2r:e -- W1:w6:w W1:w6:e -- X4:p2l:w + W1:w1:e -- W1:w1:w [color="#000000:#000000:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#000000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000:#000000:#000000" straight=straight] + W1:w6:e -- W1:w6:w [color="#000000:#FF0000:#000000" straight=straight] } diff --git a/examples/ex03.html b/examples/ex03.html index 680c7e3..7152643 100644 --- a/examples/ex03.html +++ b/examples/ex03.html @@ -30,248 +30,272 @@
- - - - + + + X1 - - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 - + W1 - - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  - X1:1:GND - -BK - -X2:1:GND - - - - X1:2:VCC - -RD - -X2:2:VCC - - - - X1:1:GND - -BK - -X3:1:GND - - - - X1:2:VCC - -RD - -X3:2:VCC - - - - X1:1:GND - -BK - -X4:1:GND - - - - X1:2:VCC - -RD - -X4:2:VCC - - - -  + + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  + X1:1:GND + +BK + +X2:1:GND + X1:2:VCC + +RD + +X2:2:VCC + X1:1:GND + +BK + +X3:1:GND + X1:2:VCC + +RD + +X3:2:VCC + X1:1:GND + +BK + +X4:1:GND + X1:2:VCC + +RD + +X4:2:VCC +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + X3 - - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W1:e--X3:w + + + + + + +W1:e--X3:w + + + - + X4 - - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X3:w - - - - - - -W1:e--X3:w - - - + + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC - + W1:e--X4:w - - - + + + - + W1:e--X4:w - - - + + + diff --git a/examples/ex03.png b/examples/ex03.png index a139ee9..c9b6166 100644 Binary files a/examples/ex03.png and b/examples/ex03.png differ diff --git a/examples/ex03.svg b/examples/ex03.svg index 49610e2..d5e6b37 100644 --- a/examples/ex03.svg +++ b/examples/ex03.svg @@ -1,248 +1,272 @@ - - - - + + + X1 - - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 - + W1 - - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  - X1:1:GND - -BK - -X2:1:GND - - - - X1:2:VCC - -RD - -X2:2:VCC - - - - X1:1:GND - -BK - -X3:1:GND - - - - X1:2:VCC - -RD - -X3:2:VCC - - - - X1:1:GND - -BK - -X4:1:GND - - - - X1:2:VCC - -RD - -X4:2:VCC - - - -  + + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  + X1:1:GND + +BK + +X2:1:GND + X1:2:VCC + +RD + +X2:2:VCC + X1:1:GND + +BK + +X3:1:GND + X1:2:VCC + +RD + +X3:2:VCC + X1:1:GND + +BK + +X4:1:GND + X1:2:VCC + +RD + +X4:2:VCC +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + X3 - - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC + + + +W1:e--X3:w + + + + + + +W1:e--X3:w + + + - + X4 - - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X3:w - - - - - - -W1:e--X3:w - - - + + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC - + W1:e--X4:w - - - + + + - + W1:e--X4:w - - - + + + diff --git a/examples/ex03_wv_gvpr.gvpr b/examples/ex03_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex03_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex04.gv b/examples/ex04.gv index 5cfb1ae..4c23323 100644 --- a/examples/ex04.gv +++ b/examples/ex04.gv @@ -197,19 +197,7 @@ graph {
- + @@ -220,19 +208,7 @@ graph { - + @@ -243,19 +219,7 @@ graph { - + @@ -266,19 +230,7 @@ graph { - + @@ -289,19 +241,7 @@ graph { - + @@ -312,19 +252,7 @@ graph { - + @@ -352,4 +280,10 @@ graph { edge [color="#000000:#0066FF:#000000"] AUTOGENERATED_F_6:e -- W1:w6:w W1:w6:e -- AUTOGENERATED_F_12:w + W1:w1:e -- W1:w1:w [color="#000000:#895956:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FF8000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000:#00AA00:#000000" straight=straight] + W1:w6:e -- W1:w6:w [color="#000000:#0066FF:#000000" straight=straight] } diff --git a/examples/ex04.html b/examples/ex04.html index c1a2259..4135dc2 100644 --- a/examples/ex04.html +++ b/examples/ex04.html @@ -30,256 +30,280 @@
- - - - + + + AUTOGENERATED_F_1 - - - -Crimp ferrule + + + +Crimp ferrule - + W1 - - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  - - -BN - - - - - - - -RD - - - - - - - -OG - - - - - - - -YE - - - - - - - -GN - - - - - - - -BU - - - - - -  + + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  + + +BN + + + + +RD + + + + +OG + + + + +YE + + + + +GN + + + + +BU + + +  AUTOGENERATED_F_1:e--W1:w - - - + + + - - -AUTOGENERATED_F_2 - - - -Crimp ferrule + + +W1:e--W1:w + + + - + -AUTOGENERATED_F_2:e--W1:w - - - +W1:e--W1:w + + + - - -AUTOGENERATED_F_3 - - - -Crimp ferrule + + +W1:e--W1:w + + + - + -AUTOGENERATED_F_3:e--W1:w - - - +W1:e--W1:w + + + - - -AUTOGENERATED_F_4 - - - -Crimp ferrule + + +W1:e--W1:w + + + - + -AUTOGENERATED_F_4:e--W1:w - - - - - - -AUTOGENERATED_F_5 - - - -Crimp ferrule - - - -AUTOGENERATED_F_5:e--W1:w - - - - - - -AUTOGENERATED_F_6 - - - -Crimp ferrule - - - -AUTOGENERATED_F_6:e--W1:w - - - +W1:e--W1:w + + + - + AUTOGENERATED_F_7 - - - -Crimp ferrule - - - -AUTOGENERATED_F_8 - - - -Crimp ferrule - - - -AUTOGENERATED_F_9 - - - -Crimp ferrule - - - -AUTOGENERATED_F_10 - - - -Crimp ferrule - - - -AUTOGENERATED_F_11 - - - -Crimp ferrule - - - -AUTOGENERATED_F_12 - - - -Crimp ferrule + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_7:w - - - + + + + + + +AUTOGENERATED_F_8 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_8:w - - - + + + + + + +AUTOGENERATED_F_9 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_9:w - - - + + + + + + +AUTOGENERATED_F_10 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_10:w - - - + + + + + + +AUTOGENERATED_F_11 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_11:w - - - + + + + + + +AUTOGENERATED_F_12 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_12:w - - - + + + + + + +AUTOGENERATED_F_2 + + + +Crimp ferrule + + + +AUTOGENERATED_F_2:e--W1:w + + + + + + +AUTOGENERATED_F_3 + + + +Crimp ferrule + + + +AUTOGENERATED_F_3:e--W1:w + + + + + + +AUTOGENERATED_F_4 + + + +Crimp ferrule + + + +AUTOGENERATED_F_4:e--W1:w + + + + + + +AUTOGENERATED_F_5 + + + +Crimp ferrule + + + +AUTOGENERATED_F_5:e--W1:w + + + + + + +AUTOGENERATED_F_6 + + + +Crimp ferrule + + + +AUTOGENERATED_F_6:e--W1:w + + + diff --git a/examples/ex04.png b/examples/ex04.png index 2eaa251..55d6c26 100644 Binary files a/examples/ex04.png and b/examples/ex04.png differ diff --git a/examples/ex04.svg b/examples/ex04.svg index f77b00f..b539bba 100644 --- a/examples/ex04.svg +++ b/examples/ex04.svg @@ -1,256 +1,280 @@ - - - - + + + AUTOGENERATED_F_1 - - - -Crimp ferrule + + + +Crimp ferrule - + W1 - - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  - - -BN - - - - - - - -RD - - - - - - - -OG - - - - - - - -YE - - - - - - - -GN - - - - - - - -BU - - - - - -  + + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  + + +BN + + + + +RD + + + + +OG + + + + +YE + + + + +GN + + + + +BU + + +  AUTOGENERATED_F_1:e--W1:w - - - + + + - - -AUTOGENERATED_F_2 - - - -Crimp ferrule + + +W1:e--W1:w + + + - + -AUTOGENERATED_F_2:e--W1:w - - - +W1:e--W1:w + + + - - -AUTOGENERATED_F_3 - - - -Crimp ferrule + + +W1:e--W1:w + + + - + -AUTOGENERATED_F_3:e--W1:w - - - +W1:e--W1:w + + + - - -AUTOGENERATED_F_4 - - - -Crimp ferrule + + +W1:e--W1:w + + + - + -AUTOGENERATED_F_4:e--W1:w - - - - - - -AUTOGENERATED_F_5 - - - -Crimp ferrule - - - -AUTOGENERATED_F_5:e--W1:w - - - - - - -AUTOGENERATED_F_6 - - - -Crimp ferrule - - - -AUTOGENERATED_F_6:e--W1:w - - - +W1:e--W1:w + + + - + AUTOGENERATED_F_7 - - - -Crimp ferrule - - - -AUTOGENERATED_F_8 - - - -Crimp ferrule - - - -AUTOGENERATED_F_9 - - - -Crimp ferrule - - - -AUTOGENERATED_F_10 - - - -Crimp ferrule - - - -AUTOGENERATED_F_11 - - - -Crimp ferrule - - - -AUTOGENERATED_F_12 - - - -Crimp ferrule + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_7:w - - - + + + + + + +AUTOGENERATED_F_8 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_8:w - - - + + + + + + +AUTOGENERATED_F_9 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_9:w - - - + + + + + + +AUTOGENERATED_F_10 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_10:w - - - + + + + + + +AUTOGENERATED_F_11 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_11:w - - - + + + + + + +AUTOGENERATED_F_12 + + + +Crimp ferrule - + W1:e--AUTOGENERATED_F_12:w - - - + + + + + + +AUTOGENERATED_F_2 + + + +Crimp ferrule + + + +AUTOGENERATED_F_2:e--W1:w + + + + + + +AUTOGENERATED_F_3 + + + +Crimp ferrule + + + +AUTOGENERATED_F_3:e--W1:w + + + + + + +AUTOGENERATED_F_4 + + + +Crimp ferrule + + + +AUTOGENERATED_F_4:e--W1:w + + + + + + +AUTOGENERATED_F_5 + + + +Crimp ferrule + + + +AUTOGENERATED_F_5:e--W1:w + + + + + + +AUTOGENERATED_F_6 + + + +Crimp ferrule + + + +AUTOGENERATED_F_6:e--W1:w + + + diff --git a/examples/ex04_wv_gvpr.gvpr b/examples/ex04_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex04_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex05.gv b/examples/ex05.gv index 852146f..b34e3fd 100644 --- a/examples/ex05.gv +++ b/examples/ex05.gv @@ -184,19 +184,7 @@ graph { X2:1:GND
- + @@ -207,19 +195,7 @@ graph { - + @@ -230,19 +206,7 @@ graph { - + @@ -253,19 +217,7 @@ graph { - + @@ -287,6 +239,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#FF66CC:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#00FFFF:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#8000FF:#000000" straight=straight] W2 [label=<
X4:1:GND
- - - - - - - - - - -
-
X1:2:VCCX4:2:VCC
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2:VCCX2:2:VCC
- - - - - - - - - - -
-
X1:1:GNDX3:1:GND
- - - - - - - - - - -
-
X1:2:VCCX3:2:VCC
- - - - - - - - - - -
-
X1:1:GNDX4:1:GND
- - - - - - - - - - -
-
X1:2:VCCX4:2:VCC
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2:VCCX2:2:VCC
- - - - - - - - - - -
-
X1:3:SCLX2:3:SCL
- - - - - - - - - - -
-
X1:4:SDAX2:4:SDA
- - - - - - - - - - -
-
 
@@ -325,19 +281,7 @@ graph { - + @@ -348,19 +292,7 @@ graph { - + @@ -371,19 +303,7 @@ graph { - + @@ -394,19 +314,7 @@ graph { - + @@ -428,4 +336,8 @@ graph { edge [color="#000000:#8000FF:#000000"] X2:p4r:e -- W2:w4:w W2:w4:e -- X3:p4l:w + W2:w1:e -- W2:w1:w [color="#000000:#FF66CC:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#00FFFF:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#8000FF:#000000" straight=straight] } diff --git a/examples/ex05.html b/examples/ex05.html index f476b9d..01675b7 100644 --- a/examples/ex05.html +++ b/examples/ex05.html @@ -30,322 +30,354 @@
- - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W1 - - - -W1 - -I2C - -4x - -0.25 mm² - -0.2 m -  - X1:1:GND - -PK - -X2:1:GND - - - - X1:2:VCC - -TQ - -X2:2:VCC - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -VT - -X2:4:SDA - - - -  + + + +W1 + +I2C + +4x + +0.25 mm² + +0.2 m +  + X1:1:GND + +PK + +X2:1:GND + X1:2:VCC + +TQ + +X2:2:VCC + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +VT + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + W2 - - - -W2 - -I2C - -4x - -0.25 mm² - -0.2 m -  - X2:1:GND - -PK - -X3:1:GND - - - - X2:2:VCC - -TQ - -X3:2:VCC - - - - X2:3:SCL - -YE - -X3:3:SCL - - - - X2:4:SDA - -VT - -X3:4:SDA - - - -  - - - -X2:e--W2:w - - - - - - -X2:e--W2:w - - - + + + +W2 + +I2C + +4x + +0.25 mm² + +0.2 m +  + X2:1:GND + +PK + +X3:1:GND + X2:2:VCC + +TQ + +X3:2:VCC + X2:3:SCL + +YE + +X3:3:SCL + X2:4:SDA + +VT + +X3:4:SDA +  X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - + + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + diff --git a/examples/ex05.png b/examples/ex05.png index bf3d27f..9c3edd9 100644 Binary files a/examples/ex05.png and b/examples/ex05.png differ diff --git a/examples/ex05.svg b/examples/ex05.svg index ef9e740..815a59b 100644 --- a/examples/ex05.svg +++ b/examples/ex05.svg @@ -1,322 +1,354 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W1 - - - -W1 - -I2C - -4x - -0.25 mm² - -0.2 m -  - X1:1:GND - -PK - -X2:1:GND - - - - X1:2:VCC - -TQ - -X2:2:VCC - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -VT - -X2:4:SDA - - - -  + + + +W1 + +I2C + +4x + +0.25 mm² + +0.2 m +  + X1:1:GND + +PK + +X2:1:GND + X1:2:VCC + +TQ + +X2:2:VCC + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +VT + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + W2 - - - -W2 - -I2C - -4x - -0.25 mm² - -0.2 m -  - X2:1:GND - -PK - -X3:1:GND - - - - X2:2:VCC - -TQ - -X3:2:VCC - - - - X2:3:SCL - -YE - -X3:3:SCL - - - - X2:4:SDA - -VT - -X3:4:SDA - - - -  - - - -X2:e--W2:w - - - - - - -X2:e--W2:w - - - + + + +W2 + +I2C + +4x + +0.25 mm² + +0.2 m +  + X2:1:GND + +PK + +X3:1:GND + X2:2:VCC + +TQ + +X3:2:VCC + X2:3:SCL + +YE + +X3:3:SCL + X2:4:SDA + +VT + +X3:4:SDA +  X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - + + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + diff --git a/examples/ex05_wv_gvpr.gvpr b/examples/ex05_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex05_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex06.gv b/examples/ex06.gv index be1231e..274592b 100644 --- a/examples/ex06.gv +++ b/examples/ex06.gv @@ -317,19 +317,7 @@ graph { X2:1:GND
- + @@ -340,19 +328,7 @@ graph { - + @@ -363,19 +339,7 @@ graph { - + @@ -386,19 +350,7 @@ graph { - + @@ -420,6 +372,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#FF66CC:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#00FFFF:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#8000FF:#000000" straight=straight] W2 [label=<
X3:1:GND
- - - - - - - - - - -
-
X2:2:VCCX3:2:VCC
- - - - - - - - - - -
-
X2:3:SCLX3:3:SCL
- - - - - - - - - - -
-
X2:4:SDAX3:4:SDA
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2:VCCX2:2:VCC
- - - - - - - - - - -
-
X1:3:SCLX2:3:SCL
- - - - - - - - - - -
-
X1:4:SDAX2:4:SDA
- - - - - - - - - - -
-
 
@@ -457,19 +413,7 @@ graph { - + @@ -480,19 +424,7 @@ graph { - + @@ -503,19 +435,7 @@ graph { - + @@ -526,19 +446,7 @@ graph { - + @@ -560,6 +468,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X3:p4r:e -- W2:w4:w W2:w4:e -- X2:p4l:w + W2:w1:e -- W2:w1:w [color="#000000:#FF66CC:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#00FFFF:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#8000FF:#000000" straight=straight] W3 [label=<
X2:1:GND
- - - - - - - - - - -
-
X3:2:VCCX2:2:VCC
- - - - - - - - - - -
-
X3:3:SCLX2:3:SCL
- - - - - - - - - - -
-
X3:4:SDAX2:4:SDA
- - - - - - - - - - -
-
 
@@ -597,19 +509,7 @@ graph { - + @@ -620,19 +520,7 @@ graph { - + @@ -643,19 +531,7 @@ graph { - + @@ -666,19 +542,7 @@ graph { - + @@ -700,6 +564,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X3:p4r:e -- W3:w4:w W3:w4:e -- X4:p4l:w + W3:w1:e -- W3:w1:w [color="#000000:#FF66CC:#000000" straight=straight] + W3:w2:e -- W3:w2:w [color="#000000:#00FFFF:#000000" straight=straight] + W3:w3:e -- W3:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W3:w4:e -- W3:w4:w [color="#000000:#8000FF:#000000" straight=straight] W4 [label=<
X4:1:GND
- - - - - - - - - - -
-
X3:2:VCCX4:2:VCC
- - - - - - - - - - -
-
X3:3:SCLX4:3:SCL
- - - - - - - - - - -
-
X3:4:SDAX4:4:SDA
- - - - - - - - - - -
-
 
@@ -737,19 +605,7 @@ graph { - + @@ -760,19 +616,7 @@ graph { - + @@ -783,19 +627,7 @@ graph { - + @@ -806,19 +638,7 @@ graph { - + @@ -840,6 +660,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X5:p4r:e -- W4:w4:w W4:w4:e -- X4:p4l:w + W4:w1:e -- W4:w1:w [color="#000000:#FF66CC:#000000" straight=straight] + W4:w2:e -- W4:w2:w [color="#000000:#00FFFF:#000000" straight=straight] + W4:w3:e -- W4:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W4:w4:e -- W4:w4:w [color="#000000:#8000FF:#000000" straight=straight] W5 [label=<
X4:1:GND
- - - - - - - - - - -
-
X5:2:VCCX4:2:VCC
- - - - - - - - - - -
-
X5:3:SCLX4:3:SCL
- - - - - - - - - - -
-
X5:4:SDAX4:4:SDA
- - - - - - - - - - -
-
 
@@ -877,19 +701,7 @@ graph { - + @@ -900,19 +712,7 @@ graph { - + @@ -923,19 +723,7 @@ graph { - + @@ -946,19 +734,7 @@ graph { - + @@ -980,4 +756,8 @@ graph { edge [color="#000000:#8000FF:#000000"] X5:p4r:e -- W5:w4:w W5:w4:e -- X6:p4l:w + W5:w1:e -- W5:w1:w [color="#000000:#FF66CC:#000000" straight=straight] + W5:w2:e -- W5:w2:w [color="#000000:#00FFFF:#000000" straight=straight] + W5:w3:e -- W5:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W5:w4:e -- W5:w4:w [color="#000000:#8000FF:#000000" straight=straight] } diff --git a/examples/ex06.html b/examples/ex06.html index f717050..db5a2d8 100644 --- a/examples/ex06.html +++ b/examples/ex06.html @@ -30,712 +30,792 @@
- - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W1 - - - -W1 - -4x - -0.25 mm² - -0.2 m -  - X1:1:GND - -PK - -X2:1:GND - - - - X1:2:VCC - -TQ - -X2:2:VCC - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -VT - -X2:4:SDA - - - -  + + + +W1 + +4x + +0.25 mm² + +0.2 m +  + X1:1:GND + +PK + +X2:1:GND + X1:2:VCC + +TQ + +X2:2:VCC + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +VT + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W2 - - - -W2 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -PK - -X2:1:GND - - - - X3:2:VCC - -TQ - -X2:2:VCC - - - - X3:3:SCL - -YE - -X2:3:SCL - - - - X3:4:SDA - -VT - -X2:4:SDA - - - -  - - - -X3:e--W2:w - - - - - - -X3:e--W2:w - - - + + + +W2 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +PK + +X2:1:GND + X3:2:VCC + +TQ + +X2:2:VCC + X3:3:SCL + +YE + +X2:3:SCL + X3:4:SDA + +VT + +X2:4:SDA +  X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + - + W3 - - - -W3 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -PK - -X4:1:GND - - - - X3:2:VCC - -TQ - -X4:2:VCC - - - - X3:3:SCL - -YE - -X4:3:SCL - - - - X3:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W3 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +PK + +X4:1:GND + X3:2:VCC + +TQ + +X4:2:VCC + X3:3:SCL + +YE + +X4:3:SCL + X3:4:SDA + +VT + +X4:4:SDA +  X3:e--W3:w - - - + + + + + + +X3:e--W3:w + + + X3:e--W3:w - - - + + + + +X3:e--W3:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + - + + +W2:e--X2:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + + + + +W2:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + - + X5 - - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W4 - - - -W4 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -PK - -X4:1:GND - - - - X5:2:VCC - -TQ - -X4:2:VCC - - - - X5:3:SCL - -YE - -X4:3:SCL - - - - X5:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W4 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +PK + +X4:1:GND + X5:2:VCC + +TQ + +X4:2:VCC + X5:3:SCL + +YE + +X4:3:SCL + X5:4:SDA + +VT + +X4:4:SDA +  - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + W5 - - - -W5 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -PK - -X6:1:GND - - - - X5:2:VCC - -TQ - -X6:2:VCC - - - - X5:3:SCL - -YE - -X6:3:SCL - - - - X5:4:SDA - -VT - -X6:4:SDA - - - -  + + + +W5 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +PK + +X6:1:GND + X5:2:VCC + +TQ + +X6:2:VCC + X5:3:SCL + +YE + +X6:3:SCL + X5:4:SDA + +VT + +X6:4:SDA +  - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + - + X6 - - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - + + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + diff --git a/examples/ex06.png b/examples/ex06.png index d42cdf9..c6f5192 100644 Binary files a/examples/ex06.png and b/examples/ex06.png differ diff --git a/examples/ex06.svg b/examples/ex06.svg index 9939f61..94f5be1 100644 --- a/examples/ex06.svg +++ b/examples/ex06.svg @@ -1,712 +1,792 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W1 - - - -W1 - -4x - -0.25 mm² - -0.2 m -  - X1:1:GND - -PK - -X2:1:GND - - - - X1:2:VCC - -TQ - -X2:2:VCC - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -VT - -X2:4:SDA - - - -  + + + +W1 + +4x + +0.25 mm² + +0.2 m +  + X1:1:GND + +PK + +X2:1:GND + X1:2:VCC + +TQ + +X2:2:VCC + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +VT + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W2 - - - -W2 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -PK - -X2:1:GND - - - - X3:2:VCC - -TQ - -X2:2:VCC - - - - X3:3:SCL - -YE - -X2:3:SCL - - - - X3:4:SDA - -VT - -X2:4:SDA - - - -  - - - -X3:e--W2:w - - - - - - -X3:e--W2:w - - - + + + +W2 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +PK + +X2:1:GND + X3:2:VCC + +TQ + +X2:2:VCC + X3:3:SCL + +YE + +X2:3:SCL + X3:4:SDA + +VT + +X2:4:SDA +  X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + - + W3 - - - -W3 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -PK - -X4:1:GND - - - - X3:2:VCC - -TQ - -X4:2:VCC - - - - X3:3:SCL - -YE - -X4:3:SCL - - - - X3:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W3 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +PK + +X4:1:GND + X3:2:VCC + +TQ + +X4:2:VCC + X3:3:SCL + +YE + +X4:3:SCL + X3:4:SDA + +VT + +X4:4:SDA +  X3:e--W3:w - - - + + + + + + +X3:e--W3:w + + + X3:e--W3:w - - - + + + + +X3:e--W3:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + - + + +W2:e--X2:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + + + + +W2:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + - + X5 - - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W4 - - - -W4 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -PK - -X4:1:GND - - - - X5:2:VCC - -TQ - -X4:2:VCC - - - - X5:3:SCL - -YE - -X4:3:SCL - - - - X5:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W4 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +PK + +X4:1:GND + X5:2:VCC + +TQ + +X4:2:VCC + X5:3:SCL + +YE + +X4:3:SCL + X5:4:SDA + +VT + +X4:4:SDA +  - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + W5 - - - -W5 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -PK - -X6:1:GND - - - - X5:2:VCC - -TQ - -X6:2:VCC - - - - X5:3:SCL - -YE - -X6:3:SCL - - - - X5:4:SDA - -VT - -X6:4:SDA - - - -  + + + +W5 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +PK + +X6:1:GND + X5:2:VCC + +TQ + +X6:2:VCC + X5:3:SCL + +YE + +X6:3:SCL + X5:4:SDA + +VT + +X6:4:SDA +  - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + - + X6 - - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - + + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + diff --git a/examples/ex06_wv_gvpr.gvpr b/examples/ex06_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex06_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex07.gv b/examples/ex07.gv index 0dc76b8..1da26b3 100644 --- a/examples/ex07.gv +++ b/examples/ex07.gv @@ -134,19 +134,7 @@ graph { X2:7
- + @@ -156,19 +144,7 @@ graph { - + @@ -184,4 +160,6 @@ graph { edge [color="#000000:#00AA00:#000000"] X1:p6r:e -- C1:w2:w C1:w2:e -- X2:p2l:w + C1:w1:e -- C1:w1:w [color="#000000:#FFFF00:#000000" straight=straight] + C1:w2:e -- C1:w2:w [color="#000000:#00AA00:#000000" straight=straight] } diff --git a/examples/ex07.html b/examples/ex07.html index 3b33e2b..b9f4684 100644 --- a/examples/ex07.html +++ b/examples/ex07.html @@ -30,112 +30,120 @@
- - - - + + + X1 - - - -X1 - -TE 776164-1 - -female - -35-pin - -5 - -6 - -Unconnected pins are not shown + + + +X1 + +TE 776164-1 + +female + +35-pin + +5 + +6 + +Unconnected pins are not shown - + C1 - - - -C1 - -2x - -20 AWG - -1 m -  - X1:5 - -1:YE - -X2:7 - - - - X1:6 - -2:GN - -X2:2 - - - -  + + + +C1 + +2x + +20 AWG + +1 m +  + X1:5 + +1:YE + +X2:7 + X1:6 + +2:GN + +X2:2 +  X1:e--C1:w - - - + + + - + X1:e--C1:w - - - + + + + + + +C1:e--C1:w + + + + + + +C1:e--C1:w + + + - + X2 - - - -X2 - -D-Sub - -female - -9-pin - -2 - -7 - -Unconnected pins are not shown + + + +X2 + +D-Sub + +female + +9-pin + +2 + +7 + +Unconnected pins are not shown - + C1:e--X2:w - - - + + + - + C1:e--X2:w - - - + + + diff --git a/examples/ex07.png b/examples/ex07.png index 79b086b..2fd5c84 100644 Binary files a/examples/ex07.png and b/examples/ex07.png differ diff --git a/examples/ex07.svg b/examples/ex07.svg index 16ef266..16baab4 100644 --- a/examples/ex07.svg +++ b/examples/ex07.svg @@ -1,112 +1,120 @@ - - - - + + + X1 - - - -X1 - -TE 776164-1 - -female - -35-pin - -5 - -6 - -Unconnected pins are not shown + + + +X1 + +TE 776164-1 + +female + +35-pin + +5 + +6 + +Unconnected pins are not shown - + C1 - - - -C1 - -2x - -20 AWG - -1 m -  - X1:5 - -1:YE - -X2:7 - - - - X1:6 - -2:GN - -X2:2 - - - -  + + + +C1 + +2x + +20 AWG + +1 m +  + X1:5 + +1:YE + +X2:7 + X1:6 + +2:GN + +X2:2 +  X1:e--C1:w - - - + + + - + X1:e--C1:w - - - + + + + + + +C1:e--C1:w + + + + + + +C1:e--C1:w + + + - + X2 - - - -X2 - -D-Sub - -female - -9-pin - -2 - -7 - -Unconnected pins are not shown + + + +X2 + +D-Sub + +female + +9-pin + +2 + +7 + +Unconnected pins are not shown - + C1:e--X2:w - - - + + + - + C1:e--X2:w - - - + + + diff --git a/examples/ex07_wv_gvpr.gvpr b/examples/ex07_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex07_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex08.gv b/examples/ex08.gv index d85f415..7178d8b 100644 --- a/examples/ex08.gv +++ b/examples/ex08.gv @@ -47,7 +47,7 @@ graph {
X6:1:GND
- - - - - - - - - - -
-
X5:2:VCCX6:2:VCC
- - - - - - - - - - -
-
X5:3:SCLX6:3:SCL
- - - - - - - - - - -
-
X5:4:SDAX6:4:SDA
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:6X2:2
- - - - - - - - - - -
-
 
- +
@@ -102,19 +102,7 @@ graph { - - - - - - - - - - - -
- + Key:R:Dash @@ -124,19 +112,7 @@ graph { - - - - - - - - - - - -
- + Key:T:Dot @@ -146,19 +122,7 @@ graph { - - - - - - - - - - - -
- +   @@ -171,19 +135,7 @@ graph { - - - - - - - - - - - -
- +   @@ -198,7 +150,7 @@ graph { - +
@@ -225,4 +177,8 @@ graph { Key:p1r:e -- W1:w3:w edge [color="#000000:#AAAAAA:#000000"] Key:p3r:e -- W1:w4:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#895956:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#AAAAAA:#000000" straight=straight] } diff --git a/examples/ex08.html b/examples/ex08.html index 7dda009..06e8ae7 100644 --- a/examples/ex08.html +++ b/examples/ex08.html @@ -30,127 +30,143 @@
- - - - + + + Key - - - -Key - -Phone Connector - -male 3.5 - -Dot - -T - -Dash - -R - -Ground - -S - - - -Tip, Ring, and Sleeve + + + +Key + +Phone Connector + +male 3.5 + +Dot + +T + +Dash + +R + +Ground + +S + + + +Tip, Ring, and Sleeve W1 - - - -W1 - -3x - -24 AWG - -+ S - -0.2 m - -BK - - -  - Key:S:Ground - -1:WH - - - - - - Key:R:Dash - -2:BN - - - - - - Key:T:Dot - -3:GN - - - - - -  - Key:S:Ground - -SN:Shield - - - - - -  - - - -Cross-section + + + +W1 + +3x + +24 AWG + ++ S + +0.2 m + +BK + + +  + Key:S:Ground + +1:WH + + + Key:R:Dash + +2:BN + + + Key:T:Dot + +3:GN + + +  + Key:S:Ground + +SN:Shield + + +  + + + +Cross-section Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + diff --git a/examples/ex08.png b/examples/ex08.png index 7732c38..f59caf1 100644 Binary files a/examples/ex08.png and b/examples/ex08.png differ diff --git a/examples/ex08.svg b/examples/ex08.svg index 4b57e02..c3b04f8 100644 --- a/examples/ex08.svg +++ b/examples/ex08.svg @@ -1,127 +1,143 @@ - - - - + + + Key - - - -Key - -Phone Connector - -male 3.5 - -Dot - -T - -Dash - -R - -Ground - -S - - - -Tip, Ring, and Sleeve + + + +Key + +Phone Connector + +male 3.5 + +Dot + +T + +Dash + +R + +Ground + +S + + + +Tip, Ring, and Sleeve W1 - - - -W1 - -3x - -24 AWG - -+ S - -0.2 m - -BK - - -  - Key:S:Ground - -1:WH - - - - - - Key:R:Dash - -2:BN - - - - - - Key:T:Dot - -3:GN - - - - - -  - Key:S:Ground - -SN:Shield - - - - - -  - - - -Cross-section + + + +W1 + +3x + +24 AWG + ++ S + +0.2 m + +BK + + +  + Key:S:Ground + +1:WH + + + Key:R:Dash + +2:BN + + + Key:T:Dot + +3:GN + + +  + Key:S:Ground + +SN:Shield + + +  + + + +Cross-section Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + diff --git a/examples/ex08_wv_gvpr.gvpr b/examples/ex08_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex08_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex09.gv b/examples/ex09.gv index 5a41dd0..424dd96 100644 --- a/examples/ex09.gv +++ b/examples/ex09.gv @@ -345,25 +345,7 @@ graph { X2:z2
- -
- - - - - - - - - - - - - - - -
- + X1:1:SENSE_P_1 @@ -373,25 +355,7 @@ graph { X2:d4 - - - - - - - - - - - - - - - - - -
- + X1:16:SENSE_N_2 @@ -401,25 +365,7 @@ graph { X2:z8 - - - - - - - - - - - - - - - - - -
- + X1:3:SENSE_P_2 @@ -429,25 +375,7 @@ graph { X2:d10 - - - - - - - - - - - - - - - - - -
- + X1:18:SENSE_N_3 @@ -457,25 +385,7 @@ graph { X2:z14 - - - - - - - - - - - - - - - - - -
- + X1:5:SENSE_P_3 @@ -485,25 +395,7 @@ graph { X2:d16 - - - - - - - - - - - - - - - - - -
- + X1:20:SENSE_N_4 @@ -513,25 +405,7 @@ graph { X2:z18 - - - - - - - - - - - - - - - - - -
- + X1:7:SENSE_P_4 @@ -541,25 +415,7 @@ graph { X2:d20 - - - - - - - - - - - - - - - - - -
- + X1:22:SENSE_N_5 @@ -569,25 +425,7 @@ graph { X2:z24 - - - - - - - - - - - - - - - - - -
- + X1:9:SENSE_P_5 @@ -597,25 +435,7 @@ graph { X2:d26 - - - - - - - - - - - - - - - - - -
- + X1:24:SENSE_N_6 @@ -625,25 +445,7 @@ graph { X2:z30 - - - - - - - - - - - - - - - - - -
- + X1:11:SENSE_P_6 @@ -653,25 +455,7 @@ graph { X2:d32 - - - - - - - - - - - - - - - - - -
- +   @@ -684,13 +468,7 @@ graph { - - - - - -
- +   @@ -738,4 +516,17 @@ graph { W1:w11:e -- X2:p43l:w edge [color="#000000"] X1:p13r:e -- W1:w13:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFFFF:#FFFFFF:#FFFFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#895956:#895956:#895956:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#00AA00:#00AA00:#00AA00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#FFFF00:#FFFF00:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000:#999999:#999999:#999999:#000000" straight=straight] + W1:w6:e -- W1:w6:w [color="#000000:#FF66CC:#FF66CC:#FF66CC:#000000" straight=straight] + W1:w7:e -- W1:w7:w [color="#000000:#0066FF:#0066FF:#0066FF:#000000" straight=straight] + W1:w8:e -- W1:w8:w [color="#000000:#FF0000:#FF0000:#FF0000:#000000" straight=straight] + W1:w9:e -- W1:w9:w [color="#000000:#000000:#000000:#000000:#000000" straight=straight] + W1:w10:e -- W1:w10:w [color="#000000:#8000FF:#8000FF:#8000FF:#000000" straight=straight] + W1:w11:e -- W1:w11:w [color="#000000:#999999:#FF66CC:#999999:#000000" straight=straight] + W1:w12:e -- W1:w12:w [color="#000000:#FF0000:#0066FF:#FF0000:#000000" straight=straight] + W1:w13:e -- W1:w13:w [color="#000000" straight=straight] } diff --git a/examples/ex09.html b/examples/ex09.html index 7d0a6fa..4c45c20 100644 --- a/examples/ex09.html +++ b/examples/ex09.html @@ -30,554 +30,606 @@
- - - - + + + X1 - - - -X1 - -D-Sub - -male - -25-pin - -SENSE_P_1 - -1 - -SENSE_N_1 - -14 - -SENSE_P_2 - -3 - -SENSE_N_2 - -16 - -SENSE_P_3 - -5 - -SENSE_N_3 - -18 - -SENSE_P_4 - -7 - -SENSE_N_4 - -20 - -SENSE_P_5 - -9 - -SENSE_N_5 - -22 - -SENSE_P_6 - -11 - -SENSE_N_6 - -24 - -GND - -13 + + + +X1 + +D-Sub + +male + +25-pin + +SENSE_P_1 + +1 + +SENSE_N_1 + +14 + +SENSE_P_2 + +3 + +SENSE_N_2 + +16 + +SENSE_P_3 + +5 + +SENSE_N_3 + +18 + +SENSE_P_4 + +7 + +SENSE_N_4 + +20 + +SENSE_P_5 + +9 + +SENSE_N_5 + +22 + +SENSE_P_6 + +11 + +SENSE_N_6 + +24 + +GND + +13 - + W1 - - - -W1 - -12x - -0.25 mm² - -+ S - -0.2 m -  - X1:14:SENSE_N_1 - -1:WH - -X2:z2 - - - - - - X1:1:SENSE_P_1 - -2:BN - -X2:d4 - - - - - - X1:16:SENSE_N_2 - -3:GN - -X2:z8 - - - - - - X1:3:SENSE_P_2 - -4:YE - -X2:d10 - - - - - - X1:18:SENSE_N_3 - -5:GY - -X2:z14 - - - - - - X1:5:SENSE_P_3 - -6:PK - -X2:d16 - - - - - - X1:20:SENSE_N_4 - -7:BU - -X2:z18 - - - - - - X1:7:SENSE_P_4 - -8:RD - -X2:d20 - - - - - - X1:22:SENSE_N_5 - -9:BK - -X2:z24 - - - - - - X1:9:SENSE_P_5 - -10:VT - -X2:d26 - - - - - - X1:24:SENSE_N_6 - -11:GYPK - -X2:z30 - - - - - - X1:11:SENSE_P_6 - -12:RDBU - -X2:d32 - - - - - -  - X1:13:GND - -Shield - - - -  + + + +W1 + +12x + +0.25 mm² + ++ S + +0.2 m +  + X1:14:SENSE_N_1 + +1:WH + +X2:z2 + X1:1:SENSE_P_1 + +2:BN + +X2:d4 + X1:16:SENSE_N_2 + +3:GN + +X2:z8 + X1:3:SENSE_P_2 + +4:YE + +X2:d10 + X1:18:SENSE_N_3 + +5:GY + +X2:z14 + X1:5:SENSE_P_3 + +6:PK + +X2:d16 + X1:20:SENSE_N_4 + +7:BU + +X2:z18 + X1:7:SENSE_P_4 + +8:RD + +X2:d20 + X1:22:SENSE_N_5 + +9:BK + +X2:z24 + X1:9:SENSE_P_5 + +10:VT + +X2:d26 + X1:24:SENSE_N_6 + +11:GYPK + +X2:z30 + X1:11:SENSE_P_6 + +12:RDBU + +X2:d32 +  + X1:13:GND + +Shield + + +  X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -F48 - -female - -48-pin - -z2 - -b2 - -d2 - -z4 - -b4 - -d4 - -z6 - -b6 - -d6 - -z8 - -b8 - -d8 - -z10 - -b10 - -d10 - -z12 - -b12 - -d12 - -z14 - -b14 - -d14 - -z16 - -b16 - -d16 - -z18 - -b18 - -d18 - -z20 - -b20 - -d20 - -z22 - -b22 - -d22 - -z24 - -b24 - -d24 - -z26 - -b26 - -d26 - -z28 - -b28 - -d28 - -z30 - -b30 - -d30 - -z32 - -b32 - -d32 + + + +X2 + +F48 + +female + +48-pin + +z2 + +b2 + +d2 + +z4 + +b4 + +d4 + +z6 + +b6 + +d6 + +z8 + +b8 + +d8 + +z10 + +b10 + +d10 + +z12 + +b12 + +d12 + +z14 + +b14 + +d14 + +z16 + +b16 + +d16 + +z18 + +b18 + +d18 + +z20 + +b20 + +d20 + +z22 + +b22 + +d22 + +z24 + +b24 + +d24 + +z26 + +b26 + +d26 + +z28 + +b28 + +d28 + +z30 + +b30 + +d30 + +z32 + +b32 + +d32 - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex09.png b/examples/ex09.png index 66c1496..5d8e623 100644 Binary files a/examples/ex09.png and b/examples/ex09.png differ diff --git a/examples/ex09.svg b/examples/ex09.svg index afe271e..0008ebb 100644 --- a/examples/ex09.svg +++ b/examples/ex09.svg @@ -1,554 +1,606 @@ - - - - + + + X1 - - - -X1 - -D-Sub - -male - -25-pin - -SENSE_P_1 - -1 - -SENSE_N_1 - -14 - -SENSE_P_2 - -3 - -SENSE_N_2 - -16 - -SENSE_P_3 - -5 - -SENSE_N_3 - -18 - -SENSE_P_4 - -7 - -SENSE_N_4 - -20 - -SENSE_P_5 - -9 - -SENSE_N_5 - -22 - -SENSE_P_6 - -11 - -SENSE_N_6 - -24 - -GND - -13 + + + +X1 + +D-Sub + +male + +25-pin + +SENSE_P_1 + +1 + +SENSE_N_1 + +14 + +SENSE_P_2 + +3 + +SENSE_N_2 + +16 + +SENSE_P_3 + +5 + +SENSE_N_3 + +18 + +SENSE_P_4 + +7 + +SENSE_N_4 + +20 + +SENSE_P_5 + +9 + +SENSE_N_5 + +22 + +SENSE_P_6 + +11 + +SENSE_N_6 + +24 + +GND + +13 - + W1 - - - -W1 - -12x - -0.25 mm² - -+ S - -0.2 m -  - X1:14:SENSE_N_1 - -1:WH - -X2:z2 - - - - - - X1:1:SENSE_P_1 - -2:BN - -X2:d4 - - - - - - X1:16:SENSE_N_2 - -3:GN - -X2:z8 - - - - - - X1:3:SENSE_P_2 - -4:YE - -X2:d10 - - - - - - X1:18:SENSE_N_3 - -5:GY - -X2:z14 - - - - - - X1:5:SENSE_P_3 - -6:PK - -X2:d16 - - - - - - X1:20:SENSE_N_4 - -7:BU - -X2:z18 - - - - - - X1:7:SENSE_P_4 - -8:RD - -X2:d20 - - - - - - X1:22:SENSE_N_5 - -9:BK - -X2:z24 - - - - - - X1:9:SENSE_P_5 - -10:VT - -X2:d26 - - - - - - X1:24:SENSE_N_6 - -11:GYPK - -X2:z30 - - - - - - X1:11:SENSE_P_6 - -12:RDBU - -X2:d32 - - - - - -  - X1:13:GND - -Shield - - - -  + + + +W1 + +12x + +0.25 mm² + ++ S + +0.2 m +  + X1:14:SENSE_N_1 + +1:WH + +X2:z2 + X1:1:SENSE_P_1 + +2:BN + +X2:d4 + X1:16:SENSE_N_2 + +3:GN + +X2:z8 + X1:3:SENSE_P_2 + +4:YE + +X2:d10 + X1:18:SENSE_N_3 + +5:GY + +X2:z14 + X1:5:SENSE_P_3 + +6:PK + +X2:d16 + X1:20:SENSE_N_4 + +7:BU + +X2:z18 + X1:7:SENSE_P_4 + +8:RD + +X2:d20 + X1:22:SENSE_N_5 + +9:BK + +X2:z24 + X1:9:SENSE_P_5 + +10:VT + +X2:d26 + X1:24:SENSE_N_6 + +11:GYPK + +X2:z30 + X1:11:SENSE_P_6 + +12:RDBU + +X2:d32 +  + X1:13:GND + +Shield + + +  X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -F48 - -female - -48-pin - -z2 - -b2 - -d2 - -z4 - -b4 - -d4 - -z6 - -b6 - -d6 - -z8 - -b8 - -d8 - -z10 - -b10 - -d10 - -z12 - -b12 - -d12 - -z14 - -b14 - -d14 - -z16 - -b16 - -d16 - -z18 - -b18 - -d18 - -z20 - -b20 - -d20 - -z22 - -b22 - -d22 - -z24 - -b24 - -d24 - -z26 - -b26 - -d26 - -z28 - -b28 - -d28 - -z30 - -b30 - -d30 - -z32 - -b32 - -d32 + + + +X2 + +F48 + +female + +48-pin + +z2 + +b2 + +d2 + +z4 + +b4 + +d4 + +z6 + +b6 + +d6 + +z8 + +b8 + +d8 + +z10 + +b10 + +d10 + +z12 + +b12 + +d12 + +z14 + +b14 + +d14 + +z16 + +b16 + +d16 + +z18 + +b18 + +d18 + +z20 + +b20 + +d20 + +z22 + +b22 + +d22 + +z24 + +b24 + +d24 + +z26 + +b26 + +d26 + +z28 + +b28 + +d28 + +z30 + +b30 + +d30 + +z32 + +b32 + +d32 - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex09_wv_gvpr.gvpr b/examples/ex09_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex09_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex10.gv b/examples/ex10.gv index 3f7542f..602af91 100644 --- a/examples/ex10.gv +++ b/examples/ex10.gv @@ -165,25 +165,7 @@ graph { X2:3:DA+
- -
- - - - - - - - - - - - - - - -
- + X1:2:DA- @@ -193,25 +175,7 @@ graph { X2:6:DA- - - - - - - - - - - - - - - - - - -
- + X1:3:DB+ @@ -221,25 +185,7 @@ graph { X2:1:DB+ - - - - - - - - - - - - - - - - - -
- + X1:4:DC+ @@ -249,25 +195,7 @@ graph { X2:7:DC+ - - - - - - - - - - - - - - - - - -
- + X1:5:DC- @@ -277,25 +205,7 @@ graph { X2:8:DC- - - - - - - - - - - - - - - - - - -
- + X1:6:DB- @@ -305,25 +215,7 @@ graph { X2:2:DB- - - - - - - - - - - - - - - - - - -
- + X1:7:DD+ @@ -333,25 +225,7 @@ graph { X2:4:DD+ - - - - - - - - - - - - - - - - - -
- + X1:8:DD- @@ -361,25 +235,7 @@ graph { X2:5:DD- - - - - - - - - - - - - - - - - - -
- +   @@ -413,4 +269,12 @@ graph { edge [color="#000000:#895956:#895956:#895956:#000000"] X1:p8r:e -- W1:w8:w W1:w8:e -- X2:p5l:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFFFF:#00AA00:#FFFFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#00AA00:#00AA00:#00AA00:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FFFFFF:#FF8000:#FFFFFF:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#0066FF:#0066FF:#0066FF:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000:#FFFFFF:#0066FF:#FFFFFF:#000000" straight=straight] + W1:w6:e -- W1:w6:w [color="#000000:#FF8000:#FF8000:#FF8000:#000000" straight=straight] + W1:w7:e -- W1:w7:w [color="#000000:#FFFFFF:#895956:#FFFFFF:#000000" straight=straight] + W1:w8:e -- W1:w8:w [color="#000000:#895956:#895956:#895956:#000000" straight=straight] } diff --git a/examples/ex10.html b/examples/ex10.html index 2eaa9e1..ccee404 100644 --- a/examples/ex10.html +++ b/examples/ex10.html @@ -30,346 +30,378 @@
- - - - + + + X1 - - - -X1 - -Stewart Connector SS-37000-002 - -male - -8-pin - -DA+ - -1 - -DA- - -2 - -DB+ - -3 - -DC+ - -4 - -DC- - -5 - -DB- - -6 - -DD+ - -7 - -DD- - -8 + + + +X1 + +Stewart Connector SS-37000-002 + +male + +8-pin + +DA+ + +1 + +DA- + +2 + +DB+ + +3 + +DC+ + +4 + +DC- + +5 + +DB- + +6 + +DD+ + +7 + +DD- + +8 - + W1 - - - -W1 - -CAT5e - -8x - -24 AWG - -1 m -  - X1:1:DA+ - -1:WHGN - -X2:3:DA+ - - - - - - X1:2:DA- - -2:GN - -X2:6:DA- - - - - - - X1:3:DB+ - -3:WHOG - -X2:1:DB+ - - - - - - X1:4:DC+ - -4:BU - -X2:7:DC+ - - - - - - X1:5:DC- - -5:WHBU - -X2:8:DC- - - - - - - X1:6:DB- - -6:OG - -X2:2:DB- - - - - - - X1:7:DD+ - -7:WHBN - -X2:4:DD+ - - - - - - X1:8:DD- - -8:BN - -X2:5:DD- - - - - - -  + + + +W1 + +CAT5e + +8x + +24 AWG + +1 m +  + X1:1:DA+ + +1:WHGN + +X2:3:DA+ + X1:2:DA- + +2:GN + +X2:6:DA- + X1:3:DB+ + +3:WHOG + +X2:1:DB+ + X1:4:DC+ + +4:BU + +X2:7:DC+ + X1:5:DC- + +5:WHBU + +X2:8:DC- + X1:6:DB- + +6:OG + +X2:2:DB- + X1:7:DD+ + +7:WHBN + +X2:4:DD+ + X1:8:DD- + +8:BN + +X2:5:DD- +  X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + +X1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + - + X2 - - - -X2 - -Stewart Connector SS-37000-002 - -male - -8-pin - -1 - -DB+ - -2 - -DB- - -3 - -DA+ - -4 - -DD+ - -5 - -DD- - -6 - -DA- - -7 - -DC+ - -8 - -DC- + + + +X2 + +Stewart Connector SS-37000-002 + +male + +8-pin + +1 + +DB+ + +2 + +DB- + +3 + +DA+ + +4 + +DD+ + +5 + +DD- + +6 + +DA- + +7 + +DC+ + +8 + +DC- - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex10.png b/examples/ex10.png index 0942d52..7333e4d 100644 Binary files a/examples/ex10.png and b/examples/ex10.png differ diff --git a/examples/ex10.svg b/examples/ex10.svg index 32b0969..662f8ea 100644 --- a/examples/ex10.svg +++ b/examples/ex10.svg @@ -1,346 +1,378 @@ - - - - + + + X1 - - - -X1 - -Stewart Connector SS-37000-002 - -male - -8-pin - -DA+ - -1 - -DA- - -2 - -DB+ - -3 - -DC+ - -4 - -DC- - -5 - -DB- - -6 - -DD+ - -7 - -DD- - -8 + + + +X1 + +Stewart Connector SS-37000-002 + +male + +8-pin + +DA+ + +1 + +DA- + +2 + +DB+ + +3 + +DC+ + +4 + +DC- + +5 + +DB- + +6 + +DD+ + +7 + +DD- + +8 - + W1 - - - -W1 - -CAT5e - -8x - -24 AWG - -1 m -  - X1:1:DA+ - -1:WHGN - -X2:3:DA+ - - - - - - X1:2:DA- - -2:GN - -X2:6:DA- - - - - - - X1:3:DB+ - -3:WHOG - -X2:1:DB+ - - - - - - X1:4:DC+ - -4:BU - -X2:7:DC+ - - - - - - X1:5:DC- - -5:WHBU - -X2:8:DC- - - - - - - X1:6:DB- - -6:OG - -X2:2:DB- - - - - - - X1:7:DD+ - -7:WHBN - -X2:4:DD+ - - - - - - X1:8:DD- - -8:BN - -X2:5:DD- - - - - - -  + + + +W1 + +CAT5e + +8x + +24 AWG + +1 m +  + X1:1:DA+ + +1:WHGN + +X2:3:DA+ + X1:2:DA- + +2:GN + +X2:6:DA- + X1:3:DB+ + +3:WHOG + +X2:1:DB+ + X1:4:DC+ + +4:BU + +X2:7:DC+ + X1:5:DC- + +5:WHBU + +X2:8:DC- + X1:6:DB- + +6:OG + +X2:2:DB- + X1:7:DD+ + +7:WHBN + +X2:4:DD+ + X1:8:DD- + +8:BN + +X2:5:DD- +  X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + + + +X1:e--W1:w + + + + + X1:e--W1:w - - - - - + + + + + + +X1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + - + + +W1:e--W1:w + + + + + + + -X1:e--W1:w - - - - - +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + - + X2 - - - -X2 - -Stewart Connector SS-37000-002 - -male - -8-pin - -1 - -DB+ - -2 - -DB- - -3 - -DA+ - -4 - -DD+ - -5 - -DD- - -6 - -DA- - -7 - -DC+ - -8 - -DC- + + + +X2 + +Stewart Connector SS-37000-002 + +male + +8-pin + +1 + +DB+ + +2 + +DB- + +3 + +DA+ + +4 + +DD+ + +5 + +DD- + +6 + +DA- + +7 + +DC+ + +8 + +DC- - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + - + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex10_wv_gvpr.gvpr b/examples/ex10_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex10_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex11.gv b/examples/ex11.gv index 24d4058..fcee36b 100644 --- a/examples/ex11.gv +++ b/examples/ex11.gv @@ -148,19 +148,7 @@ graph {
- -
- - - - - - - - - -
- + @@ -170,19 +158,7 @@ graph { - - - - - - - - - - - -
- + @@ -192,19 +168,7 @@ graph { - - - - - - - - - - - -
- + @@ -214,19 +178,7 @@ graph { - - - - - - - - - - - -
- +   @@ -244,6 +196,10 @@ graph { W1:w3:e -- AUTOGENERATED_F_3:w edge [color="#000000:#895956:#000000"] W1:w4:e -- AUTOGENERATED_F_4:w + W1:w1:e -- W1:w1:w [color="#000000:#000000:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FFFFFF:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#0066FF:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#895956:#000000" straight=straight] edge [color="#000000" dir=forward style=dashed] AUTOGENERATED_F_1:p1r:e -- X1:p1l:w edge [color="#000000" dir=forward style=dashed] diff --git a/examples/ex11.html b/examples/ex11.html index d300b64..0cf591d 100644 --- a/examples/ex11.html +++ b/examples/ex11.html @@ -30,194 +30,210 @@
- - - - + + + AUTOGENERATED_F_1 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + X1 - - - -X1 - -Screw connector - -male - -4-pin - -GN - - - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + + +X1 + +Screw connector + +male + +4-pin + +GN + + + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + AUTOGENERATED_F_1:e--X1:w - - + + - + AUTOGENERATED_F_2 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + AUTOGENERATED_F_2:e--X1:w - - + + - + AUTOGENERATED_F_3 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + AUTOGENERATED_F_3:e--X1:w - - + + - + AUTOGENERATED_F_4 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + AUTOGENERATED_F_4:e--X1:w - - + + W1 - - - -W1 - -4x - -BK - - -  - - -1:BK - - - - - - - -2:WH - - - - - - - -3:BU - - - - - - - -4:BN - - - - - -  + + + +W1 + +4x + +BK + + +  + + +1:BK + + + + +2:WH + + + + +3:BU + + + + +4:BN + + +  - + W1:e--AUTOGENERATED_F_1:w - - - + + + - + W1:e--AUTOGENERATED_F_2:w - - - + + + - + W1:e--AUTOGENERATED_F_3:w - - - + + + - + W1:e--AUTOGENERATED_F_4:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + diff --git a/examples/ex11.png b/examples/ex11.png index da001c8..a42bc3b 100644 Binary files a/examples/ex11.png and b/examples/ex11.png differ diff --git a/examples/ex11.svg b/examples/ex11.svg index 578c676..0038aa8 100644 --- a/examples/ex11.svg +++ b/examples/ex11.svg @@ -1,194 +1,210 @@ - - - - + + + AUTOGENERATED_F_1 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + X1 - - - -X1 - -Screw connector - -male - -4-pin - -GN - - - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + + +X1 + +Screw connector + +male + +4-pin + +GN + + + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + AUTOGENERATED_F_1:e--X1:w - - + + - + AUTOGENERATED_F_2 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + AUTOGENERATED_F_2:e--X1:w - - + + - + AUTOGENERATED_F_3 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + AUTOGENERATED_F_3:e--X1:w - - + + - + AUTOGENERATED_F_4 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + - + AUTOGENERATED_F_4:e--X1:w - - + + W1 - - - -W1 - -4x - -BK - - -  - - -1:BK - - - - - - - -2:WH - - - - - - - -3:BU - - - - - - - -4:BN - - - - - -  + + + +W1 + +4x + +BK + + +  + + +1:BK + + + + +2:WH + + + + +3:BU + + + + +4:BN + + +  - + W1:e--AUTOGENERATED_F_1:w - - - + + + - + W1:e--AUTOGENERATED_F_2:w - - - + + + - + W1:e--AUTOGENERATED_F_3:w - - - + + + - + W1:e--AUTOGENERATED_F_4:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + diff --git a/examples/ex11_wv_gvpr.gvpr b/examples/ex11_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex11_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex12.gv b/examples/ex12.gv index 82bc149..a507970 100644 --- a/examples/ex12.gv +++ b/examples/ex12.gv @@ -144,19 +144,7 @@ graph { X1:1
- -
- - - - - - - - - -
- + @@ -167,19 +155,7 @@ graph { X1:2 - - - - - - - - - - - -
- + @@ -190,19 +166,7 @@ graph { X1:3 - - - - - - - - - - - -
- + @@ -213,19 +177,7 @@ graph { X1:4 - - - - - - - - - - - -
- +   @@ -243,6 +195,10 @@ graph { W1:w3:e -- X1:p3l:w edge [color="#000000:#00AA00:#000000"] W1:w4:e -- X1:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#000000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#0066FF:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#00AA00:#000000" straight=straight] W2 [label=< @@ -279,19 +235,7 @@ graph { - + @@ -302,19 +246,7 @@ graph { - + @@ -325,19 +257,7 @@ graph { - + @@ -348,19 +268,7 @@ graph { - + @@ -378,6 +286,10 @@ graph { X2:p3r:e -- W2:w3:w edge [color="#000000:#00AA00:#000000"] X2:p4r:e -- W2:w4:w + W2:w1:e -- W2:w1:w [color="#000000:#FF0000:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#000000:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#0066FF:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#00AA00:#000000" straight=straight] edge [color="#000000" dir=forward style=dashed] X1:e -- X2:w } diff --git a/examples/ex12.html b/examples/ex12.html index 5d6685c..02cb025 100644 --- a/examples/ex12.html +++ b/examples/ex12.html @@ -30,222 +30,254 @@
- - - - + + + X1 - - - -X1 - -Dupont 2.54mm - -male - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + + +X1 + +Dupont 2.54mm + +male + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 X2 - - - -X2 - -Dupont 2.54mm - -female - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + + +X2 + +Dupont 2.54mm + +female + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 - + X1:e--X2:w - - + + - + W2 - - - -W2 - -4x - -0.2 m -  - X2:1 - -RD - - - - - - X2:2 - -BK - - - - - - X2:3 - -BU - - - - - - X2:4 - -GN - - - - - -  + + + +W2 + +4x + +0.2 m +  + X2:1 + +RD + + + X2:2 + +BK + + + X2:3 + +BU + + + X2:4 + +GN + + +  + + + +X2:e--W2:w + + + + + + +X2:e--W2:w + + + + + + +X2:e--W2:w + + + X2:e--W2:w - - - + + + - + -X2:e--W2:w - - - +W2:e--W2:w + + + - + -X2:e--W2:w - - - +W2:e--W2:w + + + - + -X2:e--W2:w - - - +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + W1 - - - -W1 - -4x - -0.2 m -  - - -RD - -X1:1 - - - - - -BK - -X1:2 - - - - - -BU - -X1:3 - - - - - -GN - -X1:4 - - - -  + + + +W1 + +4x + +0.2 m +  + + +RD + +X1:1 + + +BK + +X1:2 + + +BU + +X1:3 + + +GN + +X1:4 +  - + W1:e--X1:w - - - + + + - + W1:e--X1:w - - - + + + - + W1:e--X1:w - - - + + + - + W1:e--X1:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + diff --git a/examples/ex12.png b/examples/ex12.png index f4a6983..c7fedac 100644 Binary files a/examples/ex12.png and b/examples/ex12.png differ diff --git a/examples/ex12.svg b/examples/ex12.svg index f2c59a1..17acded 100644 --- a/examples/ex12.svg +++ b/examples/ex12.svg @@ -1,222 +1,254 @@ - - - - + + + X1 - - - -X1 - -Dupont 2.54mm - -male - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + + +X1 + +Dupont 2.54mm + +male + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 X2 - - - -X2 - -Dupont 2.54mm - -female - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + + +X2 + +Dupont 2.54mm + +female + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 - + X1:e--X2:w - - + + - + W2 - - - -W2 - -4x - -0.2 m -  - X2:1 - -RD - - - - - - X2:2 - -BK - - - - - - X2:3 - -BU - - - - - - X2:4 - -GN - - - - - -  + + + +W2 + +4x + +0.2 m +  + X2:1 + +RD + + + X2:2 + +BK + + + X2:3 + +BU + + + X2:4 + +GN + + +  + + + +X2:e--W2:w + + + + + + +X2:e--W2:w + + + + + + +X2:e--W2:w + + + X2:e--W2:w - - - + + + - + -X2:e--W2:w - - - +W2:e--W2:w + + + - + -X2:e--W2:w - - - +W2:e--W2:w + + + - + -X2:e--W2:w - - - +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + W1 - - - -W1 - -4x - -0.2 m -  - - -RD - -X1:1 - - - - - -BK - -X1:2 - - - - - -BU - -X1:3 - - - - - -GN - -X1:4 - - - -  + + + +W1 + +4x + +0.2 m +  + + +RD + +X1:1 + + +BK + +X1:2 + + +BU + +X1:3 + + +GN + +X1:4 +  - + W1:e--X1:w - - - + + + - + W1:e--X1:w - - - + + + - + W1:e--X1:w - - - + + + - + W1:e--X1:w - - - + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + diff --git a/examples/ex12_wv_gvpr.gvpr b/examples/ex12_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex12_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex13.gv b/examples/ex13.gv index ccc85bf..137812b 100644 --- a/examples/ex13.gv +++ b/examples/ex13.gv @@ -222,19 +222,7 @@ graph { F1
- + @@ -244,19 +232,7 @@ graph { - + @@ -266,19 +242,7 @@ graph { - + @@ -288,19 +252,7 @@ graph { - + @@ -322,6 +274,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] X1:p4r:e -- C1:w4:w C1:w4:e -- F4:w + C1:w1:e -- C1:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + C1:w2:e -- C1:w2:w [color="#000000:#895956:#000000" straight=straight] + C1:w3:e -- C1:w3:w [color="#000000:#00AA00:#000000" straight=straight] + C1:w4:e -- C1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] C2 [label=<
- - - - - - - - - - -
-
X2:2
- - - - - - - - - - -
-
X2:3
- - - - - - - - - - -
-
X2:4
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2:BF2
- - - - - - - - - - -
-
X1:3:CF3
- - - - - - - - - - -
-
X1:4:DF4
- - - - - - - - - - -
-
 
@@ -356,19 +312,7 @@ graph { - + @@ -378,19 +322,7 @@ graph { - + @@ -400,19 +332,7 @@ graph { - + @@ -422,19 +342,7 @@ graph { - + @@ -456,6 +364,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] F4:e -- C2:w4:w C2:w4:e -- X2:p4l:w + C2:w1:e -- C2:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + C2:w2:e -- C2:w2:w [color="#000000:#895956:#000000" straight=straight] + C2:w3:e -- C2:w3:w [color="#000000:#00AA00:#000000" straight=straight] + C2:w4:e -- C2:w4:w [color="#000000:#FFFF00:#000000" straight=straight] C3 [label=<
X2:1:A
- - - - - - - - - - -
-
F2X2:2:B
- - - - - - - - - - -
-
F3X2:3:C
- - - - - - - - - - -
-
F4X2:4:D
- - - - - - - - - - -
-
 
@@ -490,19 +402,7 @@ graph { - + @@ -512,19 +412,7 @@ graph { - + @@ -534,19 +422,7 @@ graph { - + @@ -556,19 +432,7 @@ graph { - + @@ -590,4 +454,8 @@ graph { edge [color="#000000:#FFFF00:#000000"] F4:e -- C3:w4:w C3:w4:e -- X3:p4l:w + C3:w1:e -- C3:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + C3:w2:e -- C3:w2:w [color="#000000:#895956:#000000" straight=straight] + C3:w3:e -- C3:w3:w [color="#000000:#00AA00:#000000" straight=straight] + C3:w4:e -- C3:w4:w [color="#000000:#FFFF00:#000000" straight=straight] } diff --git a/examples/ex13.html b/examples/ex13.html index 18d4bb3..5242444 100644 --- a/examples/ex13.html +++ b/examples/ex13.html @@ -30,422 +30,470 @@
- - - - + + + X1 - - - -X1 - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + + +X1 + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 - + C1 - - - -C1 - -4x -  - X1:1:A - -1:WH - -F1 - - - - X1:2:B - -2:BN - -F2 - - - - X1:3:C - -3:GN - -F3 - - - - X1:4:D - -4:YE - -F4 - - - -  + + + +C1 + +4x +  + X1:1:A + +1:WH + +F1 + X1:2:B + +2:BN + +F2 + X1:3:C + +3:GN + +F3 + X1:4:D + +4:YE + +F4 +  X1:e--C1:w - - - + + + + + + +X1:e--C1:w + + + X1:e--C1:w - - - + + + + +X1:e--C1:w + + + + + -X1:e--C1:w - - - +C1:e--C1:w + + + - + + +C1:e--C1:w + + + + + -X1:e--C1:w - - - +C1:e--C1:w + + + + + + +C1:e--C1:w + + + - -F1 - - - -ferrule - - - -C2 - - - -C2 - -4x -  - F1 - -1:WH - -X2:1:A - - - - F2 - -2:BN - -X2:2:B - - - - F3 - -3:GN - -X2:3:C - - - - F4 - -4:YE - -X2:4:D - - - -  - - - -F1:e--C2:w - - - - - - -C3 - - - -C3 - -4x -  - F1 - -1:WH - -X3:1:A - - - - F2 - -2:BN - -X3:2:B - - - - F3 - -3:GN - -X3:3:C - - - - F4 - -4:YE - -X3:4:D - - - -  - - - -F1:e--C3:w - - - - - -F2 - - - -ferrule - - - -F2:e--C2:w - - - - - - -F2:e--C3:w - - - - - - -F3 - - - -ferrule - - - -F3:e--C2:w - - - - - - -F3:e--C3:w - - - - - - -F4 - - - -ferrule - - - -F4:e--C2:w - - - - - - -F4:e--C3:w - - - - - - -X2 - - - -X2 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D - - - -X3 - - - -X3 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D +F1 + + + +ferrule - + C1:e--F1:w - - - + + + + + + +F2 + + + +ferrule - + C1:e--F2:w - - - + + + + + + +F3 + + + +ferrule - + C1:e--F3:w - - - + + + + + + +F4 + + + +ferrule - -C1:e--F4:w - - - - - - -C2:e--X2:w - - - - - -C2:e--X2:w - - - +C1:e--F4:w + + + - + + +C2 + + + +C2 + +4x +  + F1 + +1:WH + +X2:1:A + F2 + +2:BN + +X2:2:B + F3 + +3:GN + +X2:3:C + F4 + +4:YE + +X2:4:D +  + + + +F1:e--C2:w + + + + + + +C3 + + + +C3 + +4x +  + F1 + +1:WH + +X3:1:A + F2 + +2:BN + +X3:2:B + F3 + +3:GN + +X3:3:C + F4 + +4:YE + +X3:4:D +  + + -C2:e--X2:w - - - +F1:e--C3:w + + + + + + +F2:e--C2:w + + + + + + +F2:e--C3:w + + + + + + +F3:e--C2:w + + + + + + +F3:e--C3:w + + + + + + +F4:e--C2:w + + + + + + +F4:e--C3:w + + + + + + +C2:e--C2:w + + + + + + +C2:e--C2:w + + + + + + +C2:e--C2:w + + + + + + +C2:e--C2:w + + + + + + +X2 + + + +X2 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + C2:e--X2:w - - - + + + - - -C3:e--X3:w - - - - - + -C3:e--X3:w - - - +C2:e--X2:w + + + - + + +C2:e--X2:w + + + + + -C3:e--X3:w - - - +C2:e--X2:w + + + + + + +C3:e--C3:w + + + + + + +C3:e--C3:w + + + + + + +C3:e--C3:w + + + + + + +C3:e--C3:w + + + + + + +X3 + + + +X3 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + C3:e--X3:w - - - + + + + + + +C3:e--X3:w + + + + + + +C3:e--X3:w + + + + + + +C3:e--X3:w + + + diff --git a/examples/ex13.png b/examples/ex13.png index 967689d..61a4782 100644 Binary files a/examples/ex13.png and b/examples/ex13.png differ diff --git a/examples/ex13.svg b/examples/ex13.svg index ce7294b..222d6e3 100644 --- a/examples/ex13.svg +++ b/examples/ex13.svg @@ -1,422 +1,470 @@ - - - - + + + X1 - - - -X1 - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + + +X1 + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 - + C1 - - - -C1 - -4x -  - X1:1:A - -1:WH - -F1 - - - - X1:2:B - -2:BN - -F2 - - - - X1:3:C - -3:GN - -F3 - - - - X1:4:D - -4:YE - -F4 - - - -  + + + +C1 + +4x +  + X1:1:A + +1:WH + +F1 + X1:2:B + +2:BN + +F2 + X1:3:C + +3:GN + +F3 + X1:4:D + +4:YE + +F4 +  X1:e--C1:w - - - + + + + + + +X1:e--C1:w + + + X1:e--C1:w - - - + + + + +X1:e--C1:w + + + + + -X1:e--C1:w - - - +C1:e--C1:w + + + - + + +C1:e--C1:w + + + + + -X1:e--C1:w - - - +C1:e--C1:w + + + + + + +C1:e--C1:w + + + - -F1 - - - -ferrule - - - -C2 - - - -C2 - -4x -  - F1 - -1:WH - -X2:1:A - - - - F2 - -2:BN - -X2:2:B - - - - F3 - -3:GN - -X2:3:C - - - - F4 - -4:YE - -X2:4:D - - - -  - - - -F1:e--C2:w - - - - - - -C3 - - - -C3 - -4x -  - F1 - -1:WH - -X3:1:A - - - - F2 - -2:BN - -X3:2:B - - - - F3 - -3:GN - -X3:3:C - - - - F4 - -4:YE - -X3:4:D - - - -  - - - -F1:e--C3:w - - - - - -F2 - - - -ferrule - - - -F2:e--C2:w - - - - - - -F2:e--C3:w - - - - - - -F3 - - - -ferrule - - - -F3:e--C2:w - - - - - - -F3:e--C3:w - - - - - - -F4 - - - -ferrule - - - -F4:e--C2:w - - - - - - -F4:e--C3:w - - - - - - -X2 - - - -X2 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D - - - -X3 - - - -X3 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D +F1 + + + +ferrule - + C1:e--F1:w - - - + + + + + + +F2 + + + +ferrule - + C1:e--F2:w - - - + + + + + + +F3 + + + +ferrule - + C1:e--F3:w - - - + + + + + + +F4 + + + +ferrule - -C1:e--F4:w - - - - - - -C2:e--X2:w - - - - - -C2:e--X2:w - - - +C1:e--F4:w + + + - + + +C2 + + + +C2 + +4x +  + F1 + +1:WH + +X2:1:A + F2 + +2:BN + +X2:2:B + F3 + +3:GN + +X2:3:C + F4 + +4:YE + +X2:4:D +  + + + +F1:e--C2:w + + + + + + +C3 + + + +C3 + +4x +  + F1 + +1:WH + +X3:1:A + F2 + +2:BN + +X3:2:B + F3 + +3:GN + +X3:3:C + F4 + +4:YE + +X3:4:D +  + + -C2:e--X2:w - - - +F1:e--C3:w + + + + + + +F2:e--C2:w + + + + + + +F2:e--C3:w + + + + + + +F3:e--C2:w + + + + + + +F3:e--C3:w + + + + + + +F4:e--C2:w + + + + + + +F4:e--C3:w + + + + + + +C2:e--C2:w + + + + + + +C2:e--C2:w + + + + + + +C2:e--C2:w + + + + + + +C2:e--C2:w + + + + + + +X2 + + + +X2 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + C2:e--X2:w - - - + + + - - -C3:e--X3:w - - - - - + -C3:e--X3:w - - - +C2:e--X2:w + + + - + + +C2:e--X2:w + + + + + -C3:e--X3:w - - - +C2:e--X2:w + + + + + + +C3:e--C3:w + + + + + + +C3:e--C3:w + + + + + + +C3:e--C3:w + + + + + + +C3:e--C3:w + + + + + + +X3 + + + +X3 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + C3:e--X3:w - - - + + + + + + +C3:e--X3:w + + + + + + +C3:e--X3:w + + + + + + +C3:e--X3:w + + + diff --git a/examples/ex13_wv_gvpr.gvpr b/examples/ex13_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex13_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex14.gv b/examples/ex14.gv index 17b3516..3028c81 100644 --- a/examples/ex14.gv +++ b/examples/ex14.gv @@ -404,19 +404,7 @@ graph {
- + @@ -426,19 +414,7 @@ graph { - + @@ -448,19 +424,7 @@ graph { - + @@ -470,19 +434,7 @@ graph { - + @@ -504,6 +456,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] X1:p1r:e -- W1:w4:w W1:w4:e -- AUTOGENERATED_S_3:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#895956:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] W2 [label=<
X3:1:A
- - - - - - - - - - -
-
F2X3:2:B
- - - - - - - - - - -
-
F3X3:3:C
- - - - - - - - - - -
-
F4X3:4:D
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:3:C
- - - - - - - - - - -
-
X1:2:BS1
- - - - - - - - - - -
-
X1:1:A
- - - - - - - - - - -
-
 
@@ -539,19 +495,7 @@ graph { - + @@ -561,19 +505,7 @@ graph { - + @@ -583,19 +515,7 @@ graph { - + @@ -605,19 +525,7 @@ graph { - + @@ -639,6 +547,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] AUTOGENERATED_S_3:e -- W2:w4:w W2:w4:e -- AUTOGENERATED_S_7:w + W2:w1:e -- W2:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#895956:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#FFFF00:#000000" straight=straight] W21 [label=<
- - - - - - - - - - -
-
- - - - - - - - - - -
-
S1
- - - - - - - - - - -
-
- - - - - - - - - - -
-
 
@@ -674,19 +586,7 @@ graph { - + @@ -696,19 +596,7 @@ graph { - + @@ -718,19 +606,7 @@ graph { - + @@ -740,19 +616,7 @@ graph { - + @@ -774,6 +638,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] AUTOGENERATED_S_7:e -- W21:w4:w W21:w4:e -- X2:p4l:w + W21:w1:e -- W21:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W21:w2:e -- W21:w2:w [color="#000000:#895956:#000000" straight=straight] + W21:w3:e -- W21:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W21:w4:e -- W21:w4:w [color="#000000:#FFFF00:#000000" straight=straight] W3 [label=<
X2:1:A
- - - - - - - - - - -
-
X2:2:B
- - - - - - - - - - -
-
X2:3:C
- - - - - - - - - - -
-
X2:4:D
- - - - - - - - - - -
-
 
@@ -809,19 +677,7 @@ graph { - + @@ -831,19 +687,7 @@ graph { - + @@ -853,19 +697,7 @@ graph { - + @@ -875,19 +707,7 @@ graph { - + @@ -909,6 +729,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] X3:p4r:e -- W3:w4:w W3:w4:e -- AUTOGENERATED_F_4:w + W3:w1:e -- W3:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W3:w2:e -- W3:w2:w [color="#000000:#895956:#000000" straight=straight] + W3:w3:e -- W3:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W3:w4:e -- W3:w4:w [color="#000000:#FFFF00:#000000" straight=straight] AUTOGENERATED_WIRE_1 [label=<
- - - - - - - - - - -
-
X3:2:B
- - - - - - - - - - -
-
X3:3:C
- - - - - - - - - - -
-
X3:4:D
- - - - - - - - - - -
-
 
@@ -935,19 +759,7 @@ graph { - + @@ -960,6 +772,7 @@ graph { edge [color="#000000:#000000:#000000"] S1:e -- AUTOGENERATED_WIRE_1:w1:w AUTOGENERATED_WIRE_1:w1:e -- X2:p4l:w + AUTOGENERATED_WIRE_1:w1:e -- AUTOGENERATED_WIRE_1:w1:w [color="#000000:#000000:#000000" straight=straight] edge [color="#000000" dir=both style=dashed] X2:e -- X3:w edge [color="#000000" dir=forward style=dashed] diff --git a/examples/ex14.html b/examples/ex14.html index 7b686fb..0bc708e 100644 --- a/examples/ex14.html +++ b/examples/ex14.html @@ -30,751 +30,819 @@
- - - - + + + X1 - - - -X1 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + + +X1 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 - + W1 - - - -W1 - -4x - -0.1 m -  - X1:4:D - -1:WH - - - - - - X1:3:C - -2:BN - - - - - - X1:2:B - -3:GN - -S1 - - - - X1:1:A - -4:YE - - - - - -  + + + +W1 + +4x + +0.1 m +  + X1:4:D + +1:WH + + + X1:3:C + +2:BN + + + X1:2:B + +3:GN + +S1 + X1:1:A + +4:YE + + +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - -AUTOGENERATED_S_1 - - - -Splice - -CU - - - - - -W2 - - - -W2 - -4x - -0.1 m -  - - -1:WH - - - - - - - -2:BN - - - - - - S1 - -3:GN - - - - - - - -4:YE - - - - - -  - - - -AUTOGENERATED_S_1:e--W2:w - - - - - -AUTOGENERATED_S_2 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_2:e--W2:w - - - - - - -S1 - - - -Splice - -CU - - - - - -S1:e--W2:w - - - - - - -AUTOGENERATED_WIRE_1 - - - -1x - -0.1 m -  - S1 - -1:BK - -X2:4:D - - - -  - - - -S1:e--AUTOGENERATED_WIRE_1:w - - - - - - -AUTOGENERATED_S_3 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_3:e--W2:w - - - - - - -AUTOGENERATED_S_4 - - - -Splice - -CU - - - - - -W21 - - - -W21 - -4x - -0.1 m -  - - -1:WH - -X2:1:A - - - - - -2:BN - -X2:2:B - - - - - -3:GN - -X2:3:C - - - - - -4:YE - -X2:4:D - - - -  - - - -AUTOGENERATED_S_4:e--W21:w - - - - - - -AUTOGENERATED_S_5 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_5:e--W21:w - - - - - - -AUTOGENERATED_S_6 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_6:e--W21:w - - - - - - -AUTOGENERATED_S_7 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_7:e--W21:w - - - - - - -X2 - - - -X2 - -JST SM - -female - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D - - - -X3 - - - -X3 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 - - - -X2:e--X3:w - - - - - - -W3 - - - -W3 - -4x - -0.1 m -  - X3:1:A - -1:WH - - - - - - X3:2:B - -2:BN - - - - - - X3:3:C - -3:GN - - - - - - X3:4:D - -4:YE - - - - - -  - - - -X3:e--W3:w - - - - - - -X3:e--W3:w - - - - - - -X3:e--W3:w - - - - - - -X3:e--W3:w - - - - - - -AUTOGENERATED_F_1 - - - -Ferrule - -GY - - - - - -X4 - - - -X4 - -Screw terminal connector - -4-pin - -GN - - - -1 - -W - -2 - -X - -3 - -Y - -4 - -Z - - - -AUTOGENERATED_F_1:e--X4:w - - - - - -AUTOGENERATED_F_2 - - - -Ferrule - -GY - - - - - -AUTOGENERATED_F_2:e--X4:w - - - - - -AUTOGENERATED_F_3 - - - -Ferrule - -GY - - - - - -AUTOGENERATED_F_3:e--X4:w - - - - - -AUTOGENERATED_F_4 - - - -Ferrule - -GY - - - - - -AUTOGENERATED_F_4:e--X4:w - - +AUTOGENERATED_S_1 + + + +Splice + +CU + + - + W1:e--AUTOGENERATED_S_1:w - - - + + + + + + +AUTOGENERATED_S_2 + + + +Splice + +CU + + - + W1:e--AUTOGENERATED_S_2:w - - - + + + + + + +S1 + + + +Splice + +CU + + - + W1:e--S1:w - - - + + + + + + +AUTOGENERATED_S_3 + + + +Splice + +CU + + - + W1:e--AUTOGENERATED_S_3:w - - - + + + + + + +W2 + + + +W2 + +4x + +0.1 m +  + + +1:WH + + + + +2:BN + + + S1 + +3:GN + + + + +4:YE + + +  + + + +AUTOGENERATED_S_1:e--W2:w + + + + + + +AUTOGENERATED_S_2:e--W2:w + + + + + + +S1:e--W2:w + + + + + + +AUTOGENERATED_WIRE_1 + + + +1x + +0.1 m +  + S1 + +1:BK + +X2:4:D +  + + + +S1:e--AUTOGENERATED_WIRE_1:w + + + + + + +AUTOGENERATED_S_3:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +AUTOGENERATED_S_4 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_4:w - - - + + + + + + +AUTOGENERATED_S_5 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_5:w - - - + + + + + + +AUTOGENERATED_S_6 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_6:w - - - + + + + + + +AUTOGENERATED_S_7 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_7:w - - - + + + - - -W21:e--X2:w - - - + + +W21 + + + +W21 + +4x + +0.1 m +  + + +1:WH + +X2:1:A + + +2:BN + +X2:2:B + + +3:GN + +X2:3:C + + +4:YE + +X2:4:D +  - - -W21:e--X2:w - - - - - - -W21:e--X2:w - - - - - - -W21:e--X2:w - - - - - - -W3:e--AUTOGENERATED_F_1:w - - - - - + -W3:e--AUTOGENERATED_F_2:w - - - +AUTOGENERATED_S_4:e--W21:w + + + - - -W3:e--AUTOGENERATED_F_3:w - - - + + +AUTOGENERATED_S_5:e--W21:w + + + - - -W3:e--AUTOGENERATED_F_4:w - - - + + +AUTOGENERATED_S_6:e--W21:w + + + + + + +AUTOGENERATED_S_7:e--W21:w + + + + + + +AUTOGENERATED_WIRE_1:e--AUTOGENERATED_WIRE_1:w + + + + + + +X2 + + + +X2 + +JST SM + +female + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + AUTOGENERATED_WIRE_1:e--X2:w - - - + + + + + + +X3 + + + +X3 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 + + + +X2:e--X3:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--W21:w + + + + + + +W21:e--W21:w + + + + + + +W21:e--W21:w + + + + + + +W21:e--W21:w + + + + + + +W3 + + + +W3 + +4x + +0.1 m +  + X3:1:A + +1:WH + + + X3:2:B + +2:BN + + + X3:3:C + +3:GN + + + X3:4:D + +4:YE + + +  + + + +X3:e--W3:w + + + + + + +X3:e--W3:w + + + + + + +X3:e--W3:w + + + + + + +X3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +AUTOGENERATED_F_1 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_1:w + + + + + + +AUTOGENERATED_F_2 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_2:w + + + + + + +AUTOGENERATED_F_3 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_3:w + + + + + + +AUTOGENERATED_F_4 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_4:w + + + + + + +X4 + + + +X4 + +Screw terminal connector + +4-pin + +GN + + + +1 + +W + +2 + +X + +3 + +Y + +4 + +Z + + + +AUTOGENERATED_F_1:e--X4:w + + + + + +AUTOGENERATED_F_2:e--X4:w + + + + + +AUTOGENERATED_F_3:e--X4:w + + + + + +AUTOGENERATED_F_4:e--X4:w + + diff --git a/examples/ex14.png b/examples/ex14.png index d50b3f6..08155fd 100644 Binary files a/examples/ex14.png and b/examples/ex14.png differ diff --git a/examples/ex14.svg b/examples/ex14.svg index c97d900..6fc4655 100644 --- a/examples/ex14.svg +++ b/examples/ex14.svg @@ -1,751 +1,819 @@ - - - - + + + X1 - - - -X1 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + + +X1 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 - + W1 - - - -W1 - -4x - -0.1 m -  - X1:4:D - -1:WH - - - - - - X1:3:C - -2:BN - - - - - - X1:2:B - -3:GN - -S1 - - - - X1:1:A - -4:YE - - - - - -  + + + +W1 + +4x + +0.1 m +  + X1:4:D + +1:WH + + + X1:3:C + +2:BN + + + X1:2:B + +3:GN + +S1 + X1:1:A + +4:YE + + +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - -AUTOGENERATED_S_1 - - - -Splice - -CU - - - - - -W2 - - - -W2 - -4x - -0.1 m -  - - -1:WH - - - - - - - -2:BN - - - - - - S1 - -3:GN - - - - - - - -4:YE - - - - - -  - - - -AUTOGENERATED_S_1:e--W2:w - - - - - -AUTOGENERATED_S_2 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_2:e--W2:w - - - - - - -S1 - - - -Splice - -CU - - - - - -S1:e--W2:w - - - - - - -AUTOGENERATED_WIRE_1 - - - -1x - -0.1 m -  - S1 - -1:BK - -X2:4:D - - - -  - - - -S1:e--AUTOGENERATED_WIRE_1:w - - - - - - -AUTOGENERATED_S_3 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_3:e--W2:w - - - - - - -AUTOGENERATED_S_4 - - - -Splice - -CU - - - - - -W21 - - - -W21 - -4x - -0.1 m -  - - -1:WH - -X2:1:A - - - - - -2:BN - -X2:2:B - - - - - -3:GN - -X2:3:C - - - - - -4:YE - -X2:4:D - - - -  - - - -AUTOGENERATED_S_4:e--W21:w - - - - - - -AUTOGENERATED_S_5 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_5:e--W21:w - - - - - - -AUTOGENERATED_S_6 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_6:e--W21:w - - - - - - -AUTOGENERATED_S_7 - - - -Splice - -CU - - - - - -AUTOGENERATED_S_7:e--W21:w - - - - - - -X2 - - - -X2 - -JST SM - -female - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D - - - -X3 - - - -X3 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 - - - -X2:e--X3:w - - - - - - -W3 - - - -W3 - -4x - -0.1 m -  - X3:1:A - -1:WH - - - - - - X3:2:B - -2:BN - - - - - - X3:3:C - -3:GN - - - - - - X3:4:D - -4:YE - - - - - -  - - - -X3:e--W3:w - - - - - - -X3:e--W3:w - - - - - - -X3:e--W3:w - - - - - - -X3:e--W3:w - - - - - - -AUTOGENERATED_F_1 - - - -Ferrule - -GY - - - - - -X4 - - - -X4 - -Screw terminal connector - -4-pin - -GN - - - -1 - -W - -2 - -X - -3 - -Y - -4 - -Z - - - -AUTOGENERATED_F_1:e--X4:w - - - - - -AUTOGENERATED_F_2 - - - -Ferrule - -GY - - - - - -AUTOGENERATED_F_2:e--X4:w - - - - - -AUTOGENERATED_F_3 - - - -Ferrule - -GY - - - - - -AUTOGENERATED_F_3:e--X4:w - - - - - -AUTOGENERATED_F_4 - - - -Ferrule - -GY - - - - - -AUTOGENERATED_F_4:e--X4:w - - +AUTOGENERATED_S_1 + + + +Splice + +CU + + - + W1:e--AUTOGENERATED_S_1:w - - - + + + + + + +AUTOGENERATED_S_2 + + + +Splice + +CU + + - + W1:e--AUTOGENERATED_S_2:w - - - + + + + + + +S1 + + + +Splice + +CU + + - + W1:e--S1:w - - - + + + + + + +AUTOGENERATED_S_3 + + + +Splice + +CU + + - + W1:e--AUTOGENERATED_S_3:w - - - + + + + + + +W2 + + + +W2 + +4x + +0.1 m +  + + +1:WH + + + + +2:BN + + + S1 + +3:GN + + + + +4:YE + + +  + + + +AUTOGENERATED_S_1:e--W2:w + + + + + + +AUTOGENERATED_S_2:e--W2:w + + + + + + +S1:e--W2:w + + + + + + +AUTOGENERATED_WIRE_1 + + + +1x + +0.1 m +  + S1 + +1:BK + +X2:4:D +  + + + +S1:e--AUTOGENERATED_WIRE_1:w + + + + + + +AUTOGENERATED_S_3:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +AUTOGENERATED_S_4 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_4:w - - - + + + + + + +AUTOGENERATED_S_5 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_5:w - - - + + + + + + +AUTOGENERATED_S_6 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_6:w - - - + + + + + + +AUTOGENERATED_S_7 + + + +Splice + +CU + + - + W2:e--AUTOGENERATED_S_7:w - - - + + + - - -W21:e--X2:w - - - + + +W21 + + + +W21 + +4x + +0.1 m +  + + +1:WH + +X2:1:A + + +2:BN + +X2:2:B + + +3:GN + +X2:3:C + + +4:YE + +X2:4:D +  - - -W21:e--X2:w - - - - - - -W21:e--X2:w - - - - - - -W21:e--X2:w - - - - - - -W3:e--AUTOGENERATED_F_1:w - - - - - + -W3:e--AUTOGENERATED_F_2:w - - - +AUTOGENERATED_S_4:e--W21:w + + + - - -W3:e--AUTOGENERATED_F_3:w - - - + + +AUTOGENERATED_S_5:e--W21:w + + + - - -W3:e--AUTOGENERATED_F_4:w - - - + + +AUTOGENERATED_S_6:e--W21:w + + + + + + +AUTOGENERATED_S_7:e--W21:w + + + + + + +AUTOGENERATED_WIRE_1:e--AUTOGENERATED_WIRE_1:w + + + + + + +X2 + + + +X2 + +JST SM + +female + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D - + AUTOGENERATED_WIRE_1:e--X2:w - - - + + + + + + +X3 + + + +X3 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 + + + +X2:e--X3:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--X2:w + + + + + + +W21:e--W21:w + + + + + + +W21:e--W21:w + + + + + + +W21:e--W21:w + + + + + + +W21:e--W21:w + + + + + + +W3 + + + +W3 + +4x + +0.1 m +  + X3:1:A + +1:WH + + + X3:2:B + +2:BN + + + X3:3:C + +3:GN + + + X3:4:D + +4:YE + + +  + + + +X3:e--W3:w + + + + + + +X3:e--W3:w + + + + + + +X3:e--W3:w + + + + + + +X3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +AUTOGENERATED_F_1 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_1:w + + + + + + +AUTOGENERATED_F_2 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_2:w + + + + + + +AUTOGENERATED_F_3 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_3:w + + + + + + +AUTOGENERATED_F_4 + + + +Ferrule + +GY + + + + + +W3:e--AUTOGENERATED_F_4:w + + + + + + +X4 + + + +X4 + +Screw terminal connector + +4-pin + +GN + + + +1 + +W + +2 + +X + +3 + +Y + +4 + +Z + + + +AUTOGENERATED_F_1:e--X4:w + + + + + +AUTOGENERATED_F_2:e--X4:w + + + + + +AUTOGENERATED_F_3:e--X4:w + + + + + +AUTOGENERATED_F_4:e--X4:w + + diff --git a/examples/ex14_wv_gvpr.gvpr b/examples/ex14_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex14_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex15.bom.tsv b/examples/ex15.bom.tsv new file mode 100644 index 0000000..53017cb --- /dev/null +++ b/examples/ex15.bom.tsv @@ -0,0 +1,5 @@ +# Qty Unit Description Designators Manufacturer MPN +1 2 Connector, Molex KK 254, female, 7 pins X1, X2 +2 1 m Cable, Serial, 4 x 0.25 mm² shielded W1 +3 42 mm shortPartA X1 WireViz 42XCD42A5 +4 1 shortPartB X1 WireViz 42XCD42A5 diff --git a/examples/ex15.gv b/examples/ex15.gv new file mode 100644 index 0000000..b1d7df4 --- /dev/null +++ b/examples/ex15.gv @@ -0,0 +1,297 @@ +graph { +// Graph generated by WireViz 0.5-dev+refactor +// https://github.com/wireviz/WireViz + graph [bgcolor="#FFFFFF" fontname=arial nodesep=0.33 rankdir=LR ranksep=2] + node [fillcolor="#FFFFFF" fontname=arial height=0 margin=0 shape=none style=filled width=0] + edge [fontname=arial style=bold] + X1 [label=< +
X2:4:D
- - - - - - - - - - -
-
 
+ + + + + + + + + + + + +
+ + + + +
X1
+
+ + + + + + +
Molex KK 254female7-pin
+
+ + + + + + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + + +
SH1SH2
GND1
VCC2
RX3
TX4
GND5
VCC6
GND7
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
42mmshortPartA
WireViz: 42XCD42A5
1xshortPartB
WireViz: 42XCD42A5
+
+> shape=box style=filled] + edge [color="#000000"] + X1:p1j:c -- X1:p5j:c [addPTS=.18 color="#FFFFFF:#FF66CC:#FFFFFF" colorPTS="#FF66CC:#FFFFFF" headclip=false straight=straight tailclip=false] + X1:p5j:c -- X1:p7j:c [addPTS=.18 color="#FFFFFF:#FF66CC:#FFFFFF" colorPTS="#FF66CC:#FFFFFF" headclip=false straight=straight tailclip=false] + X1:p2j:c -- X1:p6j:c [addPTS=.18 color="#FFFFFF:#FF0000:#FFFFFF" colorPTS="#FF0000:#FFFFFF" headclip=false straight=straight tailclip=false] + X2 [label=< + + + + + + + + + + +
+ + + + +
X2
+
+ + + + + + +
Molex KK 254female7-pin
+
+ + + + + + + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + + + + + [, ] + +
SH1SH2
1GND
2VCC
3RX
4TX
5GND
6VCC
7GND
+
+> shape=box style=filled] + edge [color="#000000"] + X2:p1j:c -- X2:p5j:c [addPTS=.18 color="#FFFFFF:#000000:#FFFFFF" colorPTS="#000000:#FFFFFF" headclip=false straight=straight tailclip=false] + X2:p5j:c -- X2:p7j:c [addPTS=.18 color="#FFFFFF:#000000:#FFFFFF" colorPTS="#000000:#FFFFFF" headclip=false straight=straight tailclip=false] + X2:p2j:c -- X2:p6j:c [addPTS=.18 color="#FFFFFF:#000000:#FFFFFF" colorPTS="#000000:#FFFFFF" headclip=false straight=straight tailclip=false] + W1 [label=< + + + + + + + + + + +
+ + + + +
W1
+
+ + + + + + + + +
Serial4x0.25 mm² (24 AWG)+ S0.2 m
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
X1:1:GND 1:BUWH X2:1:GND
X1:2:VCC 2:WHBU X2:2:VCC
X1:3:RX 3:OGWH X2:4:TX
X1:4:TX 4:WHOG X2:3:RX
 
X1:1:GND Shield
 
+
+> shape=box style=filled] + edge [color="#000000:#0066FF:#FFFFFF:#0066FF:#000000"] + X1:p1r:e -- W1:w1:w + W1:w1:e -- X2:p1l:w + edge [color="#000000:#FFFFFF:#0066FF:#FFFFFF:#000000"] + X1:p2r:e -- W1:w2:w + W1:w2:e -- X2:p2l:w + edge [color="#000000:#FF8000:#FFFFFF:#FF8000:#000000"] + X1:p3r:e -- W1:w3:w + W1:w3:e -- X2:p4l:w + edge [color="#000000:#FFFFFF:#FF8000:#FFFFFF:#000000"] + X1:p4r:e -- W1:w4:w + W1:w4:e -- X2:p3l:w + edge [color="#000000"] + X1:p1r:e -- W1:w5:w + W1:w1:e -- W1:w1:w [color="#000000:#0066FF:#FFFFFF:#0066FF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FFFFFF:#0066FF:#FFFFFF:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FF8000:#FFFFFF:#FF8000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFFFF:#FF8000:#FFFFFF:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000" straight=straight] +} diff --git a/examples/ex15.html b/examples/ex15.html new file mode 100644 index 0000000..c652c24 --- /dev/null +++ b/examples/ex15.html @@ -0,0 +1,501 @@ + + + + + ex15 + + +

ex15

+

Diagram

+ +
+ +
+ +
+ + + + + + + + +X1 + + + +X1 + +Molex KK 254 + +female + +7-pin + + +SH1 + +SH2 + + +GND + + + +1 + +VCC + + + +2 + +RX + + + +3 + +TX + + + +4 + +GND + + + +5 + +VCC + + + +6 + +GND + + + +7 +42 +mm +shortPartA +WireViz: 42XCD42A5 +1 +x +shortPartB +WireViz: 42XCD42A5 + + + + +X1:c--X1:c + + + + + + +X1:c--X1:c + + + + + + +X1:c--X1:c + + + + + + +W1 + + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  + X1:1:GND + +1:BUWH + +X2:1:GND + X1:2:VCC + +2:WHBU + +X2:2:VCC + X1:3:RX + +3:OGWH + +X2:4:TX + X1:4:TX + +4:WHOG + +X2:3:RX +  + X1:1:GND + +Shield + + +  + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + +X2 + + + +X2 + +Molex KK 254 + +female + +7-pin + + + +SH1 + +SH2 + +1 + +GND + + + +2 + +VCC + + + +3 + +RX + + + +4 + +TX + + + +5 + +GND + + + +6 + +VCC + + + +7 + +GND + + + + + +W1:e--X2:w + + + + + + + + +W1:e--X2:w + + + + + + + + +W1:e--X2:w + + + + + + + + +W1:e--X2:w + + + + + + + + +X2:c--X2:c + + + + + + +X2:c--X2:c + + + + + + +X2:c--X2:c + + + + + + +__CIRCLE__1 + + + + +__CIRCLE__2 + + + + +__CIRCLE__3 + + + + +__CIRCLE__4 + + + + +__CIRCLE__5 + + + + +__CIRCLE__6 + + + + +__CIRCLE__7 + + + + +__CIRCLE__8 + + + + +__CIRCLE__9 + + + + +__CIRCLE__10 + + + + +__CIRCLE__11 + + + + +__CIRCLE__12 + + + + + +
+ +
+ +
+ +

Bill of Materials

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#QtyUnitDescriptionDesignatorsManufacturerMPN
12Connector, Molex KK 254, female, 7 pinsX1, X2
21mCable, Serial, 4 x 0.25 mm² shieldedW1
342mmshortPartAX1WireViz42XCD42A5
41shortPartBX1WireViz42XCD42A5
+ +
+ + diff --git a/examples/ex15.png b/examples/ex15.png new file mode 100644 index 0000000..d60f197 Binary files /dev/null and b/examples/ex15.png differ diff --git a/examples/ex15.svg b/examples/ex15.svg new file mode 100644 index 0000000..21ba1e0 --- /dev/null +++ b/examples/ex15.svg @@ -0,0 +1,411 @@ + + + + + + + + + +X1 + + + +X1 + +Molex KK 254 + +female + +7-pin + + +SH1 + +SH2 + + +GND + + + +1 + +VCC + + + +2 + +RX + + + +3 + +TX + + + +4 + +GND + + + +5 + +VCC + + + +6 + +GND + + + +7 +42 +mm +shortPartA +WireViz: 42XCD42A5 +1 +x +shortPartB +WireViz: 42XCD42A5 + + + + +X1:c--X1:c + + + + + + +X1:c--X1:c + + + + + + +X1:c--X1:c + + + + + + +W1 + + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  + X1:1:GND + +1:BUWH + +X2:1:GND + X1:2:VCC + +2:WHBU + +X2:2:VCC + X1:3:RX + +3:OGWH + +X2:4:TX + X1:4:TX + +4:WHOG + +X2:3:RX +  + X1:1:GND + +Shield + + +  + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + + + + + +X1:e--W1:w + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + + + + + +W1:e--W1:w + + + + +X2 + + + +X2 + +Molex KK 254 + +female + +7-pin + + + +SH1 + +SH2 + +1 + +GND + + + +2 + +VCC + + + +3 + +RX + + + +4 + +TX + + + +5 + +GND + + + +6 + +VCC + + + +7 + +GND + + + + + +W1:e--X2:w + + + + + + + + +W1:e--X2:w + + + + + + + + +W1:e--X2:w + + + + + + + + +W1:e--X2:w + + + + + + + + +X2:c--X2:c + + + + + + +X2:c--X2:c + + + + + + +X2:c--X2:c + + + + + + +__CIRCLE__1 + + + + +__CIRCLE__2 + + + + +__CIRCLE__3 + + + + +__CIRCLE__4 + + + + +__CIRCLE__5 + + + + +__CIRCLE__6 + + + + +__CIRCLE__7 + + + + +__CIRCLE__8 + + + + +__CIRCLE__9 + + + + +__CIRCLE__10 + + + + +__CIRCLE__11 + + + + +__CIRCLE__12 + + + + diff --git a/examples/ex15_wv_gvpr.gvpr b/examples/ex15_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex15_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/ex16.bom.tsv b/examples/ex16.bom.tsv new file mode 100644 index 0000000..54f73d0 --- /dev/null +++ b/examples/ex16.bom.tsv @@ -0,0 +1,6 @@ +# Qty Unit Description Designators Manufacturer MPN +1 2 Connector, Molex KK 254, female, 7 pins X1, X2 +2 1 m Cable, Serial, 4 x 0.25 mm² shielded W1 +3 42 mm loopPartA X1 WireViz 42XCD42A5 +4 74 mm loopPartB X1 WireViz 42XCD42A5 +5 21 mm loopPartC X2 WireViz 42XCD42A5 diff --git a/examples/ex16.gv b/examples/ex16.gv new file mode 100644 index 0000000..49f886d --- /dev/null +++ b/examples/ex16.gv @@ -0,0 +1,289 @@ +graph { +// Graph generated by WireViz 0.5-dev+refactor +// https://github.com/wireviz/WireViz + graph [bgcolor="#FFFFFF" fontname=arial nodesep=0.33 rankdir=LR ranksep=2] + node [fillcolor="#FFFFFF" fontname=arial height=0 margin=0 shape=none style=filled width=0] + edge [fontname=arial style=bold] + X1 [label=< + + + + + + + + + + + + + +
+ + + + +
X1
+
+ + + + + + +
Molex KK 254female7-pin
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GND1
VCC2
RX3
TX4
GND5
VCC6
GND7
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
42mmloopPartA
WireViz: 42XCD42A5
74mmloopPartB
WireViz: 42XCD42A5
+
+> shape=box style=filled] + edge [color="#000000"] + X1:p1r:e -- X1:p5r:e [label=" " color="#FF66CC" noLabel=noLabel] + X1:p5r:e -- X1:p7r:e [label=" " color="#FF66CC" noLabel=noLabel] + X1:p2r:e -- X1:p6r:e [label=" " color="#FF0000:#0066FF:#FF8000:#A0DFFF" noLabel=noLabel] + X2 [label=< + + + + + + + + + + + + + +
+ + + + +
X2
+
+ + + + + + +
Molex KK 254female7-pin
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1GND
2VCC
3RX
4TX
5GND
6VCC
7GND
+
+ + + + + + + + + + + + + +
21mmloopPartC
WireViz: 42XCD42A5
+
+> shape=box style=filled] + edge [color="#000000"] + X2:p1l:w -- X2:p5l:w [label=" " color="#FF66CC" noLabel=noLabel] + X2:p5l:w -- X2:p7l:w [label=" " color="#FF66CC" noLabel=noLabel] + X2:p2l:w -- X2:p6l:w [label=" " color="#FF66CC" noLabel=noLabel] + W1 [label=< + + + + + + + + + + +
+ + + + +
W1
+
+ + + + + + + + +
Serial4x0.25 mm² (24 AWG)+ S0.2 m
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
X1:1:GND 1:BN X2:1:GND
X1:2:VCC 2:RD X2:2:VCC
X1:3:RX 3:OG X2:4:TX
X1:4:TX 4:YE X2:3:RX
 
X1:1:GND Shield
 
+
+> shape=box style=filled] + edge [color="#000000:#895956:#000000"] + X1:p1r:e -- W1:w1:w + W1:w1:e -- X2:p1l:w + edge [color="#000000:#FF0000:#000000"] + X1:p2r:e -- W1:w2:w + W1:w2:e -- X2:p2l:w + edge [color="#000000:#FF8000:#000000"] + X1:p3r:e -- W1:w3:w + W1:w3:e -- X2:p4l:w + edge [color="#000000:#FFFF00:#000000"] + X1:p4r:e -- W1:w4:w + W1:w4:e -- X2:p3l:w + edge [color="#000000"] + X1:p1r:e -- W1:w5:w + W1:w1:e -- W1:w1:w [color="#000000:#895956:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FF8000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000" straight=straight] +} diff --git a/examples/ex16.html b/examples/ex16.html new file mode 100644 index 0000000..5d219a8 --- /dev/null +++ b/examples/ex16.html @@ -0,0 +1,382 @@ + + + + + ex16 + + +

ex16

+

Diagram

+ +
+ +
+ +
+ + + + + + + + +X1 + + + +X1 + +Molex KK 254 + +female + +7-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 + +GND + +5 + +VCC + +6 + +GND + +7 +42 +mm +loopPartA +WireViz: 42XCD42A5 +74 +mm +loopPartB +WireViz: 42XCD42A5 + + + + +X1:e--X1:e + + + + +X1:e--X1:e + + + + +X1:e--X1:e + + + + + + + +W1 + + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  + X1:1:GND + +1:BN + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC + X1:3:RX + +3:OG + +X2:4:TX + X1:4:TX + +4:YE + +X2:3:RX +  + X1:1:GND + +Shield + + +  + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + +X2 + + + +X2 + +Molex KK 254 + +female + +7-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX + +5 + +GND + +6 + +VCC + +7 + +GND +21 +mm +loopPartC +WireViz: 42XCD42A5 + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +X2:w--X2:w + + + + +X2:w--X2:w + + + + +X2:w--X2:w + + + + + +
+ +
+ +
+ +

Bill of Materials

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#QtyUnitDescriptionDesignatorsManufacturerMPN
12Connector, Molex KK 254, female, 7 pinsX1, X2
21mCable, Serial, 4 x 0.25 mm² shieldedW1
342mmloopPartAX1WireViz42XCD42A5
474mmloopPartBX1WireViz42XCD42A5
521mmloopPartCX2WireViz42XCD42A5
+ +
+ + diff --git a/examples/ex16.png b/examples/ex16.png new file mode 100644 index 0000000..480ba39 Binary files /dev/null and b/examples/ex16.png differ diff --git a/examples/ex16.svg b/examples/ex16.svg new file mode 100644 index 0000000..3cced10 --- /dev/null +++ b/examples/ex16.svg @@ -0,0 +1,283 @@ + + + + + + + + + +X1 + + + +X1 + +Molex KK 254 + +female + +7-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 + +GND + +5 + +VCC + +6 + +GND + +7 +42 +mm +loopPartA +WireViz: 42XCD42A5 +74 +mm +loopPartB +WireViz: 42XCD42A5 + + + + +X1:e--X1:e + + + + +X1:e--X1:e + + + + +X1:e--X1:e + + + + + + + +W1 + + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  + X1:1:GND + +1:BN + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC + X1:3:RX + +3:OG + +X2:4:TX + X1:4:TX + +4:YE + +X2:3:RX +  + X1:1:GND + +Shield + + +  + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + + + +W1:e--W1:w + + + + +X2 + + + +X2 + +Molex KK 254 + +female + +7-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX + +5 + +GND + +6 + +VCC + +7 + +GND +21 +mm +loopPartC +WireViz: 42XCD42A5 + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +X2:w--X2:w + + + + +X2:w--X2:w + + + + +X2:w--X2:w + + + + diff --git a/examples/ex16_wv_gvpr.gvpr b/examples/ex16_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/examples/ex16_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/examples/readme.md b/examples/readme.md index cd2c844..739eac6 100644 --- a/examples/readme.md +++ b/examples/readme.md @@ -84,27 +84,15 @@ [Source](ex14.yml) - [Bill of Materials](ex14.tsv) -## Example 11 -![](ex11.png) +## Example 15 +![](ex15.png) -[Source](ex11.yml) - [Bill of Materials](ex11.bom.tsv) +[Source](ex15.yml) - [Bill of Materials](ex15.tsv) -## Example 12 -![](ex12.png) +## Example 16 +![](ex16.png) -[Source](ex12.yml) - [Bill of Materials](ex12.bom.tsv) - - -## Example 13 -![](ex13.png) - -[Source](ex13.yml) - [Bill of Materials](ex13.bom.tsv) - - -## Example 14 -![](ex14.png) - -[Source](ex14.yml) - [Bill of Materials](ex14.bom.tsv) +[Source](ex16.yml) - [Bill of Materials](ex16.tsv) diff --git a/tests/bom/bomqty_wv_gvpr.gvpr b/tests/bom/bomqty_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tests/bom/bomqty_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tests/rendering/00_minimal_wv_gvpr.gvpr b/tests/rendering/00_minimal_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tests/rendering/00_minimal_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tests/rendering/01_color_single_wv_gvpr.gvpr b/tests/rendering/01_color_single_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tests/rendering/01_color_single_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tests/rendering/02_color_multi_wv_gvpr.gvpr b/tests/rendering/02_color_multi_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tests/rendering/02_color_multi_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tests/rendering/03_bgcolors_wv_gvpr.gvpr b/tests/rendering/03_bgcolors_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tests/rendering/03_bgcolors_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial01.gv b/tutorial/tutorial01.gv index 2503f3b..4505f76 100644 --- a/tutorial/tutorial01.gv +++ b/tutorial/tutorial01.gv @@ -127,13 +127,7 @@ graph { X2:1 - - - - - -
- + X1:2 @@ -143,13 +137,7 @@ graph { X2:2 - - - - - -
- + X1:3 @@ -159,13 +147,7 @@ graph { X2:3 - - - - - -
- + X1:4 @@ -175,13 +157,7 @@ graph { X2:4 - - - - - -
- +   @@ -203,4 +179,8 @@ graph { edge [color="#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w + W1:w1:e -- W1:w1:w [color="#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000" straight=straight] } diff --git a/tutorial/tutorial01.html b/tutorial/tutorial01.html index 271fd05..3d5e0a9 100644 --- a/tutorial/tutorial01.html +++ b/tutorial/tutorial01.html @@ -30,126 +30,142 @@
- - - - + + + X1 - - - -X1 - -4-pin - -1 - -2 - -3 - -4 + + + +X1 + +4-pin + +1 + +2 + +3 + +4 - + W1 - - - -W1 - -4x - -1 m -  - X1:1 - -1 - -X2:1 - - X1:2 - -2 - -X2:2 - - X1:3 - -3 - -X2:3 - - X1:4 - -4 - -X2:4 - -  + + + +W1 + +4x + +1 m +  + X1:1 + +1 + +X2:1 + X1:2 + +2 + +X2:2 + X1:3 + +3 + +X2:3 + X1:4 + +4 + +X2:4 +  X1:e--W1:w - + + + + +X1:e--W1:w + X1:e--W1:w - + + +X1:e--W1:w + + + -X1:e--W1:w - +W1:e--W1:w + - + + +W1:e--W1:w + + + -X1:e--W1:w - +W1:e--W1:w + + + + +W1:e--W1:w + - + X2 - - - -X2 - -4-pin - -1 - -2 - -3 - -4 + + + +X2 + +4-pin + +1 + +2 + +3 + +4 - + W1:e--X2:w - + - + W1:e--X2:w - + - + W1:e--X2:w - + - + W1:e--X2:w - + diff --git a/tutorial/tutorial01.png b/tutorial/tutorial01.png index e93b3de..b858f16 100644 Binary files a/tutorial/tutorial01.png and b/tutorial/tutorial01.png differ diff --git a/tutorial/tutorial01.svg b/tutorial/tutorial01.svg index 1c871c1..b3633a9 100644 --- a/tutorial/tutorial01.svg +++ b/tutorial/tutorial01.svg @@ -1,126 +1,142 @@ - - - - + + + X1 - - - -X1 - -4-pin - -1 - -2 - -3 - -4 + + + +X1 + +4-pin + +1 + +2 + +3 + +4 - + W1 - - - -W1 - -4x - -1 m -  - X1:1 - -1 - -X2:1 - - X1:2 - -2 - -X2:2 - - X1:3 - -3 - -X2:3 - - X1:4 - -4 - -X2:4 - -  + + + +W1 + +4x + +1 m +  + X1:1 + +1 + +X2:1 + X1:2 + +2 + +X2:2 + X1:3 + +3 + +X2:3 + X1:4 + +4 + +X2:4 +  X1:e--W1:w - + + + + +X1:e--W1:w + X1:e--W1:w - + + +X1:e--W1:w + + + -X1:e--W1:w - +W1:e--W1:w + - + + +W1:e--W1:w + + + -X1:e--W1:w - +W1:e--W1:w + + + + +W1:e--W1:w + - + X2 - - - -X2 - -4-pin - -1 - -2 - -3 - -4 + + + +X2 + +4-pin + +1 + +2 + +3 + +4 - + W1:e--X2:w - + - + W1:e--X2:w - + - + W1:e--X2:w - + - + W1:e--X2:w - + diff --git a/tutorial/tutorial01_wv_gvpr.gvpr b/tutorial/tutorial01_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial01_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial02.gv b/tutorial/tutorial02.gv index 227eaae..5e80f29 100644 --- a/tutorial/tutorial02.gv +++ b/tutorial/tutorial02.gv @@ -132,19 +132,7 @@ graph { X2:1
- -
- - - - - - - - - -
- + X1:2 @@ -154,19 +142,7 @@ graph { X2:2 - - - - - - - - - - - -
- + X1:3 @@ -176,19 +152,7 @@ graph { X2:4 - - - - - - - - - - - -
- + X1:4 @@ -198,19 +162,7 @@ graph { X2:3 - - - - - - - - - - - -
- +   @@ -232,4 +184,8 @@ graph { edge [color="#000000:#FFFF00:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p3l:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#895956:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] } diff --git a/tutorial/tutorial02.html b/tutorial/tutorial02.html index e43e2f2..ee740f6 100644 --- a/tutorial/tutorial02.html +++ b/tutorial/tutorial02.html @@ -30,160 +30,176 @@
- - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 - + W1 - - - -W1 - -4x - -0.25 mm² (24 AWG) - -1 m -  - X1:1 - -1:WH - -X2:1 - - - - X1:2 - -2:BN - -X2:2 - - - - X1:3 - -3:GN - -X2:4 - - - - X1:4 - -4:YE - -X2:3 - - - -  + + + +W1 + +4x + +0.25 mm² (24 AWG) + +1 m +  + X1:1 + +1:WH + +X2:1 + X1:2 + +2:BN + +X2:2 + X1:3 + +3:GN + +X2:4 + X1:4 + +4:YE + +X2:3 +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial02.png b/tutorial/tutorial02.png index ba6902c..78d7268 100644 Binary files a/tutorial/tutorial02.png and b/tutorial/tutorial02.png differ diff --git a/tutorial/tutorial02.svg b/tutorial/tutorial02.svg index 786d599..94c54b9 100644 --- a/tutorial/tutorial02.svg +++ b/tutorial/tutorial02.svg @@ -1,160 +1,176 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 - + W1 - - - -W1 - -4x - -0.25 mm² (24 AWG) - -1 m -  - X1:1 - -1:WH - -X2:1 - - - - X1:2 - -2:BN - -X2:2 - - - - X1:3 - -3:GN - -X2:4 - - - - X1:4 - -4:YE - -X2:3 - - - -  + + + +W1 + +4x + +0.25 mm² (24 AWG) + +1 m +  + X1:1 + +1:WH + +X2:1 + X1:2 + +2:BN + +X2:2 + X1:3 + +3:GN + +X2:4 + X1:4 + +4:YE + +X2:3 +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial02_wv_gvpr.gvpr b/tutorial/tutorial02_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial02_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial03.gv b/tutorial/tutorial03.gv index 91fa7d6..562dcb3 100644 --- a/tutorial/tutorial03.gv +++ b/tutorial/tutorial03.gv @@ -133,19 +133,7 @@ graph { X2:1:GND
- -
- - - - - - - - - -
- + X1:2:VCC @@ -155,19 +143,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:RX @@ -177,19 +153,7 @@ graph { X2:4:TX - - - - - - - - - - - -
- + X1:4:TX @@ -199,19 +163,7 @@ graph { X2:3:RX - - - - - - - - - - - -
- +   @@ -224,13 +176,7 @@ graph { - - - - - -
- +   @@ -254,4 +200,9 @@ graph { W1:w4:e -- X2:p3l:w edge [color="#000000"] X1:p1r:e -- W1:w5:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#895956:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#00AA00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w5:e -- W1:w5:w [color="#000000" straight=straight] } diff --git a/tutorial/tutorial03.html b/tutorial/tutorial03.html index b76440f..28addd0 100644 --- a/tutorial/tutorial03.html +++ b/tutorial/tutorial03.html @@ -30,190 +30,210 @@
- - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 - + W1 - - - -W1 - -4x - -0.25 mm² (24 AWG) - -+ S - -1 m -  - X1:1:GND - -1:WH - -X2:1:GND - - - - X1:2:VCC - -2:BN - -X2:2:VCC - - - - X1:3:RX - -3:GN - -X2:4:TX - - - - X1:4:TX - -4:YE - -X2:3:RX - - - -  - X1:1:GND - -Shield - - - -  + + + +W1 + +4x + +0.25 mm² (24 AWG) + ++ S + +1 m +  + X1:1:GND + +1:WH + +X2:1:GND + X1:2:VCC + +2:BN + +X2:2:VCC + X1:3:RX + +3:GN + +X2:4:TX + X1:4:TX + +4:YE + +X2:3:RX +  + X1:1:GND + +Shield + + +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial03.png b/tutorial/tutorial03.png index 9bca817..131c743 100644 Binary files a/tutorial/tutorial03.png and b/tutorial/tutorial03.png differ diff --git a/tutorial/tutorial03.svg b/tutorial/tutorial03.svg index aef9b85..06b5058 100644 --- a/tutorial/tutorial03.svg +++ b/tutorial/tutorial03.svg @@ -1,190 +1,210 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 - + W1 - - - -W1 - -4x - -0.25 mm² (24 AWG) - -+ S - -1 m -  - X1:1:GND - -1:WH - -X2:1:GND - - - - X1:2:VCC - -2:BN - -X2:2:VCC - - - - X1:3:RX - -3:GN - -X2:4:TX - - - - X1:4:TX - -4:YE - -X2:3:RX - - - -  - X1:1:GND - -Shield - - - -  + + + +W1 + +4x + +0.25 mm² (24 AWG) + ++ S + +1 m +  + X1:1:GND + +1:WH + +X2:1:GND + X1:2:VCC + +2:BN + +X2:2:VCC + X1:3:RX + +3:GN + +X2:4:TX + X1:4:TX + +4:YE + +X2:3:RX +  + X1:1:GND + +Shield + + +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - +W1:e--W1:w + + + + + + +W1:e--W1:w + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + - + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial03_wv_gvpr.gvpr b/tutorial/tutorial03_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial03_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial04.gv b/tutorial/tutorial04.gv index f506f2b..eb15335 100644 --- a/tutorial/tutorial04.gv +++ b/tutorial/tutorial04.gv @@ -209,19 +209,7 @@ graph { X2:1:GND
- -
- - - - - - - - - -
- + X1:2:VCC @@ -231,19 +219,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:SCL @@ -253,19 +229,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X1:4:SDA @@ -275,19 +239,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -318,6 +270,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#895956:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FF8000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] W2 [label=< @@ -354,19 +310,7 @@ graph { - + @@ -376,19 +320,7 @@ graph { - + @@ -398,19 +330,7 @@ graph { - + @@ -420,19 +340,7 @@ graph { - + @@ -463,4 +371,8 @@ graph { edge [color="#000000:#FFFF00:#000000"] X2:p4r:e -- W2:w4:w W2:w4:e -- X3:p4l:w + W2:w1:e -- W2:w1:w [color="#000000:#895956:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#FF8000:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#FFFF00:#000000" straight=straight] } diff --git a/tutorial/tutorial04.html b/tutorial/tutorial04.html index 41c4c8c..9a74a26 100644 --- a/tutorial/tutorial04.html +++ b/tutorial/tutorial04.html @@ -30,328 +30,360 @@
- - - - + + + X1 - - - -X1 - -Molex KK 254 - -male - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 - -to microcontroller + + + +X1 + +Molex KK 254 + +male + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 + +to microcontroller - + W1 - - - -W1 - -4x - -24 AWG - -0.3 m -  - X1:1:GND - -1:BN - -X2:1:GND - - - - X1:2:VCC - -2:RD - -X2:2:VCC - - - - X1:3:SCL - -3:OG - -X2:3:SCL - - - - X1:4:SDA - -4:YE - -X2:4:SDA - - - -  - -This cable is a bit longer + + + +W1 + +4x + +24 AWG + +0.3 m +  + X1:1:GND + +1:BN + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC + X1:3:SCL + +3:OG + +X2:3:SCL + X1:4:SDA + +4:YE + +X2:4:SDA +  + +This cable is a bit longer X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 - -to accelerometer + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 + +to accelerometer + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + W2 - - - -W2 - -4x - -24 AWG - -0.1 m -  - X2:1:GND - -1:BN - -X3:1:GND - - - - X2:2:VCC - -2:RD - -X3:2:VCC - - - - X2:3:SCL - -3:OG - -X3:3:SCL - - - - X2:4:SDA - -4:YE - -X3:4:SDA - - - -  - -This cable is a bit shorter - - - -X2:e--W2:w - - - - - - -X2:e--W2:w - - - + + + +W2 + +4x + +24 AWG + +0.1 m +  + X2:1:GND + +1:BN + +X3:1:GND + X2:2:VCC + +2:RD + +X3:2:VCC + X2:3:SCL + +3:OG + +X3:3:SCL + X2:4:SDA + +4:YE + +X3:4:SDA +  + +This cable is a bit shorter X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - -to temperature sensor - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - + + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + +to temperature sensor - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + diff --git a/tutorial/tutorial04.png b/tutorial/tutorial04.png index 125074b..55e64bf 100644 Binary files a/tutorial/tutorial04.png and b/tutorial/tutorial04.png differ diff --git a/tutorial/tutorial04.svg b/tutorial/tutorial04.svg index bb56c9d..1a9884f 100644 --- a/tutorial/tutorial04.svg +++ b/tutorial/tutorial04.svg @@ -1,328 +1,360 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -male - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 - -to microcontroller + + + +X1 + +Molex KK 254 + +male + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 + +to microcontroller - + W1 - - - -W1 - -4x - -24 AWG - -0.3 m -  - X1:1:GND - -1:BN - -X2:1:GND - - - - X1:2:VCC - -2:RD - -X2:2:VCC - - - - X1:3:SCL - -3:OG - -X2:3:SCL - - - - X1:4:SDA - -4:YE - -X2:4:SDA - - - -  - -This cable is a bit longer + + + +W1 + +4x + +24 AWG + +0.3 m +  + X1:1:GND + +1:BN + +X2:1:GND + X1:2:VCC + +2:RD + +X2:2:VCC + X1:3:SCL + +3:OG + +X2:3:SCL + X1:4:SDA + +4:YE + +X2:4:SDA +  + +This cable is a bit longer X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 - -to accelerometer + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 + +to accelerometer + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + W2 - - - -W2 - -4x - -24 AWG - -0.1 m -  - X2:1:GND - -1:BN - -X3:1:GND - - - - X2:2:VCC - -2:RD - -X3:2:VCC - - - - X2:3:SCL - -3:OG - -X3:3:SCL - - - - X2:4:SDA - -4:YE - -X3:4:SDA - - - -  - -This cable is a bit shorter - - - -X2:e--W2:w - - - - - - -X2:e--W2:w - - - + + + +W2 + +4x + +24 AWG + +0.1 m +  + X2:1:GND + +1:BN + +X3:1:GND + X2:2:VCC + +2:RD + +X3:2:VCC + X2:3:SCL + +3:OG + +X3:3:SCL + X2:4:SDA + +4:YE + +X3:4:SDA +  + +This cable is a bit shorter X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + X2:e--W2:w - - - + + + + + + +X2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - -to temperature sensor - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - + + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + +to temperature sensor - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + diff --git a/tutorial/tutorial04_wv_gvpr.gvpr b/tutorial/tutorial04_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial04_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial05.gv b/tutorial/tutorial05.gv index 2aab2d1..754f718 100644 --- a/tutorial/tutorial05.gv +++ b/tutorial/tutorial05.gv @@ -151,19 +151,7 @@ graph { X1:1:+12V
- + @@ -174,19 +162,7 @@ graph { - + @@ -197,19 +173,7 @@ graph { - + @@ -220,19 +184,7 @@ graph { - + @@ -254,4 +206,8 @@ graph { edge [color="#000000:#FF0000:#000000"] AUTOGENERATED_F1_4:e -- W1:w4:w W1:w4:e -- X1:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#000000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#000000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FF0000:#000000" straight=straight] } diff --git a/tutorial/tutorial05.html b/tutorial/tutorial05.html index 80c7f2a..de99449 100644 --- a/tutorial/tutorial05.html +++ b/tutorial/tutorial05.html @@ -30,202 +30,218 @@
- - - - + + + AUTOGENERATED_F1_1 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + - + W1 - - - -W1 - -4x - -0.5 mm² - -0.3 m -  - - -YE - -X1:1:+12V - - - - - -BK - -X1:2:GND - - - - - -BK - -X1:3:GND - - - - - -RD - -X1:4:+5V - - - -  + + + +W1 + +4x + +0.5 mm² + +0.3 m +  + + +YE + +X1:1:+12V + + +BK + +X1:2:GND + + +BK + +X1:3:GND + + +RD + +X1:4:+5V +  AUTOGENERATED_F1_1:e--W1:w - - - + + + - - -AUTOGENERATED_F1_2 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + +W1:e--W1:w + + + - + -AUTOGENERATED_F1_2:e--W1:w - - - +W1:e--W1:w + + + - - -AUTOGENERATED_F1_3 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + +W1:e--W1:w + + + - + -AUTOGENERATED_F1_3:e--W1:w - - - - - - -AUTOGENERATED_F1_4 - - - -Crimp ferrule - -0.5 mm² - -OG - - - - - -AUTOGENERATED_F1_4:e--W1:w - - - +W1:e--W1:w + + + - + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V - - - -W1:e--X1:w - - - - - - -W1:e--X1:w - - - + + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + + + + +AUTOGENERATED_F1_2 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F1_2:e--W1:w + + + + + + +AUTOGENERATED_F1_3 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F1_3:e--W1:w + + + + + + +AUTOGENERATED_F1_4 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F1_4:e--W1:w + + + diff --git a/tutorial/tutorial05.png b/tutorial/tutorial05.png index d8a8eeb..d0c6e81 100644 Binary files a/tutorial/tutorial05.png and b/tutorial/tutorial05.png differ diff --git a/tutorial/tutorial05.svg b/tutorial/tutorial05.svg index 8995d49..5d02c4a 100644 --- a/tutorial/tutorial05.svg +++ b/tutorial/tutorial05.svg @@ -1,202 +1,218 @@ - - - - + + + AUTOGENERATED_F1_1 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + - + W1 - - - -W1 - -4x - -0.5 mm² - -0.3 m -  - - -YE - -X1:1:+12V - - - - - -BK - -X1:2:GND - - - - - -BK - -X1:3:GND - - - - - -RD - -X1:4:+5V - - - -  + + + +W1 + +4x + +0.5 mm² + +0.3 m +  + + +YE + +X1:1:+12V + + +BK + +X1:2:GND + + +BK + +X1:3:GND + + +RD + +X1:4:+5V +  AUTOGENERATED_F1_1:e--W1:w - - - + + + - - -AUTOGENERATED_F1_2 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + +W1:e--W1:w + + + - + -AUTOGENERATED_F1_2:e--W1:w - - - +W1:e--W1:w + + + - - -AUTOGENERATED_F1_3 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + +W1:e--W1:w + + + - + -AUTOGENERATED_F1_3:e--W1:w - - - - - - -AUTOGENERATED_F1_4 - - - -Crimp ferrule - -0.5 mm² - -OG - - - - - -AUTOGENERATED_F1_4:e--W1:w - - - +W1:e--W1:w + + + - + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V - - - -W1:e--X1:w - - - - - - -W1:e--X1:w - - - + + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + + + + +AUTOGENERATED_F1_2 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F1_2:e--W1:w + + + + + + +AUTOGENERATED_F1_3 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F1_3:e--W1:w + + + + + + +AUTOGENERATED_F1_4 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F1_4:e--W1:w + + + diff --git a/tutorial/tutorial05_wv_gvpr.gvpr b/tutorial/tutorial05_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial05_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial06.gv b/tutorial/tutorial06.gv index 31bd8f5..c9daeb7 100644 --- a/tutorial/tutorial06.gv +++ b/tutorial/tutorial06.gv @@ -135,19 +135,7 @@ graph { X1:1:+12V
- + @@ -158,19 +146,7 @@ graph { - + @@ -181,19 +157,7 @@ graph { - + @@ -204,19 +168,7 @@ graph { - + @@ -238,4 +190,8 @@ graph { edge [color="#000000:#FF0000:#000000"] AUTOGENERATED_F_05_2:e -- W1:w4:w W1:w4:e -- X1:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#000000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#000000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FF0000:#000000" straight=straight] } diff --git a/tutorial/tutorial06.html b/tutorial/tutorial06.html index cb52865..0a1ea19 100644 --- a/tutorial/tutorial06.html +++ b/tutorial/tutorial06.html @@ -30,188 +30,204 @@
- - - - + + + AUTOGENERATED_F_05_1 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + - + W1 - - - -W1 - -4x - -0.5 mm² - -0.3 m -  - - -YE - -X1:1:+12V - - - - F1 - -BK - -X1:2:GND - - - - F1 - -BK - -X1:3:GND - - - - - -RD - -X1:4:+5V - - - -  + + + +W1 + +4x + +0.5 mm² + +0.3 m +  + + +YE + +X1:1:+12V + F1 + +BK + +X1:2:GND + F1 + +BK + +X1:3:GND + + +RD + +X1:4:+5V +  AUTOGENERATED_F_05_1:e--W1:w - - - + + + - - -F1 - - - -Crimp ferrule - -1.0 mm² - -YE - - + + +W1:e--W1:w + + + - + -F1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -F1:e--W1:w - - - - - - -AUTOGENERATED_F_05_2 - - - -Crimp ferrule - -0.5 mm² - -OG - - - - - -AUTOGENERATED_F_05_2:e--W1:w - - - +W1:e--W1:w + + + - + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V - - - -W1:e--X1:w - - - - - - -W1:e--X1:w - - - + + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + + + + +F1 + + + +Crimp ferrule + +1.0 mm² + +YE + + + + + +F1:e--W1:w + + + + + + +F1:e--W1:w + + + + + + +AUTOGENERATED_F_05_2 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F_05_2:e--W1:w + + + diff --git a/tutorial/tutorial06.png b/tutorial/tutorial06.png index 5571181..fbc8c08 100644 Binary files a/tutorial/tutorial06.png and b/tutorial/tutorial06.png differ diff --git a/tutorial/tutorial06.svg b/tutorial/tutorial06.svg index 6800d7f..5bf6e09 100644 --- a/tutorial/tutorial06.svg +++ b/tutorial/tutorial06.svg @@ -1,188 +1,204 @@ - - - - + + + AUTOGENERATED_F_05_1 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + - + W1 - - - -W1 - -4x - -0.5 mm² - -0.3 m -  - - -YE - -X1:1:+12V - - - - F1 - -BK - -X1:2:GND - - - - F1 - -BK - -X1:3:GND - - - - - -RD - -X1:4:+5V - - - -  + + + +W1 + +4x + +0.5 mm² + +0.3 m +  + + +YE + +X1:1:+12V + F1 + +BK + +X1:2:GND + F1 + +BK + +X1:3:GND + + +RD + +X1:4:+5V +  AUTOGENERATED_F_05_1:e--W1:w - - - + + + - - -F1 - - - -Crimp ferrule - -1.0 mm² - -YE - - + + +W1:e--W1:w + + + - + -F1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -F1:e--W1:w - - - - - - -AUTOGENERATED_F_05_2 - - - -Crimp ferrule - -0.5 mm² - -OG - - - - - -AUTOGENERATED_F_05_2:e--W1:w - - - +W1:e--W1:w + + + - + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V - - - -W1:e--X1:w - - - - - - -W1:e--X1:w - - - + + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + W1:e--X1:w - - - + + + + + + +W1:e--X1:w + + + + + + +F1 + + + +Crimp ferrule + +1.0 mm² + +YE + + + + + +F1:e--W1:w + + + + + + +F1:e--W1:w + + + + + + +AUTOGENERATED_F_05_2 + + + +Crimp ferrule + +0.5 mm² + +OG + + + + + +AUTOGENERATED_F_05_2:e--W1:w + + + diff --git a/tutorial/tutorial06_wv_gvpr.gvpr b/tutorial/tutorial06_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial06_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial07.gv b/tutorial/tutorial07.gv index 84c3782..9a3cbbd 100644 --- a/tutorial/tutorial07.gv +++ b/tutorial/tutorial07.gv @@ -317,19 +317,7 @@ graph { X2:1:GND
- + @@ -340,19 +328,7 @@ graph { - + @@ -363,19 +339,7 @@ graph { - + @@ -386,19 +350,7 @@ graph { - + @@ -420,6 +372,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#00FFFF:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF66CC:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#8000FF:#000000" straight=straight] W2 [label=<
X3:1:GND
- - - - - - - - - - -
-
X2:2:VCCX3:2:VCC
- - - - - - - - - - -
-
X2:3:SCLX3:3:SCL
- - - - - - - - - - -
-
X2:4:SDAX3:4:SDA
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2:GND
- - - - - - - - - - -
-
X1:3:GND
- - - - - - - - - - -
-
X1:4:+5V
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
F1X1:2:GND
- - - - - - - - - - -
-
F1X1:3:GND
- - - - - - - - - - -
-
X1:4:+5V
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2:VCCX2:2:VCC
- - - - - - - - - - -
-
X1:3:SCLX2:3:SCL
- - - - - - - - - - -
-
X1:4:SDAX2:4:SDA
- - - - - - - - - - -
-
 
@@ -457,19 +413,7 @@ graph { - + @@ -480,19 +424,7 @@ graph { - + @@ -503,19 +435,7 @@ graph { - + @@ -526,19 +446,7 @@ graph { - + @@ -560,6 +468,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X3:p4r:e -- W2:w4:w W2:w4:e -- X2:p4l:w + W2:w1:e -- W2:w1:w [color="#000000:#00FFFF:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#FF66CC:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#8000FF:#000000" straight=straight] W3 [label=<
X2:1:GND
- - - - - - - - - - -
-
X3:2:VCCX2:2:VCC
- - - - - - - - - - -
-
X3:3:SCLX2:3:SCL
- - - - - - - - - - -
-
X3:4:SDAX2:4:SDA
- - - - - - - - - - -
-
 
@@ -597,19 +509,7 @@ graph { - + @@ -620,19 +520,7 @@ graph { - + @@ -643,19 +531,7 @@ graph { - + @@ -666,19 +542,7 @@ graph { - + @@ -700,6 +564,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X3:p4r:e -- W3:w4:w W3:w4:e -- X4:p4l:w + W3:w1:e -- W3:w1:w [color="#000000:#00FFFF:#000000" straight=straight] + W3:w2:e -- W3:w2:w [color="#000000:#FF66CC:#000000" straight=straight] + W3:w3:e -- W3:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W3:w4:e -- W3:w4:w [color="#000000:#8000FF:#000000" straight=straight] W4 [label=<
X4:1:GND
- - - - - - - - - - -
-
X3:2:VCCX4:2:VCC
- - - - - - - - - - -
-
X3:3:SCLX4:3:SCL
- - - - - - - - - - -
-
X3:4:SDAX4:4:SDA
- - - - - - - - - - -
-
 
@@ -737,19 +605,7 @@ graph { - + @@ -760,19 +616,7 @@ graph { - + @@ -783,19 +627,7 @@ graph { - + @@ -806,19 +638,7 @@ graph { - + @@ -840,6 +660,10 @@ graph { edge [color="#000000:#8000FF:#000000"] X5:p4r:e -- W4:w4:w W4:w4:e -- X4:p4l:w + W4:w1:e -- W4:w1:w [color="#000000:#00FFFF:#000000" straight=straight] + W4:w2:e -- W4:w2:w [color="#000000:#FF66CC:#000000" straight=straight] + W4:w3:e -- W4:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W4:w4:e -- W4:w4:w [color="#000000:#8000FF:#000000" straight=straight] W5 [label=<
X4:1:GND
- - - - - - - - - - -
-
X5:2:VCCX4:2:VCC
- - - - - - - - - - -
-
X5:3:SCLX4:3:SCL
- - - - - - - - - - -
-
X5:4:SDAX4:4:SDA
- - - - - - - - - - -
-
 
@@ -877,19 +701,7 @@ graph { - + @@ -900,19 +712,7 @@ graph { - + @@ -923,19 +723,7 @@ graph { - + @@ -946,19 +734,7 @@ graph { - + @@ -980,4 +756,8 @@ graph { edge [color="#000000:#8000FF:#000000"] X5:p4r:e -- W5:w4:w W5:w4:e -- X6:p4l:w + W5:w1:e -- W5:w1:w [color="#000000:#00FFFF:#000000" straight=straight] + W5:w2:e -- W5:w2:w [color="#000000:#FF66CC:#000000" straight=straight] + W5:w3:e -- W5:w3:w [color="#000000:#FFFF00:#000000" straight=straight] + W5:w4:e -- W5:w4:w [color="#000000:#8000FF:#000000" straight=straight] } diff --git a/tutorial/tutorial07.html b/tutorial/tutorial07.html index 91b02e3..4acf4fa 100644 --- a/tutorial/tutorial07.html +++ b/tutorial/tutorial07.html @@ -30,712 +30,792 @@
- - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W1 - - - -W1 - -4x - -0.25 mm² - -0.2 m -  - X1:1:GND - -TQ - -X2:1:GND - - - - X1:2:VCC - -PK - -X2:2:VCC - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -VT - -X2:4:SDA - - - -  + + + +W1 + +4x + +0.25 mm² + +0.2 m +  + X1:1:GND + +TQ + +X2:1:GND + X1:2:VCC + +PK + +X2:2:VCC + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +VT + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W2 - - - -W2 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -TQ - -X2:1:GND - - - - X3:2:VCC - -PK - -X2:2:VCC - - - - X3:3:SCL - -YE - -X2:3:SCL - - - - X3:4:SDA - -VT - -X2:4:SDA - - - -  - - - -X3:e--W2:w - - - - - - -X3:e--W2:w - - - + + + +W2 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +TQ + +X2:1:GND + X3:2:VCC + +PK + +X2:2:VCC + X3:3:SCL + +YE + +X2:3:SCL + X3:4:SDA + +VT + +X2:4:SDA +  X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + - + W3 - - - -W3 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -TQ - -X4:1:GND - - - - X3:2:VCC - -PK - -X4:2:VCC - - - - X3:3:SCL - -YE - -X4:3:SCL - - - - X3:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W3 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +TQ + +X4:1:GND + X3:2:VCC + +PK + +X4:2:VCC + X3:3:SCL + +YE + +X4:3:SCL + X3:4:SDA + +VT + +X4:4:SDA +  X3:e--W3:w - - - + + + + + + +X3:e--W3:w + + + X3:e--W3:w - - - + + + + +X3:e--W3:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + - + + +W2:e--X2:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + + + + +W2:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + - + X5 - - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W4 - - - -W4 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -TQ - -X4:1:GND - - - - X5:2:VCC - -PK - -X4:2:VCC - - - - X5:3:SCL - -YE - -X4:3:SCL - - - - X5:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W4 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +TQ + +X4:1:GND + X5:2:VCC + +PK + +X4:2:VCC + X5:3:SCL + +YE + +X4:3:SCL + X5:4:SDA + +VT + +X4:4:SDA +  - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + W5 - - - -W5 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -TQ - -X6:1:GND - - - - X5:2:VCC - -PK - -X6:2:VCC - - - - X5:3:SCL - -YE - -X6:3:SCL - - - - X5:4:SDA - -VT - -X6:4:SDA - - - -  + + + +W5 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +TQ + +X6:1:GND + X5:2:VCC + +PK + +X6:2:VCC + X5:3:SCL + +YE + +X6:3:SCL + X5:4:SDA + +VT + +X6:4:SDA +  - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + - + X6 - - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - + + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + diff --git a/tutorial/tutorial07.png b/tutorial/tutorial07.png index 171353a..f16f1c4 100644 Binary files a/tutorial/tutorial07.png and b/tutorial/tutorial07.png differ diff --git a/tutorial/tutorial07.svg b/tutorial/tutorial07.svg index ecbf9e0..69138a8 100644 --- a/tutorial/tutorial07.svg +++ b/tutorial/tutorial07.svg @@ -1,712 +1,792 @@ - - - - + + + X1 - - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W1 - - - -W1 - -4x - -0.25 mm² - -0.2 m -  - X1:1:GND - -TQ - -X2:1:GND - - - - X1:2:VCC - -PK - -X2:2:VCC - - - - X1:3:SCL - -YE - -X2:3:SCL - - - - X1:4:SDA - -VT - -X2:4:SDA - - - -  + + + +W1 + +4x + +0.25 mm² + +0.2 m +  + X1:1:GND + +TQ + +X2:1:GND + X1:2:VCC + +PK + +X2:2:VCC + X1:3:SCL + +YE + +X2:3:SCL + X1:4:SDA + +VT + +X2:4:SDA +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + + +X1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W1:w - - - +W1:e--W1:w + + + + + + +W1:e--W1:w + + + - + X2 - - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + - + X3 - - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W2 - - - -W2 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -TQ - -X2:1:GND - - - - X3:2:VCC - -PK - -X2:2:VCC - - - - X3:3:SCL - -YE - -X2:3:SCL - - - - X3:4:SDA - -VT - -X2:4:SDA - - - -  - - - -X3:e--W2:w - - - - - - -X3:e--W2:w - - - + + + +W2 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +TQ + +X2:1:GND + X3:2:VCC + +PK + +X2:2:VCC + X3:3:SCL + +YE + +X2:3:SCL + X3:4:SDA + +VT + +X2:4:SDA +  X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + X3:e--W2:w - - - + + + + + + +X3:e--W2:w + + + - + W3 - - - -W3 - -4x - -0.25 mm² - -0.2 m -  - X3:1:GND - -TQ - -X4:1:GND - - - - X3:2:VCC - -PK - -X4:2:VCC - - - - X3:3:SCL - -YE - -X4:3:SCL - - - - X3:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W3 + +4x + +0.25 mm² + +0.2 m +  + X3:1:GND + +TQ + +X4:1:GND + X3:2:VCC + +PK + +X4:2:VCC + X3:3:SCL + +YE + +X4:3:SCL + X3:4:SDA + +VT + +X4:4:SDA +  X3:e--W3:w - - - + + + + + + +X3:e--W3:w + + + X3:e--W3:w - - - + + + + +X3:e--W3:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + - + + +W2:e--X2:w + + + + + -X3:e--W3:w - - - +W2:e--X2:w + + + + + + +W2:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + + + + +W3:e--W3:w + + + - + X4 - - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + + + + +W3:e--X4:w + + + - + X5 - - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 - + W4 - - - -W4 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -TQ - -X4:1:GND - - - - X5:2:VCC - -PK - -X4:2:VCC - - - - X5:3:SCL - -YE - -X4:3:SCL - - - - X5:4:SDA - -VT - -X4:4:SDA - - - -  + + + +W4 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +TQ + +X4:1:GND + X5:2:VCC + +PK + +X4:2:VCC + X5:3:SCL + +YE + +X4:3:SCL + X5:4:SDA + +VT + +X4:4:SDA +  - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + X5:e--W4:w - - - + + + - + W5 - - - -W5 - -4x - -0.25 mm² - -0.2 m -  - X5:1:GND - -TQ - -X6:1:GND - - - - X5:2:VCC - -PK - -X6:2:VCC - - - - X5:3:SCL - -YE - -X6:3:SCL - - - - X5:4:SDA - -VT - -X6:4:SDA - - - -  + + + +W5 + +4x + +0.25 mm² + +0.2 m +  + X5:1:GND + +TQ + +X6:1:GND + X5:2:VCC + +PK + +X6:2:VCC + X5:3:SCL + +YE + +X6:3:SCL + X5:4:SDA + +VT + +X6:4:SDA +  - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + - + X5:e--W5:w - - - + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--X4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W4:e--W4:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + + + + +W5:e--W5:w + + + - + X6 - - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W2:e--X2:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W3:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - - - - -W4:e--X4:w - - - + + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + - + W5:e--X6:w - - - + + + diff --git a/tutorial/tutorial07_wv_gvpr.gvpr b/tutorial/tutorial07_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial07_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file diff --git a/tutorial/tutorial08.gv b/tutorial/tutorial08.gv index dcbabb1..64c7294 100644 --- a/tutorial/tutorial08.gv +++ b/tutorial/tutorial08.gv @@ -310,19 +310,7 @@ graph { X2:1
- + @@ -332,19 +320,7 @@ graph { - + @@ -354,19 +330,7 @@ graph { - + @@ -376,19 +340,7 @@ graph { - + @@ -410,6 +362,10 @@ graph { edge [color="#000000:#FFFF00:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w + W1:w1:e -- W1:w1:w [color="#000000:#895956:#000000" straight=straight] + W1:w2:e -- W1:w2:w [color="#000000:#FF0000:#000000" straight=straight] + W1:w3:e -- W1:w3:w [color="#000000:#FF8000:#000000" straight=straight] + W1:w4:e -- W1:w4:w [color="#000000:#FFFF00:#000000" straight=straight] W2 [label=<
X6:1:GND
- - - - - - - - - - -
-
X5:2:VCCX6:2:VCC
- - - - - - - - - - -
-
X5:3:SCLX6:3:SCL
- - - - - - - - - - -
-
X5:4:SDAX6:4:SDA
- - - - - - - - - - -
-
 
- - - - - - - - - - -
-
X1:2X2:2
- - - - - - - - - - -
-
X1:3X2:3
- - - - - - - - - - -
-
X1:4X2:4
- - - - - - - - - - -
-
 
@@ -447,19 +403,7 @@ graph { - + - + - + - +
X3:1
- - - - - - - - - - -
-
@@ -481,19 +425,7 @@ graph { X3:2
- - - - - - - - - - -
-
@@ -515,19 +447,7 @@ graph { X3:3
- - - - - - - - - - -
-
@@ -549,19 +469,7 @@ graph { X3:4
- - - - - - - - - - -
-
@@ -612,4 +520,8 @@ graph { edge [color="#000000:#FF0000:#000000"] X1:p4r:e -- W2:w4:w W2:w4:e -- X3:p4l:w + W2:w1:e -- W2:w1:w [color="#000000:#FFFF00:#000000" straight=straight] + W2:w2:e -- W2:w2:w [color="#000000:#000000:#000000" straight=straight] + W2:w3:e -- W2:w3:w [color="#000000:#000000:#000000" straight=straight] + W2:w4:e -- W2:w4:w [color="#000000:#FF0000:#000000" straight=straight] } diff --git a/tutorial/tutorial08.html b/tutorial/tutorial08.html index 8c95896..c86264c 100644 --- a/tutorial/tutorial08.html +++ b/tutorial/tutorial08.html @@ -30,350 +30,382 @@
- - - - + + + X1 - - - -X1 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 -4 -x -Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 -1 -x -Test -P/N: ABC, Molex: 45454, Mousikey: 9999 - + + + +X1 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 +4 +x +Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 +1 +x +Test +P/N: ABC, Molex: 45454, Mousikey: 9999 + - + W1 - - - -W1 - -P/N: CAB1 - -CablesCo: ABC123 - -Cables R Us: 999-888-777 - -4x - -0.25 mm² - -1 m -  - X1:1 - -1:BN - -X2:1 - - - - X1:2 - -2:RD - -X2:2 - - - - X1:3 - -3:OG - -X2:3 - - - - X1:4 - -4:YE - -X2:4 - - - -  + + + +W1 + +P/N: CAB1 + +CablesCo: ABC123 + +Cables R Us: 999-888-777 + +4x + +0.25 mm² + +1 m +  + X1:1 + +1:BN + +X2:1 + X1:2 + +2:RD + +X2:2 + X1:3 + +3:OG + +X2:3 + X1:4 + +4:YE + +X2:4 +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + - + X1:e--W1:w - - - - - - -X1:e--W1:w - - - + + + - + W2 - - - -W2 - -4x - -0.25 mm² - -1 m -  - X1:1 - -YE - -X3:1 - - - -P/N: WIRE1 -WiresCo: W1-YE -WireShack: 1001 - X1:2 - -BK - -X3:2 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 - X1:3 - -BK - -X3:3 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 - X1:4 - -RD - -X3:4 - - - -P/N: WIRE3 -WiresCo: W1-RD -WireShack: 1009 -  -1 -m -Sleeve, Braided nylon, black, 3mm -P/N: SLV-1 - + + + +W2 + +4x + +0.25 mm² + +1 m +  + X1:1 + +YE + +X3:1 +P/N: WIRE1 +WiresCo: W1-YE +WireShack: 1001 + X1:2 + +BK + +X3:2 +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 + X1:3 + +BK + +X3:3 +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 + X1:4 + +RD + +X3:4 +P/N: WIRE3 +WiresCo: W1-RD +WireShack: 1009 +  +1 +m +Sleeve, Braided nylon, black, 3mm +P/N: SLV-1 + + +X1:e--W2:w + + + + + + +X1:e--W2:w + + + + + + +X1:e--W2:w + + + + + + +X1:e--W2:w + + + + + -X1:e--W2:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W2:w - - - +W1:e--W1:w + + + - - -X1:e--W2:w - - - - - - -X1:e--W2:w - - - + + +W1:e--W1:w + + + - + X2 - - - -X2 - -P/N: CON4 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 -4 -x -Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 -1 -x -Test -P/N: ABC, Molex: 45454, Mousikey: 9999 - + + + +X2 + +P/N: CON4 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 +4 +x +Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 +1 +x +Test +P/N: ABC, Molex: 45454, Mousikey: 9999 + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 -4 -x -Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 -1 -x -Test -P/N: ABC, Molex: 45454, Mousikey: 9999 - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - + + + +X3 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 +4 +x +Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 +1 +x +Test +P/N: ABC, Molex: 45454, Mousikey: 9999 + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + diff --git a/tutorial/tutorial08.png b/tutorial/tutorial08.png index e1fb7bd..cc9aa77 100644 Binary files a/tutorial/tutorial08.png and b/tutorial/tutorial08.png differ diff --git a/tutorial/tutorial08.svg b/tutorial/tutorial08.svg index dcfa29a..67cc7ba 100644 --- a/tutorial/tutorial08.svg +++ b/tutorial/tutorial08.svg @@ -1,350 +1,382 @@ - - - - + + + X1 - - - -X1 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 -4 -x -Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 -1 -x -Test -P/N: ABC, Molex: 45454, Mousikey: 9999 - + + + +X1 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 +4 +x +Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 +1 +x +Test +P/N: ABC, Molex: 45454, Mousikey: 9999 + - + W1 - - - -W1 - -P/N: CAB1 - -CablesCo: ABC123 - -Cables R Us: 999-888-777 - -4x - -0.25 mm² - -1 m -  - X1:1 - -1:BN - -X2:1 - - - - X1:2 - -2:RD - -X2:2 - - - - X1:3 - -3:OG - -X2:3 - - - - X1:4 - -4:YE - -X2:4 - - - -  + + + +W1 + +P/N: CAB1 + +CablesCo: ABC123 + +Cables R Us: 999-888-777 + +4x + +0.25 mm² + +1 m +  + X1:1 + +1:BN + +X2:1 + X1:2 + +2:RD + +X2:2 + X1:3 + +3:OG + +X2:3 + X1:4 + +4:YE + +X2:4 +  X1:e--W1:w - - - + + + + + + +X1:e--W1:w + + + X1:e--W1:w - - - + + + - + X1:e--W1:w - - - - - - -X1:e--W1:w - - - + + + - + W2 - - - -W2 - -4x - -0.25 mm² - -1 m -  - X1:1 - -YE - -X3:1 - - - -P/N: WIRE1 -WiresCo: W1-YE -WireShack: 1001 - X1:2 - -BK - -X3:2 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 - X1:3 - -BK - -X3:3 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 - X1:4 - -RD - -X3:4 - - - -P/N: WIRE3 -WiresCo: W1-RD -WireShack: 1009 -  -1 -m -Sleeve, Braided nylon, black, 3mm -P/N: SLV-1 - + + + +W2 + +4x + +0.25 mm² + +1 m +  + X1:1 + +YE + +X3:1 +P/N: WIRE1 +WiresCo: W1-YE +WireShack: 1001 + X1:2 + +BK + +X3:2 +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 + X1:3 + +BK + +X3:3 +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 + X1:4 + +RD + +X3:4 +P/N: WIRE3 +WiresCo: W1-RD +WireShack: 1009 +  +1 +m +Sleeve, Braided nylon, black, 3mm +P/N: SLV-1 + + +X1:e--W2:w + + + + + + +X1:e--W2:w + + + + + + +X1:e--W2:w + + + + + + +X1:e--W2:w + + + + + -X1:e--W2:w - - - +W1:e--W1:w + + + - + + +W1:e--W1:w + + + + + -X1:e--W2:w - - - +W1:e--W1:w + + + - - -X1:e--W2:w - - - - - - -X1:e--W2:w - - - + + +W1:e--W1:w + + + - + X2 - - - -X2 - -P/N: CON4 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 -4 -x -Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 -1 -x -Test -P/N: ABC, Molex: 45454, Mousikey: 9999 - + + + +X2 + +P/N: CON4 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 +4 +x +Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 +1 +x +Test +P/N: ABC, Molex: 45454, Mousikey: 9999 + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + + + + +W2:e--W2:w + + + - + X3 - - - -X3 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 -4 -x -Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 -1 -x -Test -P/N: ABC, Molex: 45454, Mousikey: 9999 - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - - - - -W1:e--X2:w - - - + + + +X3 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 +4 +x +Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 +1 +x +Test +P/N: ABC, Molex: 45454, Mousikey: 9999 + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + - + W2:e--X3:w - - - + + + diff --git a/tutorial/tutorial08_wv_gvpr.gvpr b/tutorial/tutorial08_wv_gvpr.gvpr new file mode 100644 index 0000000..7bfced7 --- /dev/null +++ b/tutorial/tutorial08_wv_gvpr.gvpr @@ -0,0 +1,64 @@ +/******************************************************************* + + see https://forum.graphviz.org/t/straitening-one-line-throu-a-table/2196 and https://forum.graphviz.org/t/way-of-drawing-a-black-circle-inside-a-table-field/2273/12 + input must include pos values (must be output from one of the engines w/ -Tdot)# + Thanks to steveroush and FeRDNYC + +*******************************************************************/ +BEG_G{ + double x1,y1,x2,y2,x3,y3,x4,y4; + string ptSize, tok[int], pt[]; + int cnt, circ, i; + node_t aNode; + + circ=0; + +/*************************************** + $G.bb=""; + $G.nodesep=""; + $G.ranksep=""; + $G.splines="true"; +****************************************/ +} + +// This removes the label text but keeps the position +E[noLabel] { + $.label=""; // remove pesky label + // $.lp=""; // remove peskier label pos +} + +E[straight] { + cnt=tokens($.pos,tok," "); + $.oldpos=$.pos; + x1 = xOf(tok[0]); + y1 = yOf(tok[0]); + x4 = xOf(tok[cnt-1]); + y4 = yOf(tok[cnt-1]); + x2 = x1 + (x4-x1)/3.; + y2 = y1 + (y4-y1)/3.; + x3 = x1 + 2.*(x4-x1)/3.; + y3 = y1 + 2.*(y4-y1)/3.; + pos=sprintf("%.3f,%.3f %.3f,%.3f %.3f,%.3f %.3f,%.3f", x1,y1, x2,y2, x3,y3, x4,y4); + $.label=""; // remove pesky label + $.lp=""; // remove peskier label pos + + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ + // now we place point nodes at the edge ends + pt[1] = tok[0]; + pt[2] = tok[cnt-1]; + ptSize=$.addPTS; + for (pt[i]) { + if (i==2 && pt[1]==pt[2]) + continue; + aNode=node($G, "__CIRCLE__" + (string)++circ); + aNode.pos=pt[i]; + aNode.shape="point"; + aNode.width=ptSize; + aNode.height=ptSize; + aNode.style="filled"; + aNode.fillcolor=$.colorPTS; + aNode.color=$.colorPTS; + } + } + +} \ No newline at end of file