Merge branch 'fusebug' into development

[Mograsim.git] / net.mograsim.machine / src / net / mograsim / machine / standard / memory / GUIMemoryWA.java

diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/GUIMemoryWA.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/GUIMemoryWA.java
index 1632c8e..6dbff4c 100644 (file)
--- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/GUIMemoryWA.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/GUIMemoryWA.java
@@ -2,8 +2,8 @@ package net.mograsim.machine.standard.memory;
 
 import org.eclipse.swt.graphics.Color;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
@@ -13,10 +13,10 @@ import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.components.atomic.GUIAndGate;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.serializing.IdentifierGetter;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
-import net.mograsim.machine.DefaultMainMemoryDefinition;
 import net.mograsim.machine.MainMemoryDefinition;
 import net.mograsim.machine.standard.memory.WordAddressableMemoryComponent;
 import net.mograsim.preferences.Preferences;
@@ -27,15 +27,18 @@ public class GUIMemoryWA extends GUIComponent
        private final Pin addrPin, dataPin, rWPin;
        private WordAddressableMemoryComponent memory;
        private final static int width = 100, height = 300;
+       
+       private final static String addrKey = "addrBits", cellWidthKey = "cellWidth", minAddrKey = "minAddr", maxAddrKey = "maxAddr";
 
        public GUIMemoryWA(ViewModelModifiable model, MainMemoryDefinition definition, String name)
        {
                super(model, name);
                this.definition = definition;
                setSize(width, height);
-               addPin(addrPin = new Pin(this, "A", definition.getMemoryAddressBits(), 0, 10));
-               addPin(dataPin = new Pin(this, "D", definition.getCellWidth(), 0, 30));
-               addPin(rWPin = new Pin(this, "RW", 1, 0, 50));
+               //TODO check the usages
+               addPin(addrPin = new Pin(this, "A", definition.getMemoryAddressBits(), PinUsage.INPUT, 0, 10));
+               addPin(dataPin = new Pin(this, "D", definition.getCellWidth(), PinUsage.TRISTATE, 0, 30));
+               addPin(rWPin = new Pin(this, "RW", 1, PinUsage.INPUT, 0, 50));
        }
 
        public Pin getAddressPin()
@@ -91,7 +94,12 @@ public class GUIMemoryWA extends GUIComponent
        @Override
        public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
        {
-               return new Gson().toJsonTree(new DefaultMainMemoryDefinition(definition));
+               JsonObject o = new JsonObject();
+               o.addProperty(addrKey, definition.getMemoryAddressBits());
+               o.addProperty(cellWidthKey, definition.getCellWidth());
+               o.addProperty(maxAddrKey, definition.getMaximalAddress());
+               o.addProperty(minAddrKey, definition.getMinimalAddress());
+               return o;
        }
 
        static
@@ -99,7 +107,12 @@ public class GUIMemoryWA extends GUIComponent
                ViewLogicModelAdapter.addComponentAdapter(new WordAddressableMemoryAdapter());
                IndirectGUIComponentCreator.setComponentSupplier(GUIAndGate.class.getCanonicalName(), (m, p, n) ->
                {
-                       return new GUIMemoryWA(m, new Gson().fromJson(p, DefaultMainMemoryDefinition.class), n);
+                       JsonObject o = (JsonObject) p;
+                       int addressBits = o.get(addrKey).getAsInt();
+                       int cellWidth = o.get(cellWidthKey).getAsInt();
+                       long maxAddr = o.get(maxAddrKey).getAsLong();
+                       long minAddr = o.get(minAddrKey).getAsLong();
+                       return new GUIMemoryWA(m, MainMemoryDefinition.create(addressBits, cellWidth, minAddr, maxAddr), n);
                });
        }
 }