minor layout modifications

This commit is contained in:
hneemann 2019-05-03 19:44:19 +02:00
parent 0c3377976a
commit ec6a043544
4 changed files with 109 additions and 64 deletions

View File

@ -348,6 +348,10 @@ end loop</dataString>
<string>Label</string>
<string>P=Q_i</string>
</entry>
<entry>
<string>InDefault</string>
<value v="1" z="false"/>
</entry>
</elementAttributes>
<pos x="-60" y="-260"/>
</visualElement>

View File

@ -19,7 +19,7 @@
<value v="1" z="false"/>
</entry>
</elementAttributes>
<pos x="520" y="420"/>
<pos x="500" y="420"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
@ -54,7 +54,7 @@
<string>x_0</string>
</entry>
</elementAttributes>
<pos x="520" y="480"/>
<pos x="500" y="480"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
@ -72,12 +72,17 @@
<value v="1" z="false"/>
</entry>
</elementAttributes>
<pos x="520" y="540"/>
<pos x="500" y="540"/>
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="560" y="460"/>
<elementAttributes>
<entry>
<string>wideShape</string>
<boolean>true</boolean>
</entry>
</elementAttributes>
<pos x="540" y="460"/>
</visualElement>
<visualElement>
<elementName>Data</elementName>
@ -100,19 +105,19 @@
<p2 x="860" y="480"/>
</wire>
<wire>
<p1 x="520" y="480"/>
<p2 x="540" y="480"/>
<p1 x="500" y="480"/>
<p2 x="520" y="480"/>
</wire>
<wire>
<p1 x="720" y="500"/>
<p2 x="760" y="500"/>
</wire>
<wire>
<p1 x="540" y="500"/>
<p1 x="520" y="500"/>
<p2 x="620" y="500"/>
</wire>
<wire>
<p1 x="520" y="420"/>
<p1 x="500" y="420"/>
<p2 x="620" y="420"/>
</wire>
<wire>
@ -132,11 +137,11 @@
<p2 x="620" y="460"/>
</wire>
<wire>
<p1 x="540" y="460"/>
<p2 x="560" y="460"/>
<p1 x="520" y="460"/>
<p2 x="540" y="460"/>
</wire>
<wire>
<p1 x="520" y="540"/>
<p1 x="500" y="540"/>
<p2 x="620" y="540"/>
</wire>
<wire>
@ -148,12 +153,12 @@
<p2 x="720" y="520"/>
</wire>
<wire>
<p1 x="540" y="460"/>
<p2 x="540" y="480"/>
<p1 x="520" y="460"/>
<p2 x="520" y="480"/>
</wire>
<wire>
<p1 x="540" y="480"/>
<p2 x="540" y="500"/>
<p1 x="520" y="480"/>
<p2 x="520" y="500"/>
</wire>
</wires>
<measurementOrdering>

View File

@ -81,8 +81,13 @@
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="620" y="460"/>
<elementAttributes>
<entry>
<string>wideShape</string>
<boolean>true</boolean>
</entry>
</elementAttributes>
<pos x="600" y="460"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
@ -107,10 +112,10 @@
<wires>
<wire>
<p1 x="520" y="480"/>
<p2 x="600" y="480"/>
<p2 x="580" y="480"/>
</wire>
<wire>
<p1 x="600" y="500"/>
<p1 x="580" y="500"/>
<p2 x="680" y="500"/>
</wire>
<wire>
@ -150,8 +155,8 @@
<p2 x="680" y="460"/>
</wire>
<wire>
<p1 x="600" y="460"/>
<p2 x="620" y="460"/>
<p1 x="580" y="460"/>
<p2 x="600" y="460"/>
</wire>
<wire>
<p1 x="520" y="540"/>
@ -178,12 +183,12 @@
<p2 x="560" y="620"/>
</wire>
<wire>
<p1 x="600" y="460"/>
<p2 x="600" y="480"/>
<p1 x="580" y="460"/>
<p2 x="580" y="480"/>
</wire>
<wire>
<p1 x="600" y="480"/>
<p2 x="600" y="500"/>
<p1 x="580" y="480"/>
<p2 x="580" y="500"/>
</wire>
<wire>
<p1 x="780" y="440"/>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes/>
<visualElements>
<visualElement>
<elementName>NOr</elementName>
@ -20,7 +21,7 @@
<string>D</string>
</entry>
</elementAttributes>
<pos x="1060" y="440"/>
<pos x="940" y="440"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
@ -30,7 +31,7 @@
<string>C</string>
</entry>
</elementAttributes>
<pos x="1060" y="540"/>
<pos x="940" y="540"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
@ -64,23 +65,28 @@
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="1200" y="440"/>
<elementAttributes>
<entry>
<string>wideShape</string>
<boolean>true</boolean>
</entry>
</elementAttributes>
<pos x="1140" y="440"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
<elementAttributes/>
<pos x="1240" y="520"/>
</visualElement>
<visualElement>
<elementName>Delay</elementName>
<elementAttributes/>
<pos x="1180" y="520"/>
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes/>
<pos x="1120" y="520"/>
<elementAttributes>
<entry>
<string>wideShape</string>
<boolean>true</boolean>
</entry>
</elementAttributes>
<pos x="1000" y="520"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
@ -101,6 +107,26 @@ C 0 0 1
</elementAttributes>
<pos x="1540" y="640"/>
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes>
<entry>
<string>wideShape</string>
<boolean>true</boolean>
</entry>
</elementAttributes>
<pos x="1080" y="520"/>
</visualElement>
<visualElement>
<elementName>Not</elementName>
<elementAttributes>
<entry>
<string>wideShape</string>
<boolean>true</boolean>
</entry>
</elementAttributes>
<pos x="1160" y="520"/>
</visualElement>
</visualElements>
<wires>
<wire>
@ -124,11 +150,11 @@ C 0 0 1
<p2 x="1580" y="480"/>
</wire>
<wire>
<p1 x="1080" y="640"/>
<p1 x="960" y="640"/>
<p2 x="1340" y="640"/>
</wire>
<wire>
<p1 x="1100" y="560"/>
<p1 x="980" y="560"/>
<p2 x="1240" y="560"/>
</wire>
<wire>
@ -152,29 +178,33 @@ C 0 0 1
<p2 x="1580" y="600"/>
</wire>
<wire>
<p1 x="1240" y="440"/>
<p1 x="1200" y="440"/>
<p2 x="1340" y="440"/>
</wire>
<wire>
<p1 x="1060" y="440"/>
<p2 x="1080" y="440"/>
<p1 x="940" y="440"/>
<p2 x="960" y="440"/>
</wire>
<wire>
<p1 x="1080" y="440"/>
<p2 x="1200" y="440"/>
<p1 x="960" y="440"/>
<p2 x="1140" y="440"/>
</wire>
<wire>
<p1 x="1100" y="520"/>
<p2 x="1120" y="520"/>
<p1 x="980" y="520"/>
<p2 x="1000" y="520"/>
</wire>
<wire>
<p1 x="1140" y="520"/>
<p2 x="1160" y="520"/>
</wire>
<wire>
<p1 x="1060" y="520"/>
<p2 x="1080" y="520"/>
</wire>
<wire>
<p1 x="1220" y="520"/>
<p2 x="1240" y="520"/>
</wire>
<wire>
<p1 x="1160" y="520"/>
<p2 x="1180" y="520"/>
</wire>
<wire>
<p1 x="1400" y="620"/>
<p2 x="1440" y="620"/>
@ -188,8 +218,12 @@ C 0 0 1
<p2 x="1320" y="540"/>
</wire>
<wire>
<p1 x="1060" y="540"/>
<p2 x="1100" y="540"/>
<p1 x="940" y="540"/>
<p2 x="980" y="540"/>
</wire>
<wire>
<p1 x="960" y="440"/>
<p2 x="960" y="640"/>
</wire>
<wire>
<p1 x="1540" y="480"/>
@ -199,6 +233,14 @@ C 0 0 1
<p1 x="1540" y="560"/>
<p2 x="1540" y="600"/>
</wire>
<wire>
<p1 x="980" y="520"/>
<p2 x="980" y="540"/>
</wire>
<wire>
<p1 x="980" y="540"/>
<p2 x="980" y="560"/>
</wire>
<wire>
<p1 x="1320" y="480"/>
<p2 x="1320" y="540"/>
@ -207,10 +249,6 @@ C 0 0 1
<p1 x="1320" y="540"/>
<p2 x="1320" y="600"/>
</wire>
<wire>
<p1 x="1080" y="440"/>
<p2 x="1080" y="640"/>
</wire>
<wire>
<p1 x="1420" y="560"/>
<p2 x="1420" y="580"/>
@ -219,13 +257,6 @@ C 0 0 1
<p1 x="1420" y="500"/>
<p2 x="1420" y="520"/>
</wire>
<wire>
<p1 x="1100" y="520"/>
<p2 x="1100" y="540"/>
</wire>
<wire>
<p1 x="1100" y="540"/>
<p2 x="1100" y="560"/>
</wire>
</wires>
<measurementOrdering/>
</circuit>