From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Mon, 2 Sep 2019 10:52:20 +0000 (+0200)
Subject: Fixed GUIMerger/GUISplitter rendering
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=0b352440b31916f5f0c20390f7fe03b4a808e9c0;hp=bfd483ea32de08383550ba6903f77c11c33ea36d;p=Mograsim.git

Fixed GUIMerger/GUISplitter rendering
---

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)