From ac34655662535380453ed3d53e98c4b58e9a78ef Mon Sep 17 00:00:00 2001 From: "helmut.neemann" Date: Wed, 11 May 2016 13:07:01 +0200 Subject: [PATCH] minor changes to ieee shapes --- .../de/neemann/digital/draw/shapes/ieee/IEEEAndShape.java | 8 ++++---- .../digital/draw/shapes/ieee/IEEEGenericShape.java | 4 ++-- .../de/neemann/digital/draw/shapes/ieee/IEEEOrShape.java | 2 +- .../de/neemann/digital/draw/shapes/ieee/IEEEXOrShape.java | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEAndShape.java b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEAndShape.java index 10085bd64..35ef8653e 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEAndShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEAndShape.java @@ -21,11 +21,11 @@ public class IEEEAndShape extends IEEEGenericShape { private static Polygon createPoly() { return new Polygon(true) .add(SIZE + SIZE2, SIZE * 2 + SIZE2) - .add(0, SIZE * 2 + SIZE2) - .add(0, -SIZE2) + .add(1, SIZE * 2 + SIZE2) + .add(1, -SIZE2) .add(SIZE + SIZE2, -SIZE2) - .add(new Vector(SIZE*2, -SIZE2),new Vector(SIZE*3, 0),new Vector(SIZE*3, SIZE)) - .add(new Vector(SIZE*3, SIZE*2),new Vector(SIZE*2, SIZE*2+SIZE2),new Vector(SIZE+SIZE2, SIZE*2+SIZE2)); + .add(new Vector(SIZE*2, -SIZE2),new Vector(SIZE*3, 0),new Vector(SIZE*3-1, SIZE)) + .add(new Vector(SIZE*3-1, SIZE*2),new Vector(SIZE*2, SIZE*2+SIZE2),new Vector(SIZE+SIZE2, SIZE*2+SIZE2)); } /** diff --git a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEGenericShape.java b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEGenericShape.java index a546a37f1..2e45d22a3 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEGenericShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEGenericShape.java @@ -59,9 +59,9 @@ public abstract class IEEEGenericShape implements Shape { drawIEEE(new GraphicTransform(graphic, v -> v.add(0, offs))); if (offs > 0) { - graphic.drawLine(new Vector(0, 0), new Vector(0, offs - SIZE2), Style.NORMAL); + graphic.drawLine(new Vector(1, 0), new Vector(1, offs - SIZE2 - 1), Style.NORMAL); int h = (inputs.length / 2) * SIZE * 2; - graphic.drawLine(new Vector(0, h), new Vector(0, h - offs + SIZE2), Style.NORMAL); + graphic.drawLine(new Vector(1, h), new Vector(1, h - offs + SIZE2 + 1), Style.NORMAL); } if (invert) { diff --git a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEOrShape.java b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEOrShape.java index 59d077b1b..70fc9ee4a 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEOrShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEOrShape.java @@ -28,7 +28,7 @@ public class IEEEOrShape extends IEEEGenericShape { .add(SIZE2, -SIZE2) .add(new Vector(SIZE, -SIZE2), new Vector(SIZE * 2, 0), - new Vector(SIZE * 3, SIZE)) + new Vector(SIZE * 3-1, SIZE)) .add(new Vector(SIZE * 2, SIZE * 2), new Vector(SIZE, SIZE * 2 + SIZE2), new Vector(SIZE2, SIZE * 2 + SIZE2)); diff --git a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEXOrShape.java b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEXOrShape.java index d94e45735..394ed75b6 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEXOrShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEXOrShape.java @@ -21,16 +21,16 @@ public class IEEEXOrShape extends IEEEGenericShape { private static Polygon createPoly() { return new Polygon(true) - .add(SIZE2, SIZE * 2 + SIZE2) + .add(SIZE2+1, SIZE * 2 + SIZE2) .add(new Vector(SIZE, SIZE * 2), new Vector(SIZE, 0), new Vector(SIZE2, -SIZE2)) .add(new Vector(SIZE, -SIZE2), new Vector(SIZE * 2, 0), - new Vector(SIZE * 3, SIZE)) + new Vector(SIZE * 3-1, SIZE)) .add(new Vector(SIZE * 2, SIZE * 2), new Vector(SIZE, SIZE * 2 + SIZE2), - new Vector(SIZE2, SIZE * 2 + SIZE2)); + new Vector(SIZE2+1, SIZE * 2 + SIZE2)); } private static Polygon createPoly2() {