From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Sat, 10 Aug 2019 13:14:11 +0000 (+0200)
Subject: Changed GUIor12 to GUInor12
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=572f0419cbadcca24323417a17b01bb8a28d804d;p=Mograsim.git

Changed GUIor12 to GUInor12
---

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java
new file mode 100644
index 00000000..22800a31
--- /dev/null
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java
@@ -0,0 +1,52 @@
+package net.mograsim.logic.model.am2900.components;
+
+import static net.mograsim.logic.core.types.Bit.ONE;
+import static net.mograsim.logic.core.types.Bit.U;
+import static net.mograsim.logic.core.types.Bit.X;
+import static net.mograsim.logic.core.types.Bit.Z;
+import static net.mograsim.logic.core.types.Bit.ZERO;
+
+import java.util.Map;
+
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
+import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
+
+public class GUInor12 extends SimpleRectangularHardcodedGUIComponent
+{
+	public GUInor12(ViewModelModifiable model, String name)
+	{
+		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);
+	}
+
+	@Override
+	protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
+	{
+		readWriteEnds.get("Y").feedSignals(getResult(readEnds.get("D").getValues().getBits()));
+		return null;
+	}
+
+	private static Bit getResult(Bit[] DValArr)
+	{
+		for (int i = 0; i < 12; i++)
+			if (DValArr[i] == X)
+				return X;
+		for (int i = 0; i < 12; i++)
+			if (DValArr[i] == U)
+				return U;
+		for (int i = 0; i < 12; i++)
+			if (DValArr[i] == ONE)
+				return ZERO;
+		for (int i = 0; i < 12; i++)
+			if (DValArr[i] == Z)
+				return X;
+		return ONE;
+	}
+}
\ No newline at end of file
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/GUIor12.java
deleted file mode 100644
index 0dc476ef..00000000
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIor12.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package net.mograsim.logic.model.am2900.components;
-
-import static net.mograsim.logic.core.types.Bit.ONE;
-import static net.mograsim.logic.core.types.Bit.U;
-import static net.mograsim.logic.core.types.Bit.X;
-import static net.mograsim.logic.core.types.Bit.Z;
-import static net.mograsim.logic.core.types.Bit.ZERO;
-
-import java.util.Map;
-
-import net.mograsim.logic.core.types.Bit;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
-import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
-import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
-
-public class GUIor12 extends SimpleRectangularHardcodedGUIComponent
-{
-	public GUIor12(ViewModelModifiable model, String name)
-	{
-		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);
-	}
-
-	@Override
-	protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
-	{
-		readWriteEnds.get("Y").feedSignals(getResult(readEnds.get("D").getValues().getBits()));
-		return null;
-	}
-
-	private static Bit getResult(Bit[] DValArr)
-	{
-		for (int i = 0; i < 12; i++)
-			if (DValArr[i] == X)
-				return X;
-		for (int i = 0; i < 12; i++)
-			if (DValArr[i] == U)
-				return U;
-		for (int i = 0; i < 12; i++)
-			if (DValArr[i] == ONE)
-				return ONE;
-		for (int i = 0; i < 12; i++)
-			if (DValArr[i] == Z)
-				return X;
-		return ZERO;
-	}
-}
\ 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