From 697610b0b596503a3e477811b3d2b3761db35e95 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 19 Aug 2019 10:51:39 +0200 Subject: [PATCH] Fixed GUIMerger / GUISplitter bit order --- .../model/model/components/atomic/GUIMerger.java | 12 ++++++------ .../model/model/components/atomic/GUISplitter.java | 14 +++++++------- .../componentadapters/MergerAdapter.java | 2 +- .../componentadapters/SplitterAdapter.java | 2 +- 4 files changed, 15 insertions(+), 15 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 b2a54539..d1eac5e6 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 @@ -48,10 +48,15 @@ public class GUIMerger extends GUIComponent double posX = getPosX(); double posY = getPosY(); + ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd); + if (c != null) + 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) { - ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnds[i]); + c = BitVectorFormatter.formatAsColor(inputEnds[i]); if (c != null) gc.setForeground(ColorManager.current().toColor(c)); gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight); @@ -63,11 +68,6 @@ public class GUIMerger extends GUIComponent gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE); gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1)); gc.setLineCap(oldLineCap); - ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd); - if (c != null) - gc.setForeground(ColorManager.current().toColor(c)); - double outLineY = posY + (logicWidth - 1) * heightPerPin / 2; - gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY); } @Override 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 6283c507..6ddc276f 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 @@ -53,13 +53,6 @@ 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); - gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground")); - int oldLineCap = gc.getLineCap(); - int lineJoin = gc.getLineJoin(); - // TODO find better "replacement" for JOIN_BEVEL - gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE); - gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1)); - gc.setLineCap(oldLineCap); double outputHeight = posY; for (int i = 0; i < logicWidth; i++, outputHeight += 10) { @@ -68,6 +61,13 @@ public class GUISplitter extends GUIComponent gc.setForeground(ColorManager.current().toColor(c)); gc.drawLine(posX + width / 2, outputHeight, posX + width, outputHeight); } + gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground")); + int oldLineCap = gc.getLineCap(); + int lineJoin = gc.getLineJoin(); + // TODO find better "replacement" for JOIN_BEVEL + gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE); + gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1)); + gc.setLineCap(oldLineCap); } @Override diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java index a94118b7..e5e44300 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java @@ -26,7 +26,7 @@ public class MergerAdapter implements ComponentAdapter for (int i = 0; i < guiComponent.logicWidth; i++) { Wire input = logicWiresPerPin.get(guiComponent.getPin("I" + i)); - Wire.fuse(input, output, 0, i, 1); + Wire.fuse(input, output, 0, guiComponent.logicWidth - 1 - i, 1); inputEnds[i] = input.createReadOnlyEnd(); } guiComponent.setLogicModelBinding(inputEnds, output.createReadOnlyEnd()); diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java index a2623401..1a5a50e9 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java @@ -26,7 +26,7 @@ public class SplitterAdapter implements ComponentAdapter for (int i = 0; i < guiComponent.logicWidth; i++) { Wire output = logicWiresPerPin.get(guiComponent.getPin("O" + i)); - Wire.fuse(input, output, i, 0, 1); + Wire.fuse(input, output, guiComponent.logicWidth - 1 - i, 0, 1); outputEnds[i] = output.createReadOnlyEnd(); } guiComponent.setLogicModelBinding(input.createReadOnlyEnd(), outputEnds); -- 2.17.1