minor layout changes

This commit is contained in:
hneemann 2017-05-12 22:32:10 +02:00
parent 80f5b87b33
commit 56bbb21858
5 changed files with 644 additions and 675 deletions

View File

@ -1,7 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes/>
<attributes>
<entry>
<string>Description</string>
<string>Three digit BCD counter.</string>
</entry>
</attributes>
<visualElements>
<visualElement>
<elementName>7447.dig</elementName>
@ -110,12 +115,16 @@
<string>runRealTime</string>
<boolean>true</boolean>
</entry>
<entry>
<string>Label</string>
<string>C</string>
</entry>
<entry>
<string>Frequency</string>
<int>10</int>
<int>2</int>
</entry>
</elementAttributes>
<pos x="-260" y="-380"/>
<pos x="-260" y="-360"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
@ -189,12 +198,16 @@
<p2 x="20" y="-100"/>
</wire>
<wire>
<p1 x="-220" y="-360"/>
<p2 x="140" y="-360"/>
<p1 x="-260" y="-360"/>
<p2 x="-20" y="-360"/>
</wire>
<wire>
<p1 x="140" y="-360"/>
<p2 x="780" y="-360"/>
<p1 x="340" y="-360"/>
<p2 x="700" y="-360"/>
</wire>
<wire>
<p1 x="-20" y="-360"/>
<p2 x="340" y="-360"/>
</wire>
<wire>
<p1 x="600" y="360"/>
@ -273,16 +286,12 @@
<p2 x="-120" y="120"/>
</wire>
<wire>
<p1 x="-260" y="-380"/>
<p2 x="-20" y="-380"/>
<p1 x="-220" y="-380"/>
<p2 x="140" y="-380"/>
</wire>
<wire>
<p1 x="340" y="-380"/>
<p2 x="700" y="-380"/>
</wire>
<wire>
<p1 x="-20" y="-380"/>
<p2 x="340" y="-380"/>
<p1 x="140" y="-380"/>
<p2 x="780" y="-380"/>
</wire>
<wire>
<p1 x="-100" y="-60"/>
@ -453,11 +462,11 @@
<p2 x="-140" y="-300"/>
</wire>
<wire>
<p1 x="780" y="-360"/>
<p1 x="780" y="-380"/>
<p2 x="780" y="-160"/>
</wire>
<wire>
<p1 x="140" y="-360"/>
<p1 x="140" y="-380"/>
<p2 x="140" y="-300"/>
</wire>
<wire>
@ -489,7 +498,7 @@
<p2 x="-20" y="-20"/>
</wire>
<wire>
<p1 x="-20" y="-380"/>
<p1 x="-20" y="-360"/>
<p2 x="-20" y="-300"/>
</wire>
<wire>
@ -501,7 +510,7 @@
<p2 x="340" y="-20"/>
</wire>
<wire>
<p1 x="340" y="-380"/>
<p1 x="340" y="-360"/>
<p2 x="340" y="-300"/>
</wire>
<wire>
@ -541,7 +550,7 @@
<p2 x="600" y="360"/>
</wire>
<wire>
<p1 x="-220" y="-360"/>
<p1 x="-220" y="-380"/>
<p2 x="-220" y="-300"/>
</wire>
<wire>
@ -781,7 +790,7 @@
<p2 x="700" y="-20"/>
</wire>
<wire>
<p1 x="700" y="-380"/>
<p1 x="700" y="-360"/>
<p2 x="700" y="-300"/>
</wire>
<wire>

File diff suppressed because it is too large Load Diff

View File

@ -15,6 +15,10 @@
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>Bit 0</string>
</entry>
<entry>
<string>Label</string>
<string>A</string>
@ -24,11 +28,15 @@
<int>7</int>
</entry>
</elementAttributes>
<pos x="-540" y="-960"/>
<pos x="-180" y="-840"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>Bit 1</string>
</entry>
<entry>
<string>Label</string>
<string>B</string>
@ -38,11 +46,15 @@
<int>1</int>
</entry>
</elementAttributes>
<pos x="-540" y="-1040"/>
<pos x="-180" y="-920"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>Bit 2</string>
</entry>
<entry>
<string>Label</string>
<string>C</string>
@ -52,11 +64,15 @@
<int>2</int>
</entry>
</elementAttributes>
<pos x="-540" y="-1120"/>
<pos x="-180" y="-1000"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>Bit 3</string>
</entry>
<entry>
<string>Label</string>
<string>D</string>
@ -66,112 +82,20 @@
<int>6</int>
</entry>
</elementAttributes>
<pos x="-540" y="-1200"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
<entry>
<string>NetName</string>
<string>a</string>
</entry>
</elementAttributes>
<pos x="440" y="-1200"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
<entry>
<string>NetName</string>
<string>b</string>
</entry>
</elementAttributes>
<pos x="400" y="-1200"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
<entry>
<string>NetName</string>
<string>c</string>
</entry>
</elementAttributes>
<pos x="360" y="-1200"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
<entry>
<string>NetName</string>
<string>d</string>
</entry>
</elementAttributes>
<pos x="320" y="-1200"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>a</string>
</entry>
</elementAttributes>
<pos x="-120" y="-940"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>b</string>
</entry>
</elementAttributes>
<pos x="-120" y="-1020"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>c</string>
</entry>
</elementAttributes>
<pos x="-120" y="-1100"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>d</string>
</entry>
</elementAttributes>
<pos x="-120" y="-1180"/>
<pos x="-180" y="-1080"/>
</visualElement>
<visualElement>
<elementName>NAnd</elementName>
<elementAttributes/>
<pos x="-260" y="-680"/>
<pos x="40" y="-680"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>ripple blanking output (LOW active)</string>
</entry>
<entry>
<string>Label</string>
<string>~RBO</string>
@ -181,11 +105,15 @@
<int>4</int>
</entry>
</elementAttributes>
<pos x="-160" y="-660"/>
<pos x="140" y="-660"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>ripple blanking input (LOW active)</string>
</entry>
<entry>
<string>Label</string>
<string>~RBI</string>
@ -195,32 +123,32 @@
<int>5</int>
</entry>
</elementAttributes>
<pos x="-540" y="-640"/>
<pos x="-180" y="-640"/>
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="-420" y="-640"/>
<pos x="-80" y="-640"/>
</visualElement>
<visualElement>
<elementName>Or</elementName>
<elementAttributes/>
<pos x="-200" y="-1200"/>
<pos x="140" y="-1080"/>
</visualElement>
<visualElement>
<elementName>Or</elementName>
<elementAttributes/>
<pos x="-200" y="-1120"/>
<pos x="140" y="-1000"/>
</visualElement>
<visualElement>
<elementName>Or</elementName>
<elementAttributes/>
<pos x="-200" y="-1040"/>
<pos x="140" y="-920"/>
</visualElement>
<visualElement>
<elementName>Or</elementName>
<elementAttributes/>
<pos x="-200" y="-960"/>
<pos x="140" y="-840"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
@ -230,12 +158,12 @@
<int>4</int>
</entry>
</elementAttributes>
<pos x="-440" y="-800"/>
<pos x="-80" y="-800"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
<elementAttributes/>
<pos x="-300" y="-920"/>
<pos x="40" y="-760"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
@ -631,6 +559,10 @@
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>lamp test</string>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="3"/>
@ -659,12 +591,12 @@
</visualElements>
<wires>
<wire>
<p1 x="400" y="-900"/>
<p2 x="500" y="-900"/>
<p1 x="200" y="-900"/>
<p2 x="400" y="-900"/>
</wire>
<wire>
<p1 x="-240" y="-900"/>
<p2 x="-220" y="-900"/>
<p1 x="400" y="-900"/>
<p2 x="500" y="-900"/>
</wire>
<wire>
<p1 x="440" y="-260"/>
@ -678,21 +610,17 @@
<p1 x="560" y="-520"/>
<p2 x="600" y="-520"/>
</wire>
<wire>
<p1 x="-220" y="-1160"/>
<p2 x="-200" y="-1160"/>
</wire>
<wire>
<p1 x="560" y="520"/>
<p2 x="600" y="520"/>
</wire>
<wire>
<p1 x="340" y="-780"/>
<p2 x="500" y="-780"/>
<p1 x="-120" y="-780"/>
<p2 x="-80" y="-780"/>
</wire>
<wire>
<p1 x="-480" y="-780"/>
<p2 x="-440" y="-780"/>
<p1 x="340" y="-780"/>
<p2 x="500" y="-780"/>
</wire>
<wire>
<p1 x="380" y="-140"/>
@ -711,12 +639,8 @@
<p2 x="500" y="780"/>
</wire>
<wire>
<p1 x="-540" y="-1040"/>
<p2 x="-480" y="-1040"/>
</wire>
<wire>
<p1 x="-480" y="-1040"/>
<p2 x="-200" y="-1040"/>
<p1 x="120" y="-1040"/>
<p2 x="140" y="-1040"/>
</wire>
<wire>
<p1 x="700" y="400"/>
@ -726,6 +650,10 @@
<p1 x="620" y="400"/>
<p2 x="640" y="400"/>
</wire>
<wire>
<p1 x="120" y="-660"/>
<p2 x="140" y="-660"/>
</wire>
<wire>
<p1 x="440" y="-660"/>
<p2 x="500" y="-660"/>
@ -734,10 +662,6 @@
<p1 x="580" y="-660"/>
<p2 x="640" y="-660"/>
</wire>
<wire>
<p1 x="-180" y="-660"/>
<p2 x="-160" y="-660"/>
</wire>
<wire>
<p1 x="440" y="-20"/>
<p2 x="500" y="-20"/>
@ -750,6 +674,10 @@
<p1 x="380" y="660"/>
<p2 x="500" y="660"/>
</wire>
<wire>
<p1 x="-180" y="-920"/>
<p2 x="-120" y="-920"/>
</wire>
<wire>
<p1 x="380" y="-920"/>
<p2 x="500" y="-920"/>
@ -763,12 +691,8 @@
<p2 x="640" y="-920"/>
</wire>
<wire>
<p1 x="-340" y="-920"/>
<p2 x="-300" y="-920"/>
</wire>
<wire>
<p1 x="-220" y="-920"/>
<p2 x="-200" y="-920"/>
<p1 x="-120" y="-920"/>
<p2 x="140" y="-920"/>
</wire>
<wire>
<p1 x="560" y="-280"/>
@ -794,10 +718,6 @@
<p1 x="440" y="-1180"/>
<p2 x="460" y="-1180"/>
</wire>
<wire>
<p1 x="-140" y="-1180"/>
<p2 x="-120" y="-1180"/>
</wire>
<wire>
<p1 x="420" y="-540"/>
<p2 x="500" y="-540"/>
@ -807,8 +727,12 @@
<p2 x="500" y="540"/>
</wire>
<wire>
<p1 x="-460" y="-800"/>
<p2 x="-440" y="-800"/>
<p1 x="120" y="-800"/>
<p2 x="140" y="-800"/>
</wire>
<wire>
<p1 x="-100" y="-800"/>
<p2 x="-80" y="-800"/>
</wire>
<wire>
<p1 x="700" y="160"/>
@ -818,6 +742,10 @@
<p1 x="620" y="160"/>
<p2 x="640" y="160"/>
</wire>
<wire>
<p1 x="200" y="-1060"/>
<p2 x="320" y="-1060"/>
</wire>
<wire>
<p1 x="440" y="-1060"/>
<p2 x="500" y="-1060"/>
@ -834,6 +762,10 @@
<p1 x="580" y="420"/>
<p2 x="640" y="420"/>
</wire>
<wire>
<p1 x="20" y="-680"/>
<p2 x="40" y="-680"/>
</wire>
<wire>
<p1 x="600" y="-680"/>
<p2 x="640" y="-680"/>
@ -846,10 +778,6 @@
<p1 x="560" y="-680"/>
<p2 x="580" y="-680"/>
</wire>
<wire>
<p1 x="-340" y="-680"/>
<p2 x="-260" y="-680"/>
</wire>
<wire>
<p1 x="420" y="-40"/>
<p2 x="500" y="-40"/>
@ -882,10 +810,6 @@
<p1 x="580" y="-940"/>
<p2 x="640" y="-940"/>
</wire>
<wire>
<p1 x="-140" y="-940"/>
<p2 x="-120" y="-940"/>
</wire>
<wire>
<p1 x="380" y="-300"/>
<p2 x="500" y="-300"/>
@ -899,12 +823,8 @@
<p2 x="500" y="300"/>
</wire>
<wire>
<p1 x="-540" y="-1200"/>
<p2 x="-520" y="-1200"/>
</wire>
<wire>
<p1 x="-520" y="-1200"/>
<p2 x="-200" y="-1200"/>
<p1 x="200" y="-820"/>
<p2 x="440" y="-820"/>
</wire>
<wire>
<p1 x="460" y="-820"/>
@ -926,6 +846,10 @@
<p1 x="400" y="820"/>
<p2 x="500" y="820"/>
</wire>
<wire>
<p1 x="-180" y="-1080"/>
<p2 x="-160" y="-1080"/>
</wire>
<wire>
<p1 x="420" y="-1080"/>
<p2 x="500" y="-1080"/>
@ -935,8 +859,8 @@
<p2 x="600" y="-1080"/>
</wire>
<wire>
<p1 x="-220" y="-1080"/>
<p2 x="-200" y="-1080"/>
<p1 x="-160" y="-1080"/>
<p2 x="140" y="-1080"/>
</wire>
<wire>
<p1 x="560" y="-440"/>
@ -974,22 +898,18 @@
<p1 x="580" y="700"/>
<p2 x="640" y="700"/>
</wire>
<wire>
<p1 x="120" y="-960"/>
<p2 x="140" y="-960"/>
</wire>
<wire>
<p1 x="700" y="-960"/>
<p2 x="720" y="-960"/>
</wire>
<wire>
<p1 x="-540" y="-960"/>
<p2 x="-460" y="-960"/>
</wire>
<wire>
<p1 x="620" y="-960"/>
<p2 x="640" y="-960"/>
</wire>
<wire>
<p1 x="-460" y="-960"/>
<p2 x="-200" y="-960"/>
</wire>
<wire>
<p1 x="620" y="-320"/>
<p2 x="640" y="-320"/>
@ -1002,6 +922,10 @@
<p1 x="320" y="580"/>
<p2 x="500" y="580"/>
</wire>
<wire>
<p1 x="-180" y="-840"/>
<p2 x="-100" y="-840"/>
</wire>
<wire>
<p1 x="420" y="-840"/>
<p2 x="500" y="-840"/>
@ -1010,6 +934,10 @@
<p1 x="560" y="-840"/>
<p2 x="600" y="-840"/>
</wire>
<wire>
<p1 x="-100" y="-840"/>
<p2 x="140" y="-840"/>
</wire>
<wire>
<p1 x="560" y="-200"/>
<p2 x="600" y="-200"/>
@ -1026,10 +954,6 @@
<p1 x="320" y="-1100"/>
<p2 x="500" y="-1100"/>
</wire>
<wire>
<p1 x="-140" y="-1100"/>
<p2 x="-120" y="-1100"/>
</wire>
<wire>
<p1 x="340" y="-460"/>
<p2 x="500" y="-460"/>
@ -1038,6 +962,14 @@
<p1 x="460" y="460"/>
<p2 x="500" y="460"/>
</wire>
<wire>
<p1 x="-160" y="-720"/>
<p2 x="-80" y="-720"/>
</wire>
<wire>
<p1 x="0" y="-720"/>
<p2 x="40" y="-720"/>
</wire>
<wire>
<p1 x="700" y="-80"/>
<p2 x="720" y="-80"/>
@ -1046,10 +978,6 @@
<p1 x="620" y="-80"/>
<p2 x="640" y="-80"/>
</wire>
<wire>
<p1 x="-520" y="-720"/>
<p2 x="-440" y="-720"/>
</wire>
<wire>
<p1 x="700" y="720"/>
<p2 x="720" y="720"/>
@ -1058,6 +986,10 @@
<p1 x="620" y="720"/>
<p2 x="640" y="720"/>
</wire>
<wire>
<p1 x="200" y="-980"/>
<p2 x="360" y="-980"/>
</wire>
<wire>
<p1 x="440" y="-980"/>
<p2 x="500" y="-980"/>
@ -1107,16 +1039,12 @@
<p2 x="500" y="860"/>
</wire>
<wire>
<p1 x="-540" y="-1120"/>
<p2 x="-500" y="-1120"/>
<p1 x="100" y="-740"/>
<p2 x="120" y="-740"/>
</wire>
<wire>
<p1 x="-500" y="-1120"/>
<p2 x="-200" y="-1120"/>
</wire>
<wire>
<p1 x="-500" y="-740"/>
<p2 x="-440" y="-740"/>
<p1 x="-140" y="-740"/>
<p2 x="-80" y="-740"/>
</wire>
<wire>
<p1 x="380" y="-740"/>
@ -1143,8 +1071,8 @@
<p2 x="640" y="740"/>
</wire>
<wire>
<p1 x="-220" y="-1000"/>
<p2 x="-200" y="-1000"/>
<p1 x="-180" y="-1000"/>
<p2 x="-140" y="-1000"/>
</wire>
<wire>
<p1 x="600" y="-1000"/>
@ -1158,6 +1086,10 @@
<p1 x="560" y="-1000"/>
<p2 x="580" y="-1000"/>
</wire>
<wire>
<p1 x="-140" y="-1000"/>
<p2 x="140" y="-1000"/>
</wire>
<wire>
<p1 x="560" y="-360"/>
<p2 x="640" y="-360"/>
@ -1183,8 +1115,8 @@
<p2 x="500" y="620"/>
</wire>
<wire>
<p1 x="-320" y="-880"/>
<p2 x="-300" y="-880"/>
<p1 x="120" y="-880"/>
<p2 x="140" y="-880"/>
</wire>
<wire>
<p1 x="460" y="-500"/>
@ -1195,13 +1127,17 @@
<p2 x="500" y="500"/>
</wire>
<wire>
<p1 x="-360" y="-760"/>
<p2 x="-340" y="-760"/>
<p1 x="0" y="-760"/>
<p2 x="20" y="-760"/>
</wire>
<wire>
<p1 x="560" y="-760"/>
<p2 x="600" y="-760"/>
</wire>
<wire>
<p1 x="20" y="-760"/>
<p2 x="40" y="-760"/>
</wire>
<wire>
<p1 x="600" y="-120"/>
<p2 x="640" y="-120"/>
@ -1222,10 +1158,6 @@
<p1 x="600" y="760"/>
<p2 x="640" y="760"/>
</wire>
<wire>
<p1 x="-140" y="-1020"/>
<p2 x="-120" y="-1020"/>
</wire>
<wire>
<p1 x="340" y="-1020"/>
<p2 x="500" y="-1020"/>
@ -1247,12 +1179,12 @@
<p2 x="640" y="380"/>
</wire>
<wire>
<p1 x="-380" y="-640"/>
<p2 x="-320" y="-640"/>
<p1 x="-40" y="-640"/>
<p2 x="0" y="-640"/>
</wire>
<wire>
<p1 x="-540" y="-640"/>
<p2 x="-420" y="-640"/>
<p1 x="-180" y="-640"/>
<p2 x="-80" y="-640"/>
</wire>
<wire>
<p1 x="700" y="-640"/>
@ -1263,12 +1195,8 @@
<p2 x="640" y="-640"/>
</wire>
<wire>
<p1 x="-320" y="-640"/>
<p2 x="-260" y="-640"/>
</wire>
<wire>
<p1 x="320" y="-1200"/>
<p2 x="320" y="-1180"/>
<p1 x="0" y="-640"/>
<p2 x="40" y="-640"/>
</wire>
<wire>
<p1 x="320" y="-1180"/>
@ -1276,6 +1204,10 @@
</wire>
<wire>
<p1 x="320" y="-1100"/>
<p2 x="320" y="-1060"/>
</wire>
<wire>
<p1 x="320" y="-1060"/>
<p2 x="320" y="260"/>
</wire>
<wire>
@ -1286,6 +1218,14 @@
<p1 x="320" y="260"/>
<p2 x="320" y="580"/>
</wire>
<wire>
<p1 x="0" y="-720"/>
<p2 x="0" y="-640"/>
</wire>
<wire>
<p1 x="-100" y="-840"/>
<p2 x="-100" y="-800"/>
</wire>
<wire>
<p1 x="580" y="-1000"/>
<p2 x="580" y="-980"/>
@ -1395,12 +1335,8 @@
<p2 x="420" y="880"/>
</wire>
<wire>
<p1 x="-520" y="-1200"/>
<p2 x="-520" y="-720"/>
</wire>
<wire>
<p1 x="360" y="-1200"/>
<p2 x="360" y="-1180"/>
<p1 x="360" y="-1180"/>
<p2 x="360" y="-1000"/>
</wire>
<wire>
<p1 x="360" y="740"/>
@ -1410,10 +1346,6 @@
<p1 x="360" y="340"/>
<p2 x="360" y="420"/>
</wire>
<wire>
<p1 x="360" y="-1180"/>
<p2 x="360" y="-1000"/>
</wire>
<wire>
<p1 x="360" y="420"/>
<p2 x="360" y="740"/>
@ -1424,6 +1356,10 @@
</wire>
<wire>
<p1 x="360" y="-1000"/>
<p2 x="360" y="-980"/>
</wire>
<wire>
<p1 x="360" y="-980"/>
<p2 x="360" y="-420"/>
</wire>
<wire>
@ -1431,8 +1367,8 @@
<p2 x="360" y="-60"/>
</wire>
<wire>
<p1 x="-460" y="-960"/>
<p2 x="-460" y="-800"/>
<p1 x="-140" y="-1000"/>
<p2 x="-140" y="-740"/>
</wire>
<wire>
<p1 x="620" y="-1140"/>
@ -1511,8 +1447,8 @@
<p2 x="460" y="140"/>
</wire>
<wire>
<p1 x="400" y="-1200"/>
<p2 x="400" y="-1180"/>
<p1 x="400" y="-1180"/>
<p2 x="400" y="-900"/>
</wire>
<wire>
<p1 x="400" y="-100"/>
@ -1542,22 +1478,6 @@
<p1 x="400" y="-680"/>
<p2 x="400" y="-100"/>
</wire>
<wire>
<p1 x="400" y="-1180"/>
<p2 x="400" y="-900"/>
</wire>
<wire>
<p1 x="-500" y="-1120"/>
<p2 x="-500" y="-740"/>
</wire>
<wire>
<p1 x="-340" y="-920"/>
<p2 x="-340" y="-760"/>
</wire>
<wire>
<p1 x="-340" y="-760"/>
<p2 x="-340" y="-680"/>
</wire>
<wire>
<p1 x="340" y="-1180"/>
<p2 x="340" y="-1160"/>
@ -1587,17 +1507,41 @@
<p2 x="340" y="-780"/>
</wire>
<wire>
<p1 x="440" y="-1200"/>
<p2 x="440" y="-1180"/>
<p1 x="20" y="-760"/>
<p2 x="20" y="-680"/>
</wire>
<wire>
<p1 x="440" y="-260"/>
<p2 x="440" y="-20"/>
<p1 x="-120" y="-920"/>
<p2 x="-120" y="-780"/>
</wire>
<wire>
<p1 x="120" y="-1040"/>
<p2 x="120" y="-960"/>
</wire>
<wire>
<p1 x="120" y="-960"/>
<p2 x="120" y="-880"/>
</wire>
<wire>
<p1 x="120" y="-880"/>
<p2 x="120" y="-800"/>
</wire>
<wire>
<p1 x="120" y="-800"/>
<p2 x="120" y="-740"/>
</wire>
<wire>
<p1 x="440" y="-1180"/>
<p2 x="440" y="-1060"/>
</wire>
<wire>
<p1 x="440" y="-820"/>
<p2 x="440" y="-660"/>
</wire>
<wire>
<p1 x="440" y="-260"/>
<p2 x="440" y="-20"/>
</wire>
<wire>
<p1 x="440" y="-660"/>
<p2 x="440" y="-260"/>
@ -1612,7 +1556,7 @@
</wire>
<wire>
<p1 x="440" y="-980"/>
<p2 x="440" y="-660"/>
<p2 x="440" y="-820"/>
</wire>
<wire>
<p1 x="600" y="-1080"/>
@ -1654,22 +1598,6 @@
<p1 x="600" y="760"/>
<p2 x="600" y="840"/>
</wire>
<wire>
<p1 x="-220" y="-1160"/>
<p2 x="-220" y="-1080"/>
</wire>
<wire>
<p1 x="-220" y="-920"/>
<p2 x="-220" y="-900"/>
</wire>
<wire>
<p1 x="-220" y="-1000"/>
<p2 x="-220" y="-920"/>
</wire>
<wire>
<p1 x="-220" y="-1080"/>
<p2 x="-220" y="-1000"/>
</wire>
<wire>
<p1 x="380" y="-1180"/>
<p2 x="380" y="-1160"/>
@ -1719,12 +1647,8 @@
<p2 x="380" y="-380"/>
</wire>
<wire>
<p1 x="-480" y="-1040"/>
<p2 x="-480" y="-780"/>
</wire>
<wire>
<p1 x="-320" y="-880"/>
<p2 x="-320" y="-640"/>
<p1 x="-160" y="-1080"/>
<p2 x="-160" y="-720"/>
</wire>
</wires>
</circuit>

View File

@ -172,6 +172,10 @@
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>ripple blanking output (LOW active)</string>
</entry>
<entry>
<string>Label</string>
<string>~RBO</string>
@ -186,6 +190,10 @@
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>ripple blanking input (LOW active)</string>
</entry>
<entry>
<string>Label</string>
<string>~RBI</string>
@ -242,7 +250,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>a</string>
<string>~a</string>
</entry>
<entry>
<string>pinNumber</string>
@ -300,7 +308,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>b</string>
<string>~b</string>
</entry>
<entry>
<string>pinNumber</string>
@ -343,7 +351,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>c</string>
<string>~c</string>
</entry>
<entry>
<string>pinNumber</string>
@ -376,7 +384,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>d</string>
<string>~d</string>
</entry>
<entry>
<string>pinNumber</string>
@ -419,7 +427,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>e</string>
<string>~e</string>
</entry>
<entry>
<string>pinNumber</string>
@ -447,7 +455,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>f</string>
<string>~f</string>
</entry>
<entry>
<string>pinNumber</string>
@ -485,7 +493,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>g</string>
<string>~g</string>
</entry>
<entry>
<string>pinNumber</string>
@ -561,6 +569,10 @@
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>lamp test</string>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="3"/>

View File

@ -69,6 +69,7 @@ public class DILShape implements Shape {
int pin = dp / 4;
int x = width * SIZE;
int h = (pinCount / 2) * dp - SIZE;
for (int i = 0; i < pinCount / 2; i++) {
int y = i * dp;
graphic.drawPolygon(
@ -86,6 +87,7 @@ public class DILShape implements Shape {
.add(x - pin, y + pin), Style.NORMAL);
graphic.drawText(new Vector(x - pin - SIZE2 / 2, y), new Vector(x - pin + SIZE, y), map.getText(pinCount - i), Orientation.RIGHTCENTER, Style.SHAPE_PIN);
}
graphic.drawPolygon(
new Polygon(true)
.add(pin, -SIZE)
@ -96,13 +98,14 @@ public class DILShape implements Shape {
.add(x - pin, h)
.add(pin, h), Style.NORMAL);
graphic.drawText(new Vector(x / 2, SIZE2), new Vector(x / 2, SIZE * 2), shortName, Orientation.LEFTCENTER, Style.NORMAL_TEXT);
if (label != null && label.length() > 0)
graphic.drawText(new Vector(x / 2, h + SIZE2), new Vector(x, h + SIZE2), label, Orientation.CENTERTOP, Style.NORMAL_TEXT);
}
private static final class ShapePinMap {
private final int width;
private HashMap<Integer, PinDescription> map;
private final HashMap<Integer, PinDescription> map;
private ArrayList<PinDescription> notAssigned;
private int pinCount;