From 0b352440b31916f5f0c20390f7fe03b4a808e9c0 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 2 Sep 2019 12:52:20 +0200 Subject: [PATCH] Fixed GUIMerger/GUISplitter rendering --- .../logic/model/model/components/atomic/GUIMerger.java | 4 ++-- .../logic/model/model/components/atomic/GUISplitter.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 85cafecd..4d290426 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 @@ -60,8 +60,8 @@ public class GUIMerger extends GUIComponent gc.setForeground(ColorManager.current().toColor(c)); double outLineY = posY + (logicWidth - 1) * heightPerPin / 2; gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY); - double inputHeight = posY; - for (int i = 0; i < logicWidth; i++, inputHeight += 10) + double inputHeight = posY + (logicWidth - 1) * heightPerPin; + for (int i = 0; i < logicWidth; i++, inputHeight -= 10) { c = BitVectorFormatter.formatAsColor(inputEnds[i]); if (c != null) diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java index 8fc46790..0962daaf 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java @@ -60,8 +60,8 @@ public class GUISplitter extends GUIComponent gc.setForeground(ColorManager.current().toColor(c)); double inLineY = posY + (logicWidth - 1) * heightPerPin / 2; gc.drawLine(posX, inLineY, posX + width / 2, inLineY); - double outputHeight = posY; - for (int i = 0; i < logicWidth; i++, outputHeight += 10) + double outputHeight = posY + (logicWidth - 1) * heightPerPin; + for (int i = 0; i < logicWidth; i++, outputHeight -= 10) { c = BitVectorFormatter.formatAsColor(outputEnds[i]); if (c != null) -- 2.17.1