diff --git a/examples/demo01.gv b/examples/demo01.gv index fb0864c..0807e37 100644 --- a/examples/demo01.gv +++ b/examples/demo01.gv @@ -31,47 +31,38 @@ graph { - [] - [] - [] - [] - [] - [] - [] - [] - []
DCD1
RX2
TX3
DTR4
GND5
DSR6
RTS7
CTS8
RI9
@@ -109,17 +100,14 @@ graph { 1 GND - [] 2 RX - [] 3 TX - [] @@ -163,19 +151,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:RX @@ -185,19 +161,7 @@ graph { X2:3:TX - - - - - - - - - - - -
- + X1:3:TX @@ -207,19 +171,7 @@ graph { X2:2:RX - - - - - - - - - - - -
- +   @@ -232,13 +184,7 @@ graph { - - - - - -
- +   diff --git a/examples/demo01.html b/examples/demo01.html index c5b7de6..c7f5118 100644 --- a/examples/demo01.html +++ b/examples/demo01.html @@ -30,215 +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 - - - + + + 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 ba261aa..ecb239f 100644 Binary files a/examples/demo01.png and b/examples/demo01.png differ diff --git a/examples/demo01.svg b/examples/demo01.svg index d3a6e70..ac5a5ee 100644 --- a/examples/demo01.svg +++ b/examples/demo01.svg @@ -1,215 +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 - - - + + + 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/demo02.gv b/examples/demo02.gv index ab72806..bf10acc 100644 --- a/examples/demo02.gv +++ b/examples/demo02.gv @@ -31,42 +31,34 @@ graph { - [] - [] - [] - [] - [] - [] - [] - []
GND1
+5V2
SCL3
SDA4
MISO5
MOSI6
SCK7
N/C8
@@ -102,22 +94,18 @@ graph { 1 GND - [] 2 +5V - [] 3 SCL - [] 4 SDA - [] @@ -152,22 +140,18 @@ graph { 1 GND - [] 2 +5V - [] 3 SCL - [] 4 SDA - [] @@ -202,27 +186,22 @@ graph { 1 GND - [] 2 +12V - [] 3 MISO - [] 4 MOSI - [] 5 SCK - [] @@ -298,19 +277,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:+5V @@ -321,19 +288,7 @@ graph { X2:2:+5V - - - - - - - - - - - -
- + X1:3:SCL @@ -344,19 +299,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X1:4:SDA @@ -367,19 +310,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -442,19 +373,7 @@ graph { X3:1:GND - - - - - - - - - - - -
- + X1:2:+5V @@ -465,19 +384,7 @@ graph { X3:2:+5V - - - - - - - - - - - -
- + X1:3:SCL @@ -488,19 +395,7 @@ graph { X3:3:SCL - - - - - - - - - - - -
- + X1:4:SDA @@ -511,19 +406,7 @@ graph { X3:4:SDA - - - - - - - - - - - -
- +   @@ -586,19 +469,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + X1:5:MISO @@ -609,19 +480,7 @@ graph { X4:3:MISO - - - - - - - - - - - -
- + X1:6:MOSI @@ -632,19 +491,7 @@ graph { X4:4:MOSI - - - - - - - - - - - -
- + X1:7:SCK @@ -655,19 +502,7 @@ graph { X4:5:SCK - - - - - - - - - - - -
- +   @@ -729,19 +564,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + @@ -751,19 +574,7 @@ graph { X4:2:+12V - - - - - - - - - - - -
- +   diff --git a/examples/demo02.html b/examples/demo02.html index 34eb7b8..e2d3222 100644 --- a/examples/demo02.html +++ b/examples/demo02.html @@ -188,650 +188,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 - - - + + + 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 - - - + + + diff --git a/examples/demo02.png b/examples/demo02.png index 7987b7b..23d5ba2 100644 Binary files a/examples/demo02.png and b/examples/demo02.png differ diff --git a/examples/demo02.svg b/examples/demo02.svg index 53febbd..21e1d9d 100644 --- a/examples/demo02.svg +++ b/examples/demo02.svg @@ -1,650 +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 - - - + + + 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 - - - + + + diff --git a/examples/ex01.gv b/examples/ex01.gv index 5cd8dba..afa9d69 100644 --- a/examples/ex01.gv +++ b/examples/ex01.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
RX3
TX4
@@ -82,22 +78,18 @@ graph { 1 GND - [] 2 VCC - [] 3 RX - [] 4 TX - [] @@ -142,19 +134,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -164,19 +144,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:RX @@ -186,19 +154,7 @@ graph { X2:4:TX - - - - - - - - - - - -
- + X1:4:TX @@ -208,19 +164,7 @@ graph { X2:3:RX - - - - - - - - - - - -
- +   @@ -233,13 +177,7 @@ graph { - - - - - -
- +   diff --git a/examples/ex01.html b/examples/ex01.html index 3b66220..5073241 100644 --- a/examples/ex01.html +++ b/examples/ex01.html @@ -30,225 +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 - - - + + + 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 - -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 9b2ba89..b879deb 100644 Binary files a/examples/ex01.png and b/examples/ex01.png differ diff --git a/examples/ex01.svg b/examples/ex01.svg index bc80ee8..90a8851 100644 --- a/examples/ex01.svg +++ b/examples/ex01.svg @@ -1,225 +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 - - - + + + 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 - -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/ex02.gv b/examples/ex02.gv index 31266aa..3883286 100644 --- a/examples/ex02.gv +++ b/examples/ex02.gv @@ -31,12 +31,10 @@ graph { - [] - []
GND1
VCC2
@@ -72,12 +70,10 @@ graph { 1 GND - [] 2 VCC - [] @@ -112,12 +108,10 @@ graph { 1 GND - [] 2 VCC - [] @@ -152,12 +146,10 @@ graph { 1 GND - [] 2 VCC - [] @@ -200,19 +192,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -222,19 +202,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- +   @@ -288,19 +256,7 @@ graph { X3:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -310,19 +266,7 @@ graph { X3:2:VCC - - - - - - - - - - - -
- +   @@ -376,19 +320,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -398,19 +330,7 @@ graph { X4:2:VCC - - - - - - - - - - - -
- +   diff --git a/examples/ex02.html b/examples/ex02.html index 9ae0af6..85b8c0c 100644 --- a/examples/ex02.html +++ b/examples/ex02.html @@ -30,322 +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 + + + +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 99b3ee2..d956acc 100644 Binary files a/examples/ex02.png and b/examples/ex02.png differ diff --git a/examples/ex02.svg b/examples/ex02.svg index 6ecc706..d02eaf0 100644 --- a/examples/ex02.svg +++ b/examples/ex02.svg @@ -1,322 +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 + + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + diff --git a/examples/ex03.gv b/examples/ex03.gv index d5612d0..ac04b09 100644 --- a/examples/ex03.gv +++ b/examples/ex03.gv @@ -31,12 +31,10 @@ graph { - [] - []
GND1
VCC2
@@ -72,12 +70,10 @@ graph { 1 GND - [] 2 VCC - [] @@ -112,12 +108,10 @@ graph { 1 GND - [] 2 VCC - [] @@ -152,12 +146,10 @@ graph { 1 GND - [] 2 VCC - [] @@ -201,19 +193,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -224,19 +204,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:1:GND @@ -247,19 +215,7 @@ graph { X3:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -270,19 +226,7 @@ graph { X3:2:VCC - - - - - - - - - - - -
- + X1:1:GND @@ -293,19 +237,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -316,19 +248,7 @@ graph { X4:2:VCC - - - - - - - - - - - -
- +   diff --git a/examples/ex03.html b/examples/ex03.html index 0e74ab4..54c0b31 100644 --- a/examples/ex03.html +++ b/examples/ex03.html @@ -30,290 +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 - - - + + + W1: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 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 + + + +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 33bfd87..c0fd15e 100644 Binary files a/examples/ex03.png and b/examples/ex03.png differ diff --git a/examples/ex03.svg b/examples/ex03.svg index f36a6c6..d293c0c 100644 --- a/examples/ex03.svg +++ b/examples/ex03.svg @@ -1,290 +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 - - - + + + W1: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 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 + + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC W1:e--X4:w - - - + + + W1:e--X4:w - - - + + + diff --git a/examples/ex04.gv b/examples/ex04.gv index 8a12222..ecd1acc 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 { - - - - - - - - - - - -
- +   diff --git a/examples/ex04.html b/examples/ex04.html index 2d09196..e5650ea 100644 --- a/examples/ex04.html +++ b/examples/ex04.html @@ -30,298 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + AUTOGENERATED_F_7 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_7:w - - - + + + AUTOGENERATED_F_8 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_8:w - - - + + + AUTOGENERATED_F_9 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_9:w - - - + + + AUTOGENERATED_F_10 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_10:w - - - + + + AUTOGENERATED_F_11 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_11:w - - - + + + AUTOGENERATED_F_12 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_12:w - - - + + + AUTOGENERATED_F_2 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_2:e--W1:w - - - + + + AUTOGENERATED_F_3 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_3:e--W1:w - - - + + + AUTOGENERATED_F_4 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_4:e--W1:w - - - + + + AUTOGENERATED_F_5 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_5:e--W1:w - - - + + + AUTOGENERATED_F_6 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_6:e--W1:w - - - + + + diff --git a/examples/ex04.png b/examples/ex04.png index 55d6c26..58571db 100644 Binary files a/examples/ex04.png and b/examples/ex04.png differ diff --git a/examples/ex04.svg b/examples/ex04.svg index 16322a3..bf7d0c6 100644 --- a/examples/ex04.svg +++ b/examples/ex04.svg @@ -1,298 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + AUTOGENERATED_F_7 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_7:w - - - + + + AUTOGENERATED_F_8 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_8:w - - - + + + AUTOGENERATED_F_9 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_9:w - - - + + + AUTOGENERATED_F_10 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_10:w - - - + + + AUTOGENERATED_F_11 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_11:w - - - + + + AUTOGENERATED_F_12 - - - -Crimp ferrule + + + +Crimp ferrule W1:e--AUTOGENERATED_F_12:w - - - + + + AUTOGENERATED_F_2 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_2:e--W1:w - - - + + + AUTOGENERATED_F_3 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_3:e--W1:w - - - + + + AUTOGENERATED_F_4 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_4:e--W1:w - - - + + + AUTOGENERATED_F_5 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_5:e--W1:w - - - + + + AUTOGENERATED_F_6 - - - -Crimp ferrule + + + +Crimp ferrule AUTOGENERATED_F_6:e--W1:w - - - + + + diff --git a/examples/ex05.gv b/examples/ex05.gv index c8aeb64..9f64b2a 100644 --- a/examples/ex05.gv +++ b/examples/ex05.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -82,25 +78,21 @@ graph { 1 GND - [] 1 2 VCC - [] 2 3 SCL - [] 3 4 SDA - [] 4 @@ -136,22 +128,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -196,19 +184,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -219,19 +195,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:SCL @@ -242,19 +206,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X1:4:SDA @@ -265,19 +217,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -341,19 +281,7 @@ graph { X3:1:GND - - - - - - - - - - - -
- + X2:2:VCC @@ -364,19 +292,7 @@ graph { X3:2:VCC - - - - - - - - - - - -
- + X2:3:SCL @@ -387,19 +303,7 @@ graph { X3:3:SCL - - - - - - - - - - - -
- + X2:4:SDA @@ -410,19 +314,7 @@ graph { X3:4:SDA - - - - - - - - - - - -
- +   diff --git a/examples/ex05.html b/examples/ex05.html index 26958bd..469fd7b 100644 --- a/examples/ex05.html +++ b/examples/ex05.html @@ -30,378 +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 - - - + + + 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 - -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 - - - -  + + + +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 + + + +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 21446f9..fddc759 100644 Binary files a/examples/ex05.png and b/examples/ex05.png differ diff --git a/examples/ex05.svg b/examples/ex05.svg index 1f6cd13..b6dd55c 100644 --- a/examples/ex05.svg +++ b/examples/ex05.svg @@ -1,378 +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 - - - + + + 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 - -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 - - - -  + + + +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 + + + +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/ex06.gv b/examples/ex06.gv index 85b8618..0f3a40b 100644 --- a/examples/ex06.gv +++ b/examples/ex06.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -82,22 +78,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -131,22 +123,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -182,22 +170,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -231,22 +215,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -282,22 +262,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -341,19 +317,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -364,19 +328,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:SCL @@ -387,19 +339,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X1:4:SDA @@ -410,19 +350,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -485,19 +413,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X3:2:VCC @@ -508,19 +424,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X3:3:SCL @@ -531,19 +435,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X3:4:SDA @@ -554,19 +446,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -629,19 +509,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + X3:2:VCC @@ -652,19 +520,7 @@ graph { X4:2:VCC - - - - - - - - - - - -
- + X3:3:SCL @@ -675,19 +531,7 @@ graph { X4:3:SCL - - - - - - - - - - - -
- + X3:4:SDA @@ -698,19 +542,7 @@ graph { X4:4:SDA - - - - - - - - - - - -
- +   @@ -773,19 +605,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + X5:2:VCC @@ -796,19 +616,7 @@ graph { X4:2:VCC - - - - - - - - - - - -
- + X5:3:SCL @@ -819,19 +627,7 @@ graph { X4:3:SCL - - - - - - - - - - - -
- + X5:4:SDA @@ -842,19 +638,7 @@ graph { X4:4:SDA - - - - - - - - - - - -
- +   @@ -917,19 +701,7 @@ graph { X6:1:GND - - - - - - - - - - - -
- + X5:2:VCC @@ -940,19 +712,7 @@ graph { X6:2:VCC - - - - - - - - - - - -
- + X5:3:SCL @@ -963,19 +723,7 @@ graph { X6:3:SCL - - - - - - - - - - - -
- + X5:4:SDA @@ -986,19 +734,7 @@ graph { X6:4:SDA - - - - - - - - - - - -
- +   diff --git a/examples/ex06.html b/examples/ex06.html index e4d5e1f..b264d72 100644 --- a/examples/ex06.html +++ b/examples/ex06.html @@ -30,852 +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 - - - + + + 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 - -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 - - - -  + + + +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 - - - + + + W2:e--X2:w - - - + + + W2:e--X2: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 + + + +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 c0184b7..ee05c8a 100644 Binary files a/examples/ex06.png and b/examples/ex06.png differ diff --git a/examples/ex06.svg b/examples/ex06.svg index 60ef043..540e621 100644 --- a/examples/ex06.svg +++ b/examples/ex06.svg @@ -1,852 +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 - - - + + + 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 - -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 - - - -  + + + +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 - - - + + + W2:e--X2:w - - - + + + W2:e--X2: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 + + + +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/ex07.gv b/examples/ex07.gv index c1999cc..489757a 100644 --- a/examples/ex07.gv +++ b/examples/ex07.gv @@ -31,12 +31,10 @@ graph { - [] - []
5
6
@@ -81,12 +79,10 @@ graph { 2 - [] 7 - [] @@ -138,19 +134,7 @@ graph { X2:7 - - - - - - - - - - - -
- + X1:6 @@ -160,19 +144,7 @@ graph { X2:2 - - - - - - - - - - - -
- +   diff --git a/examples/ex07.html b/examples/ex07.html index af09a6d..20db388 100644 --- a/examples/ex07.html +++ b/examples/ex07.html @@ -30,126 +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 4a8eebe..c5181f2 100644 Binary files a/examples/ex07.png and b/examples/ex07.png differ diff --git a/examples/ex07.svg b/examples/ex07.svg index 594abd2..e82a940 100644 --- a/examples/ex07.svg +++ b/examples/ex07.svg @@ -1,126 +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/ex08.gv b/examples/ex08.gv index 2042606..8de429c 100644 --- a/examples/ex08.gv +++ b/examples/ex08.gv @@ -30,17 +30,14 @@ graph { - [] - [] - []
DotT
DashR
GroundS
@@ -50,7 +47,7 @@ graph { - +
@@ -105,19 +102,7 @@ graph { - - - - - - - - - - - -
- + Key:R:Dash @@ -127,19 +112,7 @@ graph { - - - - - - - - - - - -
- + Key:T:Dot @@ -149,19 +122,7 @@ graph { - - - - - - - - - - - -
- +   @@ -174,19 +135,7 @@ graph { - - - - - - - - - - - -
- +   @@ -201,7 +150,7 @@ graph { - +
diff --git a/examples/ex08.html b/examples/ex08.html index 1bf1499..0d04f55 100644 --- a/examples/ex08.html +++ b/examples/ex08.html @@ -30,155 +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 7318111..d6a7495 100644 Binary files a/examples/ex08.png and b/examples/ex08.png differ diff --git a/examples/ex08.svg b/examples/ex08.svg index 9e448f8..6f38ee3 100644 --- a/examples/ex08.svg +++ b/examples/ex08.svg @@ -1,155 +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/ex09.gv b/examples/ex09.gv index f5decb9..6a3eae2 100644 --- a/examples/ex09.gv +++ b/examples/ex09.gv @@ -31,67 +31,54 @@ graph { - [] - [] - [] - [] - [] - [] - [] - [] - [] - [] - [] - [] - []
SENSE_P_11
SENSE_N_114
SENSE_P_23
SENSE_N_216
SENSE_P_35
SENSE_N_318
SENSE_P_47
SENSE_N_420
SENSE_P_59
SENSE_N_522
SENSE_P_611
SENSE_N_624
GND13
@@ -127,242 +114,194 @@ graph { 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 - [] @@ -406,25 +345,7 @@ graph { X2:z2 - - - - - - - - - - - - - - - - - -
- + X1:1:SENSE_P_1 @@ -434,25 +355,7 @@ graph { X2:d4 - - - - - - - - - - - - - - - - - -
- + X1:16:SENSE_N_2 @@ -462,25 +365,7 @@ graph { X2:z8 - - - - - - - - - - - - - - - - - -
- + X1:3:SENSE_P_2 @@ -490,25 +375,7 @@ graph { X2:d10 - - - - - - - - - - - - - - - - - -
- + X1:18:SENSE_N_3 @@ -518,25 +385,7 @@ graph { X2:z14 - - - - - - - - - - - - - - - - - -
- + X1:5:SENSE_P_3 @@ -546,25 +395,7 @@ graph { X2:d16 - - - - - - - - - - - - - - - - - -
- + X1:20:SENSE_N_4 @@ -574,25 +405,7 @@ graph { X2:z18 - - - - - - - - - - - - - - - - - -
- + X1:7:SENSE_P_4 @@ -602,25 +415,7 @@ graph { X2:d20 - - - - - - - - - - - - - - - - - -
- + X1:22:SENSE_N_5 @@ -630,25 +425,7 @@ graph { X2:z24 - - - - - - - - - - - - - - - - - -
- + X1:9:SENSE_P_5 @@ -658,25 +435,7 @@ graph { X2:d26 - - - - - - - - - - - - - - - - - -
- + X1:24:SENSE_N_6 @@ -686,25 +445,7 @@ graph { X2:z30 - - - - - - - - - - - - - - - - - -
- + X1:11:SENSE_P_6 @@ -714,25 +455,7 @@ graph { X2:d32 - - - - - - - - - - - - - - - - - -
- +   @@ -745,13 +468,7 @@ graph { - - - - - -
- +   diff --git a/examples/ex09.html b/examples/ex09.html index d7a02bf..82e2667 100644 --- a/examples/ex09.html +++ b/examples/ex09.html @@ -30,667 +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 - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1: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 - -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 0ba0c37..dedb611 100644 Binary files a/examples/ex09.png and b/examples/ex09.png differ diff --git a/examples/ex09.svg b/examples/ex09.svg index 35fc6eb..e4b3e4f 100644 --- a/examples/ex09.svg +++ b/examples/ex09.svg @@ -1,667 +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 - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1: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 - -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/ex10.gv b/examples/ex10.gv index f2cd7c0..ad072bf 100644 --- a/examples/ex10.gv +++ b/examples/ex10.gv @@ -31,42 +31,34 @@ graph { - [] - [] - [] - [] - [] - [] - [] - []
DA+1
DA-2
DB+3
DC+4
DC-5
DB-6
DD+7
DD-8
@@ -102,42 +94,34 @@ graph { 1 DB+ - [] 2 DB- - [] 3 DA+ - [] 4 DD+ - [] 5 DD- - [] 6 DA- - [] 7 DC+ - [] 8 DC- - [] @@ -181,25 +165,7 @@ graph { X2:3:DA+ - - - - - - - - - - - - - - - - - -
- + X1:2:DA- @@ -209,25 +175,7 @@ graph { X2:6:DA- - - - - - - - - - - - - - - - - - -
- + X1:3:DB+ @@ -237,25 +185,7 @@ graph { X2:1:DB+ - - - - - - - - - - - - - - - - - -
- + X1:4:DC+ @@ -265,25 +195,7 @@ graph { X2:7:DC+ - - - - - - - - - - - - - - - - - -
- + X1:5:DC- @@ -293,25 +205,7 @@ graph { X2:8:DC- - - - - - - - - - - - - - - - - - -
- + X1:6:DB- @@ -321,25 +215,7 @@ graph { X2:2:DB- - - - - - - - - - - - - - - - - - -
- + X1:7:DD+ @@ -349,25 +225,7 @@ graph { X2:4:DD+ - - - - - - - - - - - - - - - - - -
- + X1:8:DD- @@ -377,25 +235,7 @@ graph { X2:5:DD- - - - - - - - - - - - - - - - - - -
- +   diff --git a/examples/ex10.html b/examples/ex10.html index b70f9b6..e0e3ee7 100644 --- a/examples/ex10.html +++ b/examples/ex10.html @@ -30,418 +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 - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1: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 - -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 c5d4cb3..fd17ea7 100644 Binary files a/examples/ex10.png and b/examples/ex10.png differ diff --git a/examples/ex10.svg b/examples/ex10.svg index 903c871..cacfdd3 100644 --- a/examples/ex10.svg +++ b/examples/ex10.svg @@ -1,418 +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 - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1:e--W1:w - - - - - + + + + + W1: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 - -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/ex11.gv b/examples/ex11.gv index 0cdcce9..8a7fbbd 100644 --- a/examples/ex11.gv +++ b/examples/ex11.gv @@ -94,22 +94,18 @@ graph {
1 A - []
2 B - []
3 C - []
4 D - []
@@ -152,19 +148,7 @@ graph {
- -
- - - - - - - - - -
- + @@ -174,19 +158,7 @@ graph { - - - - - - - - - - - -
- + @@ -196,19 +168,7 @@ graph { - - - - - - - - - - - -
- + @@ -218,19 +178,7 @@ graph { - - - - - - - - - - - -
- +   diff --git a/examples/ex11.html b/examples/ex11.html index c73befb..6e018c7 100644 --- a/examples/ex11.html +++ b/examples/ex11.html @@ -30,222 +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 1d970a8..e9f0a85 100644 Binary files a/examples/ex11.png and b/examples/ex11.png differ diff --git a/examples/ex11.svg b/examples/ex11.svg index 23775b7..330ed03 100644 --- a/examples/ex11.svg +++ b/examples/ex11.svg @@ -1,222 +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/ex12.gv b/examples/ex12.gv index c0cbbb8..a94fdd7 100644 --- a/examples/ex12.gv +++ b/examples/ex12.gv @@ -34,27 +34,22 @@ graph {
1 - []
2 - []
3 - []
4 - []
5 - []
@@ -90,27 +85,22 @@ graph { - [] - [] - [] - [] - []
1
2
3
4
5
@@ -154,19 +144,7 @@ graph { X1:1 - - - - - - - - - - - -
- + @@ -177,19 +155,7 @@ graph { X1:2 - - - - - - - - - - - -
- + @@ -200,19 +166,7 @@ graph { X1:3 - - - - - - - - - - - -
- + @@ -223,19 +177,7 @@ graph { X1:4 - - - - - - - - - - - -
- +   @@ -293,19 +235,7 @@ graph { - - - - - - - - - - - -
- + X2:2 @@ -316,19 +246,7 @@ graph { - - - - - - - - - - - -
- + X2:3 @@ -339,19 +257,7 @@ graph { - - - - - - - - - - - -
- + X2:4 @@ -362,19 +268,7 @@ graph { - - - - - - - - - - - -
- +   diff --git a/examples/ex12.html b/examples/ex12.html index 5d4b2da..d961dc9 100644 --- a/examples/ex12.html +++ b/examples/ex12.html @@ -30,278 +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 - - - + + + W2:e--W2:w - - - + + + W2: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 dcaddbe..a21bc61 100644 Binary files a/examples/ex12.png and b/examples/ex12.png differ diff --git a/examples/ex12.svg b/examples/ex12.svg index f1f5402..b291fe7 100644 --- a/examples/ex12.svg +++ b/examples/ex12.svg @@ -1,278 +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 - - - + + + W2:e--W2:w - - - + + + W2: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/ex13.gv b/examples/ex13.gv index 2ea10dd..05854c3 100644 --- a/examples/ex13.gv +++ b/examples/ex13.gv @@ -29,22 +29,18 @@ graph { - [] - [] - [] - []
A1
B2
C3
D4
@@ -130,22 +126,18 @@ graph { 1 A - [] 2 B - [] 3 C - [] 4 D - [] @@ -178,22 +170,18 @@ graph { 1 A - [] 2 B - [] 3 C - [] 4 D - [] @@ -234,19 +222,7 @@ graph { F1 - - - - - - - - - - - -
- + X1:2:B @@ -256,19 +232,7 @@ graph { F2 - - - - - - - - - - - -
- + X1:3:C @@ -278,19 +242,7 @@ graph { F3 - - - - - - - - - - - -
- + X1:4:D @@ -300,19 +252,7 @@ graph { F4 - - - - - - - - - - - -
- +   @@ -372,19 +312,7 @@ graph { X2:1:A - - - - - - - - - - - -
- + F2 @@ -394,19 +322,7 @@ graph { X2:2:B - - - - - - - - - - - -
- + F3 @@ -416,19 +332,7 @@ graph { X2:3:C - - - - - - - - - - - -
- + F4 @@ -438,19 +342,7 @@ graph { X2:4:D - - - - - - - - - - - -
- +   @@ -510,19 +402,7 @@ graph { X3:1:A - - - - - - - - - - - -
- + F2 @@ -532,19 +412,7 @@ graph { X3:2:B - - - - - - - - - - - -
- + F3 @@ -554,19 +422,7 @@ graph { X3:3:C - - - - - - - - - - - -
- + F4 @@ -576,19 +432,7 @@ graph { X3:4:D - - - - - - - - - - - -
- +   diff --git a/examples/ex13.html b/examples/ex13.html index 6845682..b0e9e31 100644 --- a/examples/ex13.html +++ b/examples/ex13.html @@ -30,506 +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 - - - + + + C1:e--C1:w - - - + + + C1:e--C1:w - - - + + + C1:e--C1:w - - - + + + C1:e--C1:w - - - + + + F1 - - - -ferrule + + + +ferrule C1:e--F1:w - - - + + + F2 - - - -ferrule + + + +ferrule C1:e--F2:w - - - + + + F3 - - - -ferrule + + + +ferrule C1:e--F3:w - - - + + + F4 - - - -ferrule + + + +ferrule 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 - - - -  + + + +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 - - - -  + + + +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: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 + + + +X2 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2: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 + + + +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 6261f94..52757e8 100644 Binary files a/examples/ex13.png and b/examples/ex13.png differ diff --git a/examples/ex13.svg b/examples/ex13.svg index 2bbb64f..bdc029c 100644 --- a/examples/ex13.svg +++ b/examples/ex13.svg @@ -1,506 +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 - - - + + + C1:e--C1:w - - - + + + C1:e--C1:w - - - + + + C1:e--C1:w - - - + + + C1:e--C1:w - - - + + + F1 - - - -ferrule + + + +ferrule C1:e--F1:w - - - + + + F2 - - - -ferrule + + + +ferrule C1:e--F2:w - - - + + + F3 - - - -ferrule + + + +ferrule C1:e--F3:w - - - + + + F4 - - - -ferrule + + + +ferrule 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 - - - -  + + + +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 - - - -  + + + +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: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 + + + +X2 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2: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 + + + +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/ex14.gv b/examples/ex14.gv index 875f1b1..72e968b 100644 --- a/examples/ex14.gv +++ b/examples/ex14.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
A1
B2
C3
D4
@@ -202,22 +198,18 @@ graph { 1 A - [] 2 B - [] 3 C - [] 4 D - [] @@ -251,22 +243,18 @@ graph { - [] - [] - [] - []
A1
B2
C3
D4
@@ -363,22 +351,18 @@ graph { 1 W - [] 2 X - [] 3 Y - [] 4 Z - [] @@ -420,19 +404,7 @@ graph { - - - - - - - - - - - -
- + X1:3:C @@ -442,19 +414,7 @@ graph { - - - - - - - - - - - -
- + X1:2:B @@ -464,19 +424,7 @@ graph { S1 - - - - - - - - - - - -
- + X1:1:A @@ -486,19 +434,7 @@ graph { - - - - - - - - - - - -
- +   @@ -559,19 +495,7 @@ graph { - - - - - - - - - - - -
- + @@ -581,19 +505,7 @@ graph { - - - - - - - - - - - -
- + S1 @@ -603,19 +515,7 @@ graph { - - - - - - - - - - - -
- + @@ -625,19 +525,7 @@ graph { - - - - - - - - - - - -
- +   @@ -698,19 +586,7 @@ graph { X2:1:A - - - - - - - - - - - -
- + @@ -720,19 +596,7 @@ graph { X2:2:B - - - - - - - - - - - -
- + @@ -742,19 +606,7 @@ graph { X2:3:C - - - - - - - - - - - -
- + @@ -764,19 +616,7 @@ graph { X2:4:D - - - - - - - - - - - -
- +   @@ -837,19 +677,7 @@ graph { - - - - - - - - - - - -
- + X3:2:B @@ -859,19 +687,7 @@ graph { - - - - - - - - - - - -
- + X3:3:C @@ -881,19 +697,7 @@ graph { - - - - - - - - - - - -
- + X3:4:D @@ -903,19 +707,7 @@ graph { - - - - - - - - - - - -
- +   @@ -967,19 +759,7 @@ graph { X2:4:D - - - - - - - - - - - -
- +   diff --git a/examples/ex14.html b/examples/ex14.html index d31f804..2875536 100644 --- a/examples/ex14.html +++ b/examples/ex14.html @@ -30,870 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + AUTOGENERATED_S_1 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--AUTOGENERATED_S_1:w - - - + + + AUTOGENERATED_S_2 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--AUTOGENERATED_S_2:w - - - + + + S1 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--S1:w - - - + + + AUTOGENERATED_S_3 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--AUTOGENERATED_S_3:w - - - + + + W2 - - - -W2 - -4x - -0.1 m -  - - -1:WH - - - - - - - -2:BN - - - - - - S1 - -3:GN - - - - - - - -4:YE - - - - - -  + + + +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 - - - -  + + + +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 - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_4:w - - - + + + AUTOGENERATED_S_5 - - - -Splice - -CU - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_5:w - - - + + + AUTOGENERATED_S_6 - - - -Splice - -CU - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_6:w - - - + + + AUTOGENERATED_S_7 - - - -Splice - -CU - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_7: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 + +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:e--W21: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 + + + +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 + + + +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 - - - - - -  + + + +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 - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_1:w - - - + + + AUTOGENERATED_F_2 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_2:w - - - + + + AUTOGENERATED_F_3 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_3:w - - - + + + AUTOGENERATED_F_4 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_4:w - - - + + + X4 - - - -X4 - -Screw terminal connector - -4-pin - -GN - - - -1 - -W - -2 - -X - -3 - -Y - -4 - -Z + + + +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 5f3ea55..223d084 100644 Binary files a/examples/ex14.png and b/examples/ex14.png differ diff --git a/examples/ex14.svg b/examples/ex14.svg index 27c6bfc..77ada26 100644 --- a/examples/ex14.svg +++ b/examples/ex14.svg @@ -1,870 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + AUTOGENERATED_S_1 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--AUTOGENERATED_S_1:w - - - + + + AUTOGENERATED_S_2 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--AUTOGENERATED_S_2:w - - - + + + S1 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--S1:w - - - + + + AUTOGENERATED_S_3 - - - -Splice - -CU - - + + + +Splice + +CU + + W1:e--AUTOGENERATED_S_3:w - - - + + + W2 - - - -W2 - -4x - -0.1 m -  - - -1:WH - - - - - - - -2:BN - - - - - - S1 - -3:GN - - - - - - - -4:YE - - - - - -  + + + +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 - - - -  + + + +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 - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_4:w - - - + + + AUTOGENERATED_S_5 - - - -Splice - -CU - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_5:w - - - + + + AUTOGENERATED_S_6 - - - -Splice - -CU - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_6:w - - - + + + AUTOGENERATED_S_7 - - - -Splice - -CU - - + + + +Splice + +CU + + W2:e--AUTOGENERATED_S_7: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 + +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:e--W21: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 + + + +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 + + + +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 - - - - - -  + + + +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 - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_1:w - - - + + + AUTOGENERATED_F_2 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_2:w - - - + + + AUTOGENERATED_F_3 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_3:w - - - + + + AUTOGENERATED_F_4 - - - -Ferrule - -GY - - + + + +Ferrule + +GY + + W3:e--AUTOGENERATED_F_4:w - - - + + + X4 - - - -X4 - -Screw terminal connector - -4-pin - -GN - - - -1 - -W - -2 - -X - -3 - -Y - -4 - -Z + + + +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/ex15.gv b/examples/ex15.gv index bbe9924..aa43e0d 100644 --- a/examples/ex15.gv +++ b/examples/ex15.gv @@ -222,25 +222,7 @@ graph { X2:1:GND
- -
- - - - - - - - - - - - - - - -
- + X1:2:VCC @@ -250,25 +232,7 @@ graph { X2:2:VCC - - - - - - - - - - - - - - - - - -
- + X1:3:RX @@ -278,25 +242,7 @@ graph { X2:4:TX - - - - - - - - - - - - - - - - - -
- + X1:4:TX @@ -306,25 +252,7 @@ graph { X2:3:RX - - - - - - - - - - - - - - - - - -
- +   @@ -337,13 +265,7 @@ graph { - - - - - -
- +   diff --git a/examples/ex15.html b/examples/ex15.html index 1e99532..9927d96 100644 --- a/examples/ex15.html +++ b/examples/ex15.html @@ -30,432 +30,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 + +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 - - - -  + + + +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 - - + + + +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.png b/examples/ex15.png index 621ab24..6fb8362 100644 Binary files a/examples/ex15.png and b/examples/ex15.png differ diff --git a/examples/ex15.svg b/examples/ex15.svg index 8c63e61..767ce89 100644 --- a/examples/ex15.svg +++ b/examples/ex15.svg @@ -1,432 +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 + +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 - - - -  + + + +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 - - + + + +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/ex16.gv b/examples/ex16.gv index e596b8e..79c0b03 100644 --- a/examples/ex16.gv +++ b/examples/ex16.gv @@ -31,37 +31,30 @@ graph { - [] - [] - [] - [] - [] - [] - []
GND1
VCC2
RX3
TX4
GND5
VCC6
GND7
@@ -131,37 +124,30 @@ graph { 1 GND - [] 2 VCC - [] 3 RX - [] 4 TX - [] 5 GND - [] 6 VCC - [] 7 GND - [] @@ -228,19 +214,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -250,19 +224,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:RX @@ -272,19 +234,7 @@ graph { X2:4:TX - - - - - - - - - - - -
- + X1:4:TX @@ -294,19 +244,7 @@ graph { X2:3:RX - - - - - - - - - - - -
- +   @@ -319,13 +257,7 @@ graph { - - - - - -
- +   diff --git a/examples/ex16.html b/examples/ex16.html index dbba737..1873c39 100644 --- a/examples/ex16.html +++ b/examples/ex16.html @@ -30,296 +30,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 + +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 - - - -  + + + +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 - + + + +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.png b/examples/ex16.png index aa92e16..05863bc 100644 Binary files a/examples/ex16.png and b/examples/ex16.png differ diff --git a/examples/ex16.svg b/examples/ex16.svg index afe273c..dc1bacc 100644 --- a/examples/ex16.svg +++ b/examples/ex16.svg @@ -1,296 +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 + +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 - - - -  + + + +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 - + + + +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/src/wireviz/wv_graphviz.py b/src/wireviz/wv_graphviz.py index 1e91250..7500b71 100644 --- a/src/wireviz/wv_graphviz.py +++ b/src/wireviz/wv_graphviz.py @@ -263,20 +263,21 @@ def nested_table_dict(d: dict) -> Table: def gv_shorts_info_row(component) -> Tr: shorts_info = [] if component.ports_left: - shorts_info.append(Td(f'')) + shorts_info.append(Td(f"")) if component.pinlabels: - shorts_info.append(Td(f'')) + shorts_info.append(Td(f"")) for short in component.shorts: - shorts_info.append(Td(f'{short}')) + shorts_info.append(Td(f"{short}")) if component.ports_right: - shorts_info.append(Td(f'')) + shorts_info.append(Td(f"")) return Tr(shorts_info) + def gv_pin_table(component) -> Table: pin_rows = [] - + if len(component.shorts) > 0 and not component.shorts_hide_lable: pin_rows.append(gv_shorts_info_row(component)) @@ -291,13 +292,13 @@ def gv_pin_table(component) -> Table: def gv_short_row_part(pin, connector) -> List: - short_row = []# Td("ADA"), Td("DAD") + short_row = [] # Td("ADA"), Td("DAD") for short, shPins in connector.shorts.items(): - if pin.index+1 in shPins: + if pin.index + 1 in shPins: short_row.append(Td("", port=f"p{pin.index+1}j")) else: short_row.append(Td("")) - return short_row + return short_row if len(short_row) > 0 else None def gv_pin_row(pin, connector) -> Tr: @@ -324,7 +325,7 @@ def gv_connector_loops(connector: Connector) -> List: loop_dir = "e" else: raise Exception("No side for loops") - + for loop, loPins in connector.loops.items(): comp = getAddCompFromRef(loop, connector) loColor = "#000000" @@ -354,7 +355,6 @@ def gv_connector_shorts(connector: Connector) -> List: return short_edges - def gv_conductor_table(cable) -> Table: rows = [] rows.append(Tr(Td(" "))) # spacer row on top @@ -417,39 +417,25 @@ def gv_conductor_table(cable) -> Table: def gv_wire_cell(wire: Union[WireClass, ShieldClass], colspan: int) -> Td: - if wire.color: - color_list = ["#000000"] + wire.color.html_padded_list + ["#000000"] - else: - color_list = ["#000000"] - - wire_inner_rows = [] - for j, bgcolor in enumerate(color_list[::-1]): - wire_inner_cell_attribs = { - "bgcolor": "#FFFFFF", # bgcolor if bgcolor != "" else "#000000", # TODO: More elegent solution for making black/whit space needed, since the wire is drawn as an actual edge - "border": 0, - "cellpadding": 0, - "colspan": colspan, - "height": 2, - } - wire_inner_rows.append(Tr(Td("", **wire_inner_cell_attribs))) - wire_inner_table = Table(wire_inner_rows, border=0, cellborder=0, cellspacing=0) wire_outer_cell_attribs = { "border": 0, "cellspacing": 0, "cellpadding": 0, "colspan": colspan, - "height": 2 * len(color_list), + "height": 6, "port": f"w{wire.index+1}", } # ports in GraphViz are 1-indexed for more natural maping to pin/wire numbers - wire_outer_cell = Td(wire_inner_table, **wire_outer_cell_attribs) + wire_outer_cell = Td(None, **wire_outer_cell_attribs) return wire_outer_cell - dot.attr("edge", headclip="true", tailclip="true", style="bold") # TODO: ? + dot.attr("edge", headclip="true", tailclip="true", style="bold") # TODO: ? - # color, l1, l2, r1, r2 -def gv_edge_wire(harness, cable, connection) -> Tuple[str, str, str, str, str]: + # color, l1, l2, r1, r2 + + +def gv_edge_wire(harness, cable, connection) -> Tuple[str, str, str, str, str]: if connection.via.color: # check if it's an actual wire and not a shield color = f"#000000:{connection.via.color.html_padded}:#000000" @@ -481,14 +467,16 @@ def gv_edge_wire(harness, cable, connection) -> Tuple[str, str, str, str, str] return color, code_left_1, code_left_2, code_right_1, code_right_2 - # color, we, ww, -def gv_edge_wire_inside(cable) -> List[Tuple[str, str, str]]: + # color, we, ww, + + +def gv_edge_wire_inside(cable) -> List[Tuple[str, str, str]]: wires = [] # print(cable.wire_objects) for wire in cable.wire_objects.values(): color = "#000000" if wire.color: - # check if it's an actual wire and not a shield + # check if it's an actual wire and not a shield color = f"#000000:{wire.color.html_padded}:#000000" else: # it's a shield connection color = "#000000" diff --git a/tutorial/tutorial01.gv b/tutorial/tutorial01.gv index 3e34300..b4d9902 100644 --- a/tutorial/tutorial01.gv +++ b/tutorial/tutorial01.gv @@ -29,22 +29,18 @@ graph { - [] - [] - [] - []
1
2
3
4
@@ -78,22 +74,18 @@ graph { 1 - [] 2 - [] 3 - [] 4 - [] @@ -135,13 +127,7 @@ graph { X2:1 - - - - - -
- + X1:2 @@ -151,13 +137,7 @@ graph { X2:2 - - - - - -
- + X1:3 @@ -167,13 +147,7 @@ graph { X2:3 - - - - - -
- + X1:4 @@ -183,13 +157,7 @@ graph { X2:4 - - - - - -
- +   diff --git a/tutorial/tutorial01.html b/tutorial/tutorial01.html index daad3d2..4c14b92 100644 --- a/tutorial/tutorial01.html +++ b/tutorial/tutorial01.html @@ -30,146 +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 - + W1:e--W1:w - + W1: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 87f8808..4eeeac5 100644 Binary files a/tutorial/tutorial01.png and b/tutorial/tutorial01.png differ diff --git a/tutorial/tutorial01.svg b/tutorial/tutorial01.svg index f08a006..03604bf 100644 --- a/tutorial/tutorial01.svg +++ b/tutorial/tutorial01.svg @@ -1,146 +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 - + W1:e--W1:w - + W1: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/tutorial02.gv b/tutorial/tutorial02.gv index ef03673..01edaa3 100644 --- a/tutorial/tutorial02.gv +++ b/tutorial/tutorial02.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
1
2
3
4
@@ -82,22 +78,18 @@ graph { 1 - [] 2 - [] 3 - [] 4 - [] @@ -140,19 +132,7 @@ graph { X2:1 - - - - - - - - - - - -
- + X1:2 @@ -162,19 +142,7 @@ graph { X2:2 - - - - - - - - - - - -
- + X1:3 @@ -184,19 +152,7 @@ graph { X2:4 - - - - - - - - - - - -
- + X1:4 @@ -206,19 +162,7 @@ graph { X2:3 - - - - - - - - - - - -
- +   diff --git a/tutorial/tutorial02.html b/tutorial/tutorial02.html index 7d129a2..b055332 100644 --- a/tutorial/tutorial02.html +++ b/tutorial/tutorial02.html @@ -30,188 +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 - - - + + + 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 - -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 c7dbd2e..e5a248a 100644 Binary files a/tutorial/tutorial02.png and b/tutorial/tutorial02.png differ diff --git a/tutorial/tutorial02.svg b/tutorial/tutorial02.svg index 5e8a688..bfc9d3a 100644 --- a/tutorial/tutorial02.svg +++ b/tutorial/tutorial02.svg @@ -1,188 +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 - - - + + + 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 - -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/tutorial03.gv b/tutorial/tutorial03.gv index fe43062..04928b9 100644 --- a/tutorial/tutorial03.gv +++ b/tutorial/tutorial03.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
RX3
TX4
@@ -82,22 +78,18 @@ graph { 1 GND - [] 2 VCC - [] 3 RX - [] 4 TX - [] @@ -141,19 +133,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -163,19 +143,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:RX @@ -185,19 +153,7 @@ graph { X2:4:TX - - - - - - - - - - - -
- + X1:4:TX @@ -207,19 +163,7 @@ graph { X2:3:RX - - - - - - - - - - - -
- +   @@ -232,13 +176,7 @@ graph { - - - - - -
- +   diff --git a/tutorial/tutorial03.html b/tutorial/tutorial03.html index 1ac9ac1..a70df48 100644 --- a/tutorial/tutorial03.html +++ b/tutorial/tutorial03.html @@ -30,223 +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 - - - + + + 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 - -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 c479043..98ba7b5 100644 Binary files a/tutorial/tutorial03.png and b/tutorial/tutorial03.png differ diff --git a/tutorial/tutorial03.svg b/tutorial/tutorial03.svg index bd991e0..9cfbd99 100644 --- a/tutorial/tutorial03.svg +++ b/tutorial/tutorial03.svg @@ -1,223 +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 - - - + + + 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 - -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/tutorial04.gv b/tutorial/tutorial04.gv index b560cc1..757cfce 100644 --- a/tutorial/tutorial04.gv +++ b/tutorial/tutorial04.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -91,25 +87,21 @@ graph { 1 GND - [] 1 2 VCC - [] 2 3 SCL - [] 3 4 SDA - [] 4 @@ -154,22 +146,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -221,19 +209,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -243,19 +219,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:SCL @@ -265,19 +229,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X1:4:SDA @@ -287,19 +239,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -370,19 +310,7 @@ graph { X3:1:GND - - - - - - - - - - - -
- + X2:2:VCC @@ -392,19 +320,7 @@ graph { X3:2:VCC - - - - - - - - - - - -
- + X2:3:SCL @@ -414,19 +330,7 @@ graph { X3:3:SCL - - - - - - - - - - - -
- + X2:4:SDA @@ -436,19 +340,7 @@ graph { X3:4:SDA - - - - - - - - - - - -
- +   diff --git a/tutorial/tutorial04.html b/tutorial/tutorial04.html index e208167..8b7cbba 100644 --- a/tutorial/tutorial04.html +++ b/tutorial/tutorial04.html @@ -30,384 +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 - - - + + + 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 - -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 + + + +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 + + + +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 5eb5082..72cf2b9 100644 Binary files a/tutorial/tutorial04.png and b/tutorial/tutorial04.png differ diff --git a/tutorial/tutorial04.svg b/tutorial/tutorial04.svg index b037093..30ab6cb 100644 --- a/tutorial/tutorial04.svg +++ b/tutorial/tutorial04.svg @@ -1,384 +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 - - - + + + 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 - -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 + + + +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 + + + +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/tutorial05.gv b/tutorial/tutorial05.gv index 0633b82..c866d64 100644 --- a/tutorial/tutorial05.gv +++ b/tutorial/tutorial05.gv @@ -96,22 +96,18 @@ graph {
1 +12V - []
2 GND - []
3 GND - []
4 +5V - []
@@ -155,19 +151,7 @@ graph { X1:1:+12V
- -
- - - - - - - - - -
- + @@ -178,19 +162,7 @@ graph { X1:2:GND - - - - - - - - - - - -
- + @@ -201,19 +173,7 @@ graph { X1:3:GND - - - - - - - - - - - -
- + @@ -224,19 +184,7 @@ graph { X1:4:+5V - - - - - - - - - - - -
- +   diff --git a/tutorial/tutorial05.html b/tutorial/tutorial05.html index 2f701f9..f4ddc3b 100644 --- a/tutorial/tutorial05.html +++ b/tutorial/tutorial05.html @@ -30,230 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + + +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 - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F1_2:e--W1:w - - - + + + AUTOGENERATED_F1_3 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F1_3:e--W1:w - - - + + + AUTOGENERATED_F1_4 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F1_4:e--W1:w - - - + + + diff --git a/tutorial/tutorial05.png b/tutorial/tutorial05.png index d0c6e81..52b5734 100644 Binary files a/tutorial/tutorial05.png and b/tutorial/tutorial05.png differ diff --git a/tutorial/tutorial05.svg b/tutorial/tutorial05.svg index 88a3d1d..79e3c23 100644 --- a/tutorial/tutorial05.svg +++ b/tutorial/tutorial05.svg @@ -1,230 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + + +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 - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F1_2:e--W1:w - - - + + + AUTOGENERATED_F1_3 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F1_3:e--W1:w - - - + + + AUTOGENERATED_F1_4 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F1_4:e--W1:w - - - + + + diff --git a/tutorial/tutorial06.gv b/tutorial/tutorial06.gv index 460306c..f81c0ec 100644 --- a/tutorial/tutorial06.gv +++ b/tutorial/tutorial06.gv @@ -80,22 +80,18 @@ graph {
1 +12V - []
2 GND - []
3 GND - []
4 +5V - []
@@ -139,19 +135,7 @@ graph { X1:1:+12V
- -
- - - - - - - - - -
- + F1 @@ -162,19 +146,7 @@ graph { X1:2:GND - - - - - - - - - - - -
- + F1 @@ -185,19 +157,7 @@ graph { X1:3:GND - - - - - - - - - - - -
- + @@ -208,19 +168,7 @@ graph { X1:4:+5V - - - - - - - - - - - -
- +   diff --git a/tutorial/tutorial06.html b/tutorial/tutorial06.html index de30033..e0824e3 100644 --- a/tutorial/tutorial06.html +++ b/tutorial/tutorial06.html @@ -30,216 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + + +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 - - + + + +Crimp ferrule + +1.0 mm² + +YE + + F1:e--W1:w - - - + + + F1:e--W1:w - - - + + + AUTOGENERATED_F_05_2 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F_05_2:e--W1:w - - - + + + diff --git a/tutorial/tutorial06.png b/tutorial/tutorial06.png index fbc8c08..ccb8449 100644 Binary files a/tutorial/tutorial06.png and b/tutorial/tutorial06.png differ diff --git a/tutorial/tutorial06.svg b/tutorial/tutorial06.svg index 589f11a..c7c69f5 100644 --- a/tutorial/tutorial06.svg +++ b/tutorial/tutorial06.svg @@ -1,216 +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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + X1 - - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + + +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 - - + + + +Crimp ferrule + +1.0 mm² + +YE + + F1:e--W1:w - - - + + + F1:e--W1:w - - - + + + AUTOGENERATED_F_05_2 - - - -Crimp ferrule - -0.5 mm² - -OG - - + + + +Crimp ferrule + +0.5 mm² + +OG + + AUTOGENERATED_F_05_2:e--W1:w - - - + + + diff --git a/tutorial/tutorial07.gv b/tutorial/tutorial07.gv index 5b4006b..9eb294f 100644 --- a/tutorial/tutorial07.gv +++ b/tutorial/tutorial07.gv @@ -31,22 +31,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -82,22 +78,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -131,22 +123,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -182,22 +170,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -231,22 +215,18 @@ graph { - [] - [] - [] - []
GND1
VCC2
SCL3
SDA4
@@ -282,22 +262,18 @@ graph { 1 GND - [] 2 VCC - [] 3 SCL - [] 4 SDA - [] @@ -341,19 +317,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X1:2:VCC @@ -364,19 +328,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X1:3:SCL @@ -387,19 +339,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X1:4:SDA @@ -410,19 +350,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -485,19 +413,7 @@ graph { X2:1:GND - - - - - - - - - - - -
- + X3:2:VCC @@ -508,19 +424,7 @@ graph { X2:2:VCC - - - - - - - - - - - -
- + X3:3:SCL @@ -531,19 +435,7 @@ graph { X2:3:SCL - - - - - - - - - - - -
- + X3:4:SDA @@ -554,19 +446,7 @@ graph { X2:4:SDA - - - - - - - - - - - -
- +   @@ -629,19 +509,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + X3:2:VCC @@ -652,19 +520,7 @@ graph { X4:2:VCC - - - - - - - - - - - -
- + X3:3:SCL @@ -675,19 +531,7 @@ graph { X4:3:SCL - - - - - - - - - - - -
- + X3:4:SDA @@ -698,19 +542,7 @@ graph { X4:4:SDA - - - - - - - - - - - -
- +   @@ -773,19 +605,7 @@ graph { X4:1:GND - - - - - - - - - - - -
- + X5:2:VCC @@ -796,19 +616,7 @@ graph { X4:2:VCC - - - - - - - - - - - -
- + X5:3:SCL @@ -819,19 +627,7 @@ graph { X4:3:SCL - - - - - - - - - - - -
- + X5:4:SDA @@ -842,19 +638,7 @@ graph { X4:4:SDA - - - - - - - - - - - -
- +   @@ -917,19 +701,7 @@ graph { X6:1:GND - - - - - - - - - - - -
- + X5:2:VCC @@ -940,19 +712,7 @@ graph { X6:2:VCC - - - - - - - - - - - -
- + X5:3:SCL @@ -963,19 +723,7 @@ graph { X6:3:SCL - - - - - - - - - - - -
- + X5:4:SDA @@ -986,19 +734,7 @@ graph { X6:4:SDA - - - - - - - - - - - -
- +   diff --git a/tutorial/tutorial07.html b/tutorial/tutorial07.html index 6b6078a..bd3ec77 100644 --- a/tutorial/tutorial07.html +++ b/tutorial/tutorial07.html @@ -30,852 +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 - - - + + + 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 - -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 - - - -  + + + +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 - - - + + + W2:e--X2:w - - - + + + W2:e--X2: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 + + + +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 c4aa0b3..d5ae648 100644 Binary files a/tutorial/tutorial07.png and b/tutorial/tutorial07.png differ diff --git a/tutorial/tutorial07.svg b/tutorial/tutorial07.svg index 65b2bb5..b1662e4 100644 --- a/tutorial/tutorial07.svg +++ b/tutorial/tutorial07.svg @@ -1,852 +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 - - - + + + 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 - -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 - - - -  + + + +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 - - - + + + W2:e--X2:w - - - + + + W2:e--X2: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 + + + +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/tutorial08.gv b/tutorial/tutorial08.gv index 28e5fd8..8b62e39 100644 --- a/tutorial/tutorial08.gv +++ b/tutorial/tutorial08.gv @@ -41,22 +41,18 @@ graph { - [] - [] - [] - []
1
2
3
4
@@ -133,22 +129,18 @@ graph { 1 - [] 2 - [] 3 - [] 4 - [] @@ -223,22 +215,18 @@ graph { 1 - [] 2 - [] 3 - [] 4 - [] @@ -322,19 +310,7 @@ graph { X2:1 - - - - - - - - - - - -
- + X1:2 @@ -344,19 +320,7 @@ graph { X2:2 - - - - - - - - - - - -
- + X1:3 @@ -366,19 +330,7 @@ graph { X2:3 - - - - - - - - - - - -
- + X1:4 @@ -388,19 +340,7 @@ graph { X2:4 - - - - - - - - - - - -
- +   @@ -463,19 +403,7 @@ graph { X3:1 - - - - - - - - - - - -
- + @@ -497,19 +425,7 @@ graph { X3:2 - - - - - - - - - - - -
- + @@ -531,19 +447,7 @@ graph { X3:3 - - - - - - - - - - - -
- + @@ -565,19 +469,7 @@ graph { X3:4 - - - - - - - - - - - -
- + diff --git a/tutorial/tutorial08.html b/tutorial/tutorial08.html index 4f28094..797b328 100644 --- a/tutorial/tutorial08.html +++ b/tutorial/tutorial08.html @@ -30,406 +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 - - - + + + 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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1: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 - + + + +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 caad13c..59b2445 100644 Binary files a/tutorial/tutorial08.png and b/tutorial/tutorial08.png differ diff --git a/tutorial/tutorial08.svg b/tutorial/tutorial08.svg index 4cee6d9..7b57d05 100644 --- a/tutorial/tutorial08.svg +++ b/tutorial/tutorial08.svg @@ -1,406 +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 - - - + + + 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 - - - + + + W1:e--W1:w - - - + + + W1:e--W1:w - - - + + + W1:e--W1: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 - + + + +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 - - - + + +