TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-14 15:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor layout changes at some example circuits

Browse Source
This commit is contained in:
hneemann 2019-04-01 09:34:55 +02:00
parent 8229d7c819
commit c74eb16394
6 changed files with 114 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/dig/combinatorial/FullAdder.dig
View File

@ -135,12 +135,12 @@
<visualElement> <visualElement>
<elementName>XOr</elementName> <elementName>XOr</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="600" y="320"/> <pos x="620" y="320"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>And</elementName> <elementName>And</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="600" y="240"/> <pos x="620" y="240"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>And</elementName> <elementName>And</elementName>
@ -165,7 +165,7 @@
<string>A_i</string> <string>A_i</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="540" y="240"/> <pos x="560" y="240"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Or</elementName> <elementName>Or</elementName>
@ -185,7 +185,7 @@
<string>B_i</string> <string>B_i</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="540" y="360"/> <pos x="560" y="360"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -200,7 +200,7 @@
<string>C_{i-1}</string> <string>C_{i-1}</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="540" y="460"/> <pos x="560" y="460"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -255,39 +255,39 @@ end loop
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="580" y="280"/> <p1 x="600" y="280"/>
<p2 x="560" y="320"/> <p2 x="580" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="720" y="380"/> <p1 x="720" y="380"/>
<p2 x="700" y="420"/> <p2 x="700" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="560" y="280"/> <p1 x="580" y="280"/>
<p2 x="580" y="320"/> <p2 x="600" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="700" y="380"/> <p1 x="700" y="380"/>
<p2 x="720" y="420"/> <p2 x="720" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="580" y="320"/> <p1 x="600" y="320"/>
<p2 x="600" y="320"/> <p2 x="620" y="320"/>
</wire>
<wire>
<p1 x="540" y="240"/>
<p2 x="560" y="240"/>
</wire> </wire>
<wire> <wire>
<p1 x="560" y="240"/> <p1 x="560" y="240"/>
<p2 x="600" y="240"/> <p2 x="580" y="240"/>
</wire> </wire>
<wire> <wire>
<p1 x="660" y="260"/> <p1 x="580" y="240"/>
<p2 x="620" y="240"/>
</wire>
<wire>
<p1 x="680" y="260"/>
<p2 x="840" y="260"/> <p2 x="840" y="260"/>
</wire> </wire>
<wire> <wire>
<p1 x="660" y="340"/> <p1 x="680" y="340"/>
<p2 x="700" y="340"/> <p2 x="700" y="340"/>
</wire> </wire>
<wire> <wire>
@ -299,24 +299,24 @@ end loop
<p2 x="740" y="420"/> <p2 x="740" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="580" y="280"/> <p1 x="600" y="280"/>
<p2 x="600" y="280"/> <p2 x="620" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="900" y="280"/> <p1 x="900" y="280"/>
<p2 x="920" y="280"/> <p2 x="920" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="540" y="360"/> <p1 x="560" y="360"/>
<p2 x="560" y="360"/> <p2 x="580" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="800" y="360"/> <p1 x="800" y="360"/>
<p2 x="820" y="360"/> <p2 x="820" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="560" y="360"/> <p1 x="580" y="360"/>
<p2 x="600" y="360"/> <p2 x="620" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="800" y="440"/> <p1 x="800" y="440"/>
@ -331,7 +331,7 @@ end loop
<p2 x="740" y="380"/> <p2 x="740" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="540" y="460"/> <p1 x="560" y="460"/>
<p2 x="700" y="460"/> <p2 x="700" y="460"/>
</wire> </wire>
<wire> <wire>
@ -339,12 +339,12 @@ end loop
<p2 x="740" y="460"/> <p2 x="740" y="460"/>
</wire> </wire>
<wire> <wire>
<p1 x="560" y="240"/> <p1 x="580" y="240"/>
<p2 x="560" y="280"/> <p2 x="580" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="560" y="320"/> <p1 x="580" y="320"/>
<p2 x="560" y="360"/> <p2 x="580" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="820" y="300"/> <p1 x="820" y="300"/>

16
src/main/dig/combinatorial/HalfAdder.dig
View File

@ -72,12 +72,12 @@
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="560" y="240"/> <p1 x="580" y="280"/>
<p2 x="580" y="320"/> <p2 x="560" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="580" y="280"/> <p1 x="560" y="280"/>
<p2 x="560" y="360"/> <p2 x="580" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="580" y="320"/> <p1 x="580" y="320"/>
@ -111,5 +111,13 @@
<p1 x="560" y="360"/> <p1 x="560" y="360"/>
<p2 x="600" y="360"/> <p2 x="600" y="360"/>
</wire> </wire>
<wire>
<p1 x="560" y="240"/>
<p2 x="560" y="280"/>
</wire>
<wire>
<p1 x="560" y="320"/>
<p2 x="560" y="360"/>
</wire>
</wires> </wires>
</circuit> </circuit>

53
src/main/dig/combinatorial/HalfSub.dig
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<circuit> <circuit>
<version>1</version> <version>1</version>
<attributes/>
<visualElements> <visualElements>
<visualElement> <visualElement>
<elementName>XOr</elementName> <elementName>XOr</elementName>
@ -9,7 +10,14 @@
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>And</elementName> <elementName>And</elementName>
<elementAttributes/> <elementAttributes>
<entry>
<string>inverterConfig</string>
<inverterConfig>
<string>In_1</string>
</inverterConfig>
</entry>
</elementAttributes>
<pos x="620" y="320"/> <pos x="620" y="320"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
@ -20,7 +28,7 @@
<string>$A$</string> <string>$A$</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="500" y="240"/> <pos x="520" y="240"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -30,7 +38,7 @@
<string>$B$</string> <string>$B$</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="500" y="360"/> <pos x="520" y="360"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -52,11 +60,6 @@
</elementAttributes> </elementAttributes>
<pos x="720" y="340"/> <pos x="720" y="340"/>
</visualElement> </visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="540" y="320"/>
</visualElement>
<visualElement> <visualElement>
<elementName>Testcase</elementName> <elementName>Testcase</elementName>
<elementAttributes> <elementAttributes>
@ -77,20 +80,24 @@
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="500" y="240"/> <p1 x="580" y="280"/>
<p2 x="520" y="240"/> <p2 x="540" y="320"/>
</wire>
<wire>
<p1 x="540" y="280"/>
<p2 x="580" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="520" y="240"/> <p1 x="520" y="240"/>
<p2 x="540" y="240"/>
</wire>
<wire>
<p1 x="540" y="240"/>
<p2 x="620" y="240"/> <p2 x="620" y="240"/>
</wire> </wire>
<wire> <wire>
<p1 x="580" y="320"/> <p1 x="580" y="320"/>
<p2 x="620" y="320"/> <p2 x="600" y="320"/>
</wire>
<wire>
<p1 x="520" y="320"/>
<p2 x="540" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="680" y="260"/> <p1 x="680" y="260"/>
@ -101,24 +108,24 @@
<p2 x="720" y="340"/> <p2 x="720" y="340"/>
</wire> </wire>
<wire> <wire>
<p1 x="600" y="280"/> <p1 x="580" y="280"/>
<p2 x="620" y="280"/> <p2 x="620" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="500" y="360"/> <p1 x="520" y="360"/>
<p2 x="600" y="360"/> <p2 x="540" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="600" y="360"/> <p1 x="540" y="360"/>
<p2 x="620" y="360"/> <p2 x="620" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="600" y="280"/> <p1 x="540" y="240"/>
<p2 x="600" y="360"/> <p2 x="540" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="520" y="240"/> <p1 x="540" y="320"/>
<p2 x="520" y="320"/> <p2 x="540" y="360"/>
</wire> </wire>
</wires> </wires>
</circuit> </circuit>

4
src/test/resources/dig/test/arith/FullSub.dig
View File

@ -37,7 +37,7 @@
<elementAttributes> <elementAttributes>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>BO_i-1</string> <string>BO_{i-1}</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="220" y="200"/> <pos x="220" y="200"/>
@ -83,7 +83,7 @@
<entry> <entry>
<string>Testdata</string> <string>Testdata</string>
<testData> <testData>
<dataString>A_i B_i BO_i-1 BO_i S_i <dataString>A_i B_i BO_{i-1} BO_i S_i
0 0 0 0 0 0 0 0 0 0
0 0 1 1 1 0 0 1 1 1
0 1 0 1 1 0 1 0 1 1

16
src/test/resources/dig/test/arith/HalfAdder.dig
View File

@ -72,12 +72,12 @@
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="560" y="240"/> <p1 x="580" y="280"/>
<p2 x="580" y="320"/> <p2 x="560" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="580" y="280"/> <p1 x="560" y="280"/>
<p2 x="560" y="360"/> <p2 x="580" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="580" y="320"/> <p1 x="580" y="320"/>
@ -111,5 +111,13 @@
<p1 x="560" y="360"/> <p1 x="560" y="360"/>
<p2 x="600" y="360"/> <p2 x="600" y="360"/>
</wire> </wire>
<wire>
<p1 x="560" y="240"/>
<p2 x="560" y="280"/>
</wire>
<wire>
<p1 x="560" y="320"/>
<p2 x="560" y="360"/>
</wire>
</wires> </wires>
</circuit> </circuit>

55
src/test/resources/dig/test/arith/HalfSub.dig
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<circuit> <circuit>
<version>1</version> <version>1</version>
<attributes/>
<visualElements> <visualElements>
<visualElement> <visualElement>
<elementName>XOr</elementName> <elementName>XOr</elementName>
@ -9,7 +10,14 @@
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>And</elementName> <elementName>And</elementName>
<elementAttributes/> <elementAttributes>
<entry>
<string>inverterConfig</string>
<inverterConfig>
<string>In_1</string>
</inverterConfig>
</entry>
</elementAttributes>
<pos x="620" y="320"/> <pos x="620" y="320"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
@ -20,7 +28,7 @@
<string>$A$</string> <string>$A$</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="500" y="240"/> <pos x="540" y="240"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -30,7 +38,7 @@
<string>$B$</string> <string>$B$</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="500" y="360"/> <pos x="540" y="360"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -52,11 +60,6 @@
</elementAttributes> </elementAttributes>
<pos x="720" y="340"/> <pos x="720" y="340"/>
</visualElement> </visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="540" y="320"/>
</visualElement>
<visualElement> <visualElement>
<elementName>Testcase</elementName> <elementName>Testcase</elementName>
<elementAttributes> <elementAttributes>
@ -77,21 +80,21 @@
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="500" y="240"/> <p1 x="560" y="280"/>
<p2 x="520" y="240"/> <p2 x="600" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="520" y="240"/> <p1 x="600" y="280"/>
<p2 x="560" y="320"/>
</wire>
<wire>
<p1 x="540" y="240"/>
<p2 x="560" y="240"/>
</wire>
<wire>
<p1 x="560" y="240"/>
<p2 x="620" y="240"/> <p2 x="620" y="240"/>
</wire> </wire>
<wire>
<p1 x="580" y="320"/>
<p2 x="620" y="320"/>
</wire>
<wire>
<p1 x="520" y="320"/>
<p2 x="540" y="320"/>
</wire>
<wire> <wire>
<p1 x="680" y="260"/> <p1 x="680" y="260"/>
<p2 x="720" y="260"/> <p2 x="720" y="260"/>
@ -105,20 +108,20 @@
<p2 x="620" y="280"/> <p2 x="620" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="500" y="360"/> <p1 x="540" y="360"/>
<p2 x="600" y="360"/> <p2 x="560" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="600" y="360"/> <p1 x="560" y="360"/>
<p2 x="620" y="360"/> <p2 x="620" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="600" y="280"/> <p1 x="560" y="240"/>
<p2 x="600" y="360"/> <p2 x="560" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="520" y="240"/> <p1 x="560" y="320"/>
<p2 x="520" y="320"/> <p2 x="560" y="360"/>
</wire> </wire>
</wires> </wires>
</circuit> </circuit>