X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FGUIdff4_finewe.java;h=a96f400f5774f3ba3bacce60239a62cc1f33cd1c;hb=bbe38c55aaa999d025f534245f9207a88643f6e5;hp=758a9450058ae1c0669e1e81a495a8c344248fb1;hpb=d4e7fabad51c0334ef1776564c87da38ab3c2089;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java
index 758a9450..a96f400f 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java
@@ -14,6 +14,7 @@ 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.model.wires.PinUsage;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
 
@@ -22,21 +23,20 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent
 	public GUIdff4_finewe(ViewModelModifiable model, String name)
 	{
 		super(model, name, "D flip flop\n4 bits");
-		setSize(35, 100);
-		addPin(new Pin(this, "C", 1, 0, 5), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE1", 1, 0, 15), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE2", 1, 0, 25), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE3", 1, 0, 35), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE4", 1, 0, 45), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE", 1, 0, 55), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D1", 1, 0, 65), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D2", 1, 0, 75), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D3", 1, 0, 85), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D4", 1, 0, 95), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "Q1", 1, 35, 5), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "Q2", 1, 35, 15), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "Q3", 1, 35, 25), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "Q4", 1, 35, 35), Usage.OUTPUT, Position.LEFT);
+		setSize(35, 90);
+		addPin(new Pin(this, "C", 1, PinUsage.INPUT, 0, 5), Position.RIGHT);
+		addPin(new Pin(this, "_WE1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT);
+		addPin(new Pin(this, "_WE2", 1, PinUsage.INPUT, 0, 25), Position.RIGHT);
+		addPin(new Pin(this, "_WE3", 1, PinUsage.INPUT, 0, 35), Position.RIGHT);
+		addPin(new Pin(this, "_WE4", 1, PinUsage.INPUT, 0, 45), Position.RIGHT);
+		addPin(new Pin(this, "D1", 1, PinUsage.INPUT, 0, 55), Position.RIGHT);
+		addPin(new Pin(this, "D2", 1, PinUsage.INPUT, 0, 65), Position.RIGHT);
+		addPin(new Pin(this, "D3", 1, PinUsage.INPUT, 0, 75), Position.RIGHT);
+		addPin(new Pin(this, "D4", 1, PinUsage.INPUT, 0, 85), Position.RIGHT);
+		addPin(new Pin(this, "Q1", 1, PinUsage.OUTPUT, 35, 5), Position.LEFT);
+		addPin(new Pin(this, "Q2", 1, PinUsage.OUTPUT, 35, 15), Position.LEFT);
+		addPin(new Pin(this, "Q3", 1, PinUsage.OUTPUT, 35, 25), Position.LEFT);
+		addPin(new Pin(this, "Q4", 1, PinUsage.OUTPUT, 35, 35), Position.LEFT);
 	}
 
 	@Override
@@ -48,7 +48,7 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent
 
 		Bit CVal = readEnds.get("C").getValue();
 
-		if (QC[0] == ZERO && CVal == ONE && readEnds.get("_WE").getValue() == ZERO)
+		if (QC[0] == ZERO && CVal == ONE)
 			for (int i = 1; i < 5; i++)
 			{
 				Bit WEiVal = readEnds.get("_WE" + i).getValue();