X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIMerger.java;h=3ea238d4fb4ae6c0569e943db0d30116f8e8afc3;hb=77f1a4885b121ab2cf8a518cf6b10cb88b9ba4c9;hp=3f5c2542a44b3c42dc4d321ae55ced75c5079c1e;hpb=d8e1787969c9be7d69f2c254575750d2ffff23f0;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java index 3f5c2542..3ea238d4 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java @@ -36,7 +36,7 @@ public class GUIMerger extends GUIComponent double inputHeight = 0; for (int i = 0; i < logicWidth; i++, inputHeight += 10) addPin(new Pin(this, "I" + i, 1, 0, inputHeight)); - addPin(new Pin(this, "O", logicWidth, width, logicWidth * heightPerPin / 2)); + addPin(new Pin(this, "O", logicWidth, width, (logicWidth - 1) * heightPerPin / 2)); inputEnds = new ReadEnd[logicWidth]; } @@ -59,7 +59,8 @@ public class GUIMerger extends GUIComponent ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd); if (c != null) gc.setForeground(ColorManager.current().toColor(c)); - gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2); + double outLineY = posY + (logicWidth - 1) * heightPerPin / 2; + gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY); } @Override