From 5acbf7d0cca94ee4a1416d9ab8e79f5c2036e76f Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Fri, 24 Feb 2017 09:55:21 +0100
Subject: [PATCH] more clear VDD shape

---
 src/main/dig/cmos/and.dig                     | 72 +++++++++----------
 src/main/dig/cmos/tristateOut.dig             | 62 ++++++++--------
 .../neemann/digital/draw/shapes/VDDShape.java |  9 ++-
 3 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/src/main/dig/cmos/and.dig b/src/main/dig/cmos/and.dig
index c51aaf084..d49cc9436 100644
--- a/src/main/dig/cmos/and.dig
+++ b/src/main/dig/cmos/and.dig
@@ -25,7 +25,7 @@
           <string>Y</string>
         </entry>
       </elementAttributes>
-      <pos x="360" y="380"/>
+      <pos x="380" y="380"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
@@ -112,7 +112,7 @@
           <string>T6</string>
         </entry>
       </elementAttributes>
-      <pos x="320" y="420"/>
+      <pos x="340" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>PFET</elementName>
@@ -122,7 +122,7 @@
           <string>T5</string>
         </entry>
       </elementAttributes>
-      <pos x="320" y="300"/>
+      <pos x="340" y="320"/>
     </visualElement>
   </visualElements>
   <wires>
@@ -140,12 +140,16 @@
     </wire>
     <wire>
       <p1 x="260" y="240"/>
-      <p2 x="340" y="240"/>
+      <p2 x="360" y="240"/>
     </wire>
     <wire>
       <p1 x="180" y="320"/>
       <p2 x="240" y="320"/>
     </wire>
+    <wire>
+      <p1 x="320" y="320"/>
+      <p2 x="340" y="320"/>
+    </wire>
     <wire>
       <p1 x="140" y="500"/>
       <p2 x="200" y="500"/>
@@ -156,31 +160,27 @@
     </wire>
     <wire>
       <p1 x="220" y="520"/>
-      <p2 x="340" y="520"/>
+      <p2 x="360" y="520"/>
     </wire>
     <wire>
       <p1 x="180" y="440"/>
       <p2 x="200" y="440"/>
     </wire>
+    <wire>
+      <p1 x="320" y="440"/>
+      <p2 x="340" y="440"/>
+    </wire>
     <wire>
       <p1 x="120" y="460"/>
       <p2 x="140" y="460"/>
     </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>
       <p1 x="120" y="300"/>
       <p2 x="140" y="300"/>
     </wire>
     <wire>
-      <p1 x="340" y="380"/>
-      <p2 x="360" y="380"/>
+      <p1 x="360" y="380"/>
+      <p2 x="380" y="380"/>
     </wire>
     <wire>
       <p1 x="220" y="380"/>
@@ -188,23 +188,15 @@
     </wire>
     <wire>
       <p1 x="260" y="380"/>
-      <p2 x="300" y="380"/>
+      <p2 x="320" y="380"/>
     </wire>
     <wire>
-      <p1 x="340" y="240"/>
-      <p2 x="340" y="300"/>
+      <p1 x="320" y="320"/>
+      <p2 x="320" y="380"/>
     </wire>
     <wire>
-      <p1 x="340" y="460"/>
-      <p2 x="340" y="520"/>
-    </wire>
-    <wire>
-      <p1 x="340" y="340"/>
-      <p2 x="340" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="340" y="380"/>
-      <p2 x="340" y="420"/>
+      <p1 x="320" y="380"/>
+      <p2 x="320" y="440"/>
     </wire>
     <wire>
       <p1 x="260" y="240"/>
@@ -214,6 +206,22 @@
       <p1 x="260" y="360"/>
       <p2 x="260" y="380"/>
     </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>
       <p1 x="140" y="260"/>
       <p2 x="140" y="300"/>
@@ -258,13 +266,5 @@
       <p1 x="220" y="520"/>
       <p2 x="220" y="540"/>
     </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>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/cmos/tristateOut.dig b/src/main/dig/cmos/tristateOut.dig
index e297409cd..4d8b3b1a0 100644
--- a/src/main/dig/cmos/tristateOut.dig
+++ b/src/main/dig/cmos/tristateOut.dig
@@ -60,7 +60,7 @@
           <string>T2</string>
         </entry>
       </elementAttributes>
-      <pos x="380" y="380"/>
+      <pos x="360" y="380"/>
     </visualElement>
     <visualElement>
       <elementName>PFET</elementName>
@@ -70,7 +70,7 @@
           <string>T1</string>
         </entry>
       </elementAttributes>
-      <pos x="380" y="300"/>
+      <pos x="360" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -80,7 +80,7 @@
           <string>out</string>
         </entry>
       </elementAttributes>
-      <pos x="320" y="480"/>
+      <pos x="300" y="480"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -90,7 +90,7 @@
           <string>en</string>
         </entry>
       </elementAttributes>
-      <pos x="320" y="420"/>
+      <pos x="300" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -122,11 +122,11 @@
   </visualElements>
   <wires>
     <wire>
-      <p1 x="400" y="560"/>
+      <p1 x="380" y="560"/>
       <p2 x="520" y="560"/>
     </wire>
     <wire>
-      <p1 x="320" y="480"/>
+      <p1 x="300" y="480"/>
       <p2 x="480" y="480"/>
     </wire>
     <wire>
@@ -134,19 +134,19 @@
       <p2 x="500" y="480"/>
     </wire>
     <wire>
-      <p1 x="320" y="420"/>
-      <p2 x="360" y="420"/>
+      <p1 x="300" y="420"/>
+      <p2 x="340" y="420"/>
     </wire>
     <wire>
       <p1 x="520" y="420"/>
       <p2 x="580" y="420"/>
     </wire>
     <wire>
-      <p1 x="360" y="420"/>
-      <p2 x="380" y="420"/>
+      <p1 x="340" y="420"/>
+      <p2 x="360" y="420"/>
     </wire>
     <wire>
-      <p1 x="400" y="280"/>
+      <p1 x="380" y="280"/>
       <p2 x="520" y="280"/>
     </wire>
     <wire>
@@ -154,19 +154,19 @@
       <p2 x="500" y="360"/>
     </wire>
     <wire>
-      <p1 x="400" y="360"/>
+      <p1 x="380" y="360"/>
       <p2 x="440" y="360"/>
     </wire>
     <wire>
-      <p1 x="360" y="300"/>
-      <p2 x="380" y="300"/>
+      <p1 x="340" y="300"/>
+      <p2 x="360" y="300"/>
     </wire>
     <wire>
       <p1 x="440" y="300"/>
       <p2 x="500" y="300"/>
     </wire>
     <wire>
-      <p1 x="360" y="540"/>
+      <p1 x="340" y="540"/>
       <p2 x="500" y="540"/>
     </wire>
     <wire>
@@ -174,20 +174,12 @@
       <p2 x="480" y="480"/>
     </wire>
     <wire>
-      <p1 x="400" y="340"/>
-      <p2 x="400" y="360"/>
+      <p1 x="340" y="300"/>
+      <p2 x="340" y="420"/>
     </wire>
     <wire>
-      <p1 x="400" y="280"/>
-      <p2 x="400" y="300"/>
-    </wire>
-    <wire>
-      <p1 x="400" y="420"/>
-      <p2 x="400" y="560"/>
-    </wire>
-    <wire>
-      <p1 x="400" y="360"/>
-      <p2 x="400" y="380"/>
+      <p1 x="340" y="420"/>
+      <p2 x="340" y="540"/>
     </wire>
     <wire>
       <p1 x="520" y="260"/>
@@ -226,12 +218,20 @@
       <p2 x="440" y="360"/>
     </wire>
     <wire>
-      <p1 x="360" y="300"/>
-      <p2 x="360" y="420"/>
+      <p1 x="380" y="340"/>
+      <p2 x="380" y="360"/>
     </wire>
     <wire>
-      <p1 x="360" y="420"/>
-      <p2 x="360" y="540"/>
+      <p1 x="380" y="280"/>
+      <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>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/java/de/neemann/digital/draw/shapes/VDDShape.java b/src/main/java/de/neemann/digital/draw/shapes/VDDShape.java
index 895e8dddc..c534111a6 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/VDDShape.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/VDDShape.java
@@ -47,11 +47,10 @@ public class VDDShape implements Shape {
     @Override
     public void drawTo(Graphic graphic, boolean heighLight) {
         graphic.drawPolygon(
-                new Polygon(true)
+                new Polygon(false)
                         .add(-SIZE2, 0)
-                        .add(SIZE2, 0)
-                        .add(0, -SIZE*2/3),
-                Style.NORMAL
-        );
+                        .add(0, -SIZE * 2 / 3)
+                        .add(SIZE2, 0), Style.NORMAL);
+        graphic.drawLine(new Vector(0, -SIZE2), new Vector(0, 0), Style.NORMAL);
     }
 }