From 926c74bcc4960f57b9af46d985c8702ac8216bea Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sun, 18 Aug 2019 21:22:18 +0200 Subject: [PATCH] Moved pins in GUIdff4_finewe; made it a standard component --- .../logic/model/am2900/components/GUIdff4_finewe.java | 10 +++++----- .../model/serializing/standardComponentIDMapping.json | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) 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 fe55d7f7..c4efe938 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 @@ -22,16 +22,16 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent public GUIdff4_finewe(ViewModelModifiable model, String name) { super(model, name, "D flip flop\n4 bits"); - setSize(35, 100); + setSize(35, 90); 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, "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, "D1", 1, 0, 55), Usage.INPUT, Position.RIGHT); + addPin(new Pin(this, "D2", 1, 0, 65), Usage.INPUT, Position.RIGHT); + addPin(new Pin(this, "D3", 1, 0, 75), Usage.INPUT, Position.RIGHT); + addPin(new Pin(this, "D4", 1, 0, 85), 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); diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json index 726e36e0..6f99971e 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json @@ -26,6 +26,7 @@ mograsim version: 0.1.3 "GUIdff": "file:components/GUIdff.json", "GUIdff12": "class:net.mograsim.logic.model.am2900.components.GUIdff12", "GUIdff4": "file:components/GUIdff4.json", + "GUIdff4_finewe": "class:net.mograsim.logic.model.am2900.components.GUIdff4_finewe", "GUIdff4_invwe": "file:components/GUIdff4_invwe.json", "GUIdlatch": "file:components/GUIdlatch.json", "GUIdlatch4": "file:components/GUIdlatch4.json", -- 2.17.1