Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / snippets / symbolrenderers / PinNamesSymbolRenderer.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java
index d6c76e1..ede8710 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java
@@ -7,9 +7,9 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.snippets.Renderer;
 import net.mograsim.logic.model.snippets.SnippetDefinintion;
 import net.mograsim.logic.model.snippets.SubmodelComponentSnippetSuppliers;
@@ -17,12 +17,12 @@ import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.
 
 public class PinNamesSymbolRenderer implements Renderer
 {
-       private final GUIComponent component;
+       private final ModelComponent component;
        private final Map<Pin, Position> pinPositions;
        private final double pinLabelHeight;
        private final double pinLabelMargin;
 
-       public PinNamesSymbolRenderer(GUIComponent component, PinNamesParams params)
+       public PinNamesSymbolRenderer(ModelComponent component, PinNamesParams params)
        {
                this.component = component;
                this.pinPositions = new HashMap<>();
@@ -30,6 +30,7 @@ public class PinNamesSymbolRenderer implements Renderer
                this.pinLabelMargin = params.pinLabelMargin;
                if (params.pinNamePositions != null)
                        params.pinNamePositions.forEach(this::setPinPosition);
+               component.addPinRemovedListener(p -> setPinPosition(p, null));
        }
 
        public void setPinPosition(String pinName, Position position)
@@ -73,7 +74,13 @@ public class PinNamesSymbolRenderer implements Renderer
        }
 
        @Override
-       public PinNamesParams getParamsForSerializing(IdentifierGetter idGetter)
+       public String getIDForSerializing(IdentifyParams idParams)
+       {
+               return "pinNames";
+       }
+
+       @Override
+       public PinNamesParams getParamsForSerializing(IdentifyParams idParams)
        {
                PinNamesParams params = new PinNamesParams();
                params.pinNamePositions = new HashMap<>();