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

more clear VDD shape

Browse Source
This commit is contained in:
hneemann 2017-02-24 09:55:21 +01:00
parent cb89388262
commit 5acbf7d0cc
3 changed files with 71 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/main/dig/cmos/and.dig
View File

@ -25,7 +25,7 @@
<string>Y</string> <string>Y</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="360" y="380"/> <pos x="380" y="380"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>NFET</elementName> <elementName>NFET</elementName>
@ -112,7 +112,7 @@
<string>T6</string> <string>T6</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="320" y="420"/> <pos x="340" y="400"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>PFET</elementName> <elementName>PFET</elementName>
@ -122,7 +122,7 @@
<string>T5</string> <string>T5</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="320" y="300"/> <pos x="340" y="320"/>
</visualElement> </visualElement>
</visualElements> </visualElements>
<wires> <wires>
@ -140,12 +140,16 @@
</wire> </wire>
<wire> <wire>
<p1 x="260" y="240"/> <p1 x="260" y="240"/>
<p2 x="340" y="240"/> <p2 x="360" y="240"/>
</wire> </wire>
<wire> <wire>
<p1 x="180" y="320"/> <p1 x="180" y="320"/>
<p2 x="240" y="320"/> <p2 x="240" y="320"/>
</wire> </wire>
<wire>
<p1 x="320" y="320"/>
<p2 x="340" y="320"/>
</wire>
<wire> <wire>
<p1 x="140" y="500"/> <p1 x="140" y="500"/>
<p2 x="200" y="500"/> <p2 x="200" y="500"/>
@ -156,31 +160,27 @@
</wire> </wire>
<wire> <wire>
<p1 x="220" y="520"/> <p1 x="220" y="520"/>
<p2 x="340" y="520"/> <p2 x="360" y="520"/>
</wire> </wire>
<wire> <wire>
<p1 x="180" y="440"/> <p1 x="180" y="440"/>
<p2 x="200" y="440"/> <p2 x="200" y="440"/>
</wire> </wire>
<wire>
<p1 x="320" y="440"/>
<p2 x="340" y="440"/>
</wire>
<wire> <wire>
<p1 x="120" y="460"/> <p1 x="120" y="460"/>
<p2 x="140" y="460"/> <p2 x="140" y="460"/>
</wire> </wire>
<wire>
<p1 x="300" y="460"/>
<p2 x="320" y="460"/>
</wire>
<wire>
<p1 x="300" y="300"/>
<p2 x="320" y="300"/>
</wire>
<wire> <wire>
<p1 x="120" y="300"/> <p1 x="120" y="300"/>
<p2 x="140" y="300"/> <p2 x="140" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="340" y="380"/> <p1 x="360" y="380"/>
<p2 x="360" y="380"/> <p2 x="380" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="220" y="380"/> <p1 x="220" y="380"/>
@ -188,23 +188,15 @@
</wire> </wire>
<wire> <wire>
<p1 x="260" y="380"/> <p1 x="260" y="380"/>
<p2 x="300" y="380"/> <p2 x="320" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="340" y="240"/> <p1 x="320" y="320"/>
<p2 x="340" y="300"/> <p2 x="320" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="340" y="460"/> <p1 x="320" y="380"/>
<p2 x="340" y="520"/> <p2 x="320" y="440"/>
</wire>
<wire>
<p1 x="340" y="340"/>
<p2 x="340" y="380"/>
</wire>
<wire>
<p1 x="340" y="380"/>
<p2 x="340" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="260" y="240"/> <p1 x="260" y="240"/>
@ -214,6 +206,22 @@
<p1 x="260" y="360"/> <p1 x="260" y="360"/>
<p2 x="260" y="380"/> <p2 x="260" y="380"/>
</wire> </wire>
<wire>
<p1 x="360" y="240"/>
<p2 x="360" y="320"/>
</wire>
<wire>
<p1 x="360" y="440"/>
<p2 x="360" y="520"/>
</wire>
<wire>
<p1 x="360" y="360"/>
<p2 x="360" y="380"/>
</wire>
<wire>
<p1 x="360" y="380"/>
<p2 x="360" y="400"/>
</wire>
<wire> <wire>
<p1 x="140" y="260"/> <p1 x="140" y="260"/>
<p2 x="140" y="300"/> <p2 x="140" y="300"/>
@ -258,13 +266,5 @@
<p1 x="220" y="520"/> <p1 x="220" y="520"/>
<p2 x="220" y="540"/> <p2 x="220" y="540"/>
</wire> </wire>
<wire>
<p1 x="300" y="300"/>
<p2 x="300" y="380"/>
</wire>
<wire>
<p1 x="300" y="380"/>
<p2 x="300" y="460"/>
</wire>
</wires> </wires>
</circuit> </circuit>

62
src/main/dig/cmos/tristateOut.dig
View File

@ -60,7 +60,7 @@
<string>T2</string> <string>T2</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="380" y="380"/> <pos x="360" y="380"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>PFET</elementName> <elementName>PFET</elementName>
@ -70,7 +70,7 @@
<string>T1</string> <string>T1</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="380" y="300"/> <pos x="360" y="300"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -80,7 +80,7 @@
<string>out</string> <string>out</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="320" y="480"/> <pos x="300" y="480"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -90,7 +90,7 @@
<string>en</string> <string>en</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="320" y="420"/> <pos x="300" y="420"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -122,11 +122,11 @@
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="400" y="560"/> <p1 x="380" y="560"/>
<p2 x="520" y="560"/> <p2 x="520" y="560"/>
</wire> </wire>
<wire> <wire>
<p1 x="320" y="480"/> <p1 x="300" y="480"/>
<p2 x="480" y="480"/> <p2 x="480" y="480"/>
</wire> </wire>
<wire> <wire>
@ -134,19 +134,19 @@
<p2 x="500" y="480"/> <p2 x="500" y="480"/>
</wire> </wire>
<wire> <wire>
<p1 x="320" y="420"/> <p1 x="300" y="420"/>
<p2 x="360" y="420"/> <p2 x="340" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="520" y="420"/> <p1 x="520" y="420"/>
<p2 x="580" y="420"/> <p2 x="580" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="360" y="420"/> <p1 x="340" y="420"/>
<p2 x="380" y="420"/> <p2 x="360" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="400" y="280"/> <p1 x="380" y="280"/>
<p2 x="520" y="280"/> <p2 x="520" y="280"/>
</wire> </wire>
<wire> <wire>
@ -154,19 +154,19 @@
<p2 x="500" y="360"/> <p2 x="500" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="400" y="360"/> <p1 x="380" y="360"/>
<p2 x="440" y="360"/> <p2 x="440" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="360" y="300"/> <p1 x="340" y="300"/>
<p2 x="380" y="300"/> <p2 x="360" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="440" y="300"/> <p1 x="440" y="300"/>
<p2 x="500" y="300"/> <p2 x="500" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="360" y="540"/> <p1 x="340" y="540"/>
<p2 x="500" y="540"/> <p2 x="500" y="540"/>
</wire> </wire>
<wire> <wire>
@ -174,20 +174,12 @@
<p2 x="480" y="480"/> <p2 x="480" y="480"/>
</wire> </wire>
<wire> <wire>
<p1 x="400" y="340"/> <p1 x="340" y="300"/>
<p2 x="400" y="360"/> <p2 x="340" y="420"/>
</wire> </wire>
<wire> <wire>
<p1 x="400" y="280"/> <p1 x="340" y="420"/>
<p2 x="400" y="300"/> <p2 x="340" y="540"/>
</wire>
<wire>
<p1 x="400" y="420"/>
<p2 x="400" y="560"/>
</wire>
<wire>
<p1 x="400" y="360"/>
<p2 x="400" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="520" y="260"/> <p1 x="520" y="260"/>
@ -226,12 +218,20 @@
<p2 x="440" y="360"/> <p2 x="440" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="360" y="300"/> <p1 x="380" y="340"/>
<p2 x="360" y="420"/> <p2 x="380" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="360" y="420"/> <p1 x="380" y="280"/>
<p2 x="360" y="540"/> <p2 x="380" y="300"/>
</wire>
<wire>
<p1 x="380" y="420"/>
<p2 x="380" y="560"/>
</wire>
<wire>
<p1 x="380" y="360"/>
<p2 x="380" y="380"/>
</wire> </wire>
</wires> </wires>
</circuit> </circuit>

9
src/main/java/de/neemann/digital/draw/shapes/VDDShape.java
View File

@ -47,11 +47,10 @@ public class VDDShape implements Shape {
@Override @Override
public void drawTo(Graphic graphic, boolean heighLight) { public void drawTo(Graphic graphic, boolean heighLight) {
graphic.drawPolygon( graphic.drawPolygon(
new Polygon(true) new Polygon(false)
.add(-SIZE2, 0) .add(-SIZE2, 0)
.add(SIZE2, 0) .add(0, -SIZE * 2 / 3)
.add(0, -SIZE*2/3), .add(SIZE2, 0), Style.NORMAL);
Style.NORMAL graphic.drawLine(new Vector(0, -SIZE2), new Vector(0, 0), Style.NORMAL);
);
} }
} }