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

[Mograsim.git] / net.mograsim.logic.model.editor / src / net / mograsim / logic / model / editor / handles / ComponentHandle.java

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
index 63d922a..14868e9 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
@@ -6,9 +6,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 
 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.editor.Editor;
 import net.mograsim.logic.model.editor.Editor.ComponentInfo;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
@@ -57,6 +57,11 @@ public class ComponentHandle extends Handle
                        bounds.width += LENGTH_OFFSET;
                        bounds.height += LENGTH_OFFSET;
                        gc.drawRectangle(bounds);
+                       Font oldFont = gc.getFont();
+                       gc.setFont(new Font(oldFont.getName(), 5, oldFont.getStyle()));
+                       gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
+                       gc.drawText(parent.getName(), bounds.x, bounds.y, true);
+                       gc.setFont(oldFont);
                }
        }
 
@@ -89,8 +94,9 @@ public class ComponentHandle extends Handle
        @Override
        public Optional<ComponentInfo> reqCopy(Point refPoint)
        {
-               return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y, Editor.getIdentifier(parent),
-                               parent.getParamsForSerializingJSON(new IdentifyParams())));
+               IdentifyParams idParams = new IdentifyParams();
+               return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y,
+                               parent.getIDForSerializing(idParams), parent.getParamsForSerializingJSON(idParams)));
        }
 
        @Override