From 5b8a5d9785131ca27ffa802f2f9fd6a860189ad8 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Thu, 23 Feb 2017 12:20:09 +0100
Subject: [PATCH] improved fet shape including bulk connection

---
 .../digital/draw/shapes/NFETShape.java        |   9 +-
 .../digital/draw/shapes/PFETShape.java        |  11 +-
 src/test/resources/dig/test/fet/and.dig       | 102 ++++++++----------
 3 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/src/main/java/de/neemann/digital/draw/shapes/NFETShape.java b/src/main/java/de/neemann/digital/draw/shapes/NFETShape.java
index dc885e9f2..550e09e67 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/NFETShape.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/NFETShape.java
@@ -60,12 +60,15 @@ public class NFETShape implements Shape {
                 .add(x1, SIZE * 2)
                 .add(x1, SIZE * 2 - SIZE2 + g), Style.NORMAL);
 
-        graphic.drawLine(new Vector(SIZE2 + 3, SIZE), new Vector(SIZE + 2, SIZE), Style.THIN);
+        graphic.drawPolygon(new Polygon(false)
+                .add(SIZE2 + 3, SIZE)
+                .add(SIZE, SIZE)
+                .add(SIZE, SIZE * 2), Style.THIN);
 
         graphic.drawPolygon(new Polygon(true)
                 .add(x1 + 4, SIZE)
-                .add(SIZE, SIZE - SIZE2 / 3)
-                .add(SIZE, SIZE + SIZE2 / 3), Style.THIN_FILLED);
+                .add(SIZE - SIZE2 / 3, SIZE - SIZE2 / 4)
+                .add(SIZE - SIZE2 / 3, SIZE + SIZE2 / 4), Style.THIN_FILLED);
 
         graphic.drawLine(new Vector(x1, SIZE2 + g), new Vector(x1, SIZE + SIZE2 - g), Style.NORMAL);
 
diff --git a/src/main/java/de/neemann/digital/draw/shapes/PFETShape.java b/src/main/java/de/neemann/digital/draw/shapes/PFETShape.java
index 54220a376..e69281423 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/PFETShape.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/PFETShape.java
@@ -60,12 +60,15 @@ public class PFETShape implements Shape {
                 .add(x1, SIZE * 2)
                 .add(x1, SIZE * 2 - SIZE2 + g), Style.NORMAL);
 
-        graphic.drawLine(new Vector(x1, SIZE), new Vector(SIZE - 2, SIZE), Style.THIN);
+        graphic.drawPolygon(new Polygon(false)
+                .add(x1, SIZE)
+                .add(SIZE, SIZE)
+                .add(SIZE, 0), Style.THIN);
 
         graphic.drawPolygon(new Polygon(true)
-                .add(SIZE, SIZE)
-                .add(x1 + 4, SIZE - SIZE2 / 3)
-                .add(x1 + 4, SIZE + SIZE2 / 3), Style.THIN_FILLED);
+                .add(SIZE-SIZE2/3, SIZE)
+                .add(x1 + 4, SIZE - SIZE2 / 4)
+                .add(x1 + 4, SIZE + SIZE2 / 4), Style.THIN_FILLED);
 
         graphic.drawLine(new Vector(x1, SIZE2 + g), new Vector(x1, SIZE + SIZE2 - g), Style.NORMAL);
 
diff --git a/src/test/resources/dig/test/fet/and.dig b/src/test/resources/dig/test/fet/and.dig
index 85c63cf0e..e20009676 100644
--- a/src/test/resources/dig/test/fet/and.dig
+++ b/src/test/resources/dig/test/fet/and.dig
@@ -5,7 +5,7 @@
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes/>
-      <pos x="240" y="220"/>
+      <pos x="220" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -30,7 +30,7 @@
     <visualElement>
       <elementName>NFET</elementName>
       <elementAttributes/>
-      <pos x="220" y="400"/>
+      <pos x="200" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>PFET</elementName>
@@ -40,7 +40,7 @@
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="240" y="540"/>
+      <pos x="220" y="540"/>
     </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
@@ -72,12 +72,12 @@
           <string>B</string>
         </entry>
       </elementAttributes>
-      <pos x="140" y="340"/>
+      <pos x="140" y="460"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
       <elementAttributes/>
-      <pos x="220" y="460"/>
+      <pos x="200" y="460"/>
     </visualElement>
     <visualElement>
       <elementName>PFET</elementName>
@@ -98,10 +98,6 @@
   <wires>
     <wire>
       <p1 x="220" y="240"/>
-      <p2 x="240" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="240"/>
       <p2 x="260" y="240"/>
     </wire>
     <wire>
@@ -114,23 +110,27 @@
     </wire>
     <wire>
       <p1 x="160" y="500"/>
-      <p2 x="220" y="500"/>
+      <p2 x="200" y="500"/>
     </wire>
     <wire>
       <p1 x="180" y="260"/>
       <p2 x="200" y="260"/>
     </wire>
     <wire>
-      <p1 x="140" y="340"/>
-      <p2 x="160" y="340"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="520"/>
+      <p1 x="220" y="520"/>
       <p2 x="340" y="520"/>
     </wire>
     <wire>
       <p1 x="180" y="440"/>
-      <p2 x="220" y="440"/>
+      <p2 x="200" y="440"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="460"/>
+      <p2 x="160" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="300" y="460"/>
+      <p2 x="320" y="460"/>
     </wire>
     <wire>
       <p1 x="300" y="300"/>
@@ -140,54 +140,26 @@
       <p1 x="140" y="300"/>
       <p2 x="180" y="300"/>
     </wire>
-    <wire>
-      <p1 x="220" y="380"/>
-      <p2 x="240" y="380"/>
-    </wire>
     <wire>
       <p1 x="340" y="380"/>
       <p2 x="360" y="380"/>
     </wire>
     <wire>
-      <p1 x="240" y="380"/>
+      <p1 x="220" y="380"/>
       <p2 x="260" y="380"/>
     </wire>
     <wire>
       <p1 x="260" y="380"/>
       <p2 x="300" y="380"/>
     </wire>
-    <wire>
-      <p1 x="300" y="460"/>
-      <p2 x="320" y="460"/>
-    </wire>
     <wire>
       <p1 x="160" y="320"/>
-      <p2 x="160" y="340"/>
+      <p2 x="160" y="460"/>
     </wire>
     <wire>
-      <p1 x="160" y="340"/>
+      <p1 x="160" y="460"/>
       <p2 x="160" y="500"/>
     </wire>
-    <wire>
-      <p1 x="240" y="220"/>
-      <p2 x="240" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="440"/>
-      <p2 x="240" y="460"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="500"/>
-      <p2 x="240" y="520"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="380"/>
-      <p2 x="240" y="400"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="520"/>
-      <p2 x="240" y="540"/>
-    </wire>
     <wire>
       <p1 x="340" y="240"/>
       <p2 x="340" y="300"/>
@@ -220,6 +192,34 @@
       <p1 x="260" y="360"/>
       <p2 x="260" y="380"/>
     </wire>
+    <wire>
+      <p1 x="220" y="220"/>
+      <p2 x="220" y="240"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="300"/>
+      <p2 x="220" y="380"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="500"/>
+      <p2 x="220" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="440"/>
+      <p2 x="220" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="240"/>
+      <p2 x="220" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="380"/>
+      <p2 x="220" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="520"/>
+      <p2 x="220" y="540"/>
+    </wire>
     <wire>
       <p1 x="300" y="300"/>
       <p2 x="300" y="380"/>
@@ -228,13 +228,5 @@
       <p1 x="300" y="380"/>
       <p2 x="300" y="460"/>
     </wire>
-    <wire>
-      <p1 x="220" y="240"/>
-      <p2 x="220" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="300"/>
-      <p2 x="220" y="380"/>
-    </wire>
   </wires>
 </circuit>
\ No newline at end of file