From fc03f692df1944b72f38d6a9f056d40ec0b6c3d1 Mon Sep 17 00:00:00 2001 From: hneemann Date: Thu, 13 Sep 2018 17:01:39 +0200 Subject: [PATCH] fixes us xor symbol. closes #185 --- .../de/neemann/digital/draw/shapes/ieee/IEEEOrShape.java | 3 ++- .../de/neemann/digital/draw/shapes/ieee/IEEEXOrShape.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 dbb381a11..e07935bf6 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 @@ -42,7 +42,8 @@ public class IEEEOrShape extends IEEEGenericShape { /** * Creates a new instance - * @param inputs inputs + * + * @param inputs inputs * @param outputs outputs * @param invert true if NOr * @param attr the elements attributes 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 3181278d0..4de97073c 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 @@ -45,6 +45,8 @@ public class IEEEXOrShape extends IEEEGenericShape { new Vector(0, -SIZE2)); } + private final boolean center; + /** * Creates a new instance * @@ -55,12 +57,15 @@ public class IEEEXOrShape extends IEEEGenericShape { */ public IEEEXOrShape(PinDescriptions inputs, PinDescriptions outputs, boolean invert, ElementAttributes attr) { super(inputs, outputs, invert, attr); + center = (inputs.size() & 1) != 0; } @Override protected void drawIEEE(Graphic graphic) { graphic.drawLine(new Vector(0, 0), new Vector(5 + SIZE2, 0), Style.WIRE); graphic.drawLine(new Vector(0, SIZE * 2), new Vector(5 + SIZE2, SIZE * 2), Style.WIRE); + if (center) + graphic.drawLine(new Vector(0, SIZE), new Vector(7 + SIZE2, SIZE), Style.WIRE); graphic.drawPolygon(POLYGON, Style.NORMAL); graphic.drawPolygon(POLYGON2, Style.NORMAL); }