From 572f0419cbadcca24323417a17b01bb8a28d804d Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sat, 10 Aug 2019 15:14:11 +0200 Subject: [PATCH] Changed GUIor12 to GUInor12 --- .../am2900/components/{GUIor12.java => GUInor12.java} | 10 +++++----- .../logic/model/examples/GUIComponentTestbench.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUIor12.java => GUInor12.java} (89%) diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIor12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java similarity index 89% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIor12.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java index 0dc476ef..22800a31 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIor12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java @@ -16,11 +16,11 @@ import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcod import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIor12 extends SimpleRectangularHardcodedGUIComponent +public class GUInor12 extends SimpleRectangularHardcodedGUIComponent { - public GUIor12(ViewModelModifiable model, String name) + public GUInor12(ViewModelModifiable model, String name) { - super(model, name, ">0"); + super(model, name, "=0"); setSize(35, 20); addPin(new Pin(this, "D", 12, 0, 10), Usage.INPUT, Position.RIGHT); addPin(new Pin(this, "Y", 1, 30, 10), Usage.OUTPUT, Position.LEFT); @@ -43,10 +43,10 @@ public class GUIor12 extends SimpleRectangularHardcodedGUIComponent return U; for (int i = 0; i < 12; i++) if (DValArr[i] == ONE) - return ONE; + return ZERO; for (int i = 0; i < 12; i++) if (DValArr[i] == Z) return X; - return ZERO; + return ONE; } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java index b8db984b..f725d5ee 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java @@ -5,7 +5,7 @@ import java.util.Comparator; import java.util.List; import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.am2900.components.GUIor12; +import net.mograsim.logic.model.am2900.components.GUInor12; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.model.components.GUIComponent; import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; @@ -26,7 +26,7 @@ public class GUIComponentTestbench public static void createTestbench(ViewModelModifiable model) { // GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901", "Am2901"); - GUIComponent comp = new GUIor12(model, "or12"); + GUIComponent comp = new GUInor12(model, "or12"); // guess which pins are outputs and which are inputs // TODO this code exists four times... but it seems too "hacky" to put it in a helper class -- 2.17.1