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 / InterfacePinHandle.java

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java
index 9eff5ce..189d3d1 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java
@@ -19,7 +19,7 @@ public class InterfacePinHandle extends PinHandle
 
        public InterfacePinHandle(MovablePin parent, DeserializedSubmodelComponent pinOwner)
        {
-               super();
+               super(2);
                this.parent = parent;
                this.owner = pinOwner;
                setSize(CIRCLE_DIAM, CIRCLE_DIAM);
@@ -29,7 +29,7 @@ public class InterfacePinHandle extends PinHandle
        private void initPos()
        {
                Point pos = parent.getPos();
-               moveTo(pos.x - CIRCLE_RADIUS, pos.y - CIRCLE_RADIUS);
+               moveTo(pos.x, pos.y);
        }
 
        @Override
@@ -43,8 +43,7 @@ public class InterfacePinHandle extends PinHandle
                if (selected)
                {
                        gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW));
-                       gc.drawOval(x - SELECTED_CIRCLE_OFFSET, y - SELECTED_CIRCLE_OFFSET, SELECTED_CIRCLE_DIAM,
-                                       SELECTED_CIRCLE_DIAM);
+                       gc.drawOval(x - SELECTED_CIRCLE_OFFSET, y - SELECTED_CIRCLE_OFFSET, SELECTED_CIRCLE_DIAM, SELECTED_CIRCLE_DIAM);
                }
                gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
                gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM);
@@ -75,11 +74,11 @@ public class InterfacePinHandle extends PinHandle
        {
                owner.removeSubmodelInterface(parent.name);
        }
-       
+
        @Override
        protected void moveTo(double x, double y)
        {
-               super.moveTo(x, y);
+               super.moveTo(x - CIRCLE_RADIUS, y - CIRCLE_RADIUS);
                parent.setRelPos(getCenterX(), getCenterY());
        }