WireCrossPoint now renders at the correct location

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index 7faefe3..da724d8 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -84,7 +84,7 @@ public class LogicUICanvas extends ZoomableCanvas
        private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)
        {
                component.render(gc, visibleRegion);
        private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)
        {
                component.render(gc, visibleRegion);

-               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_CYAN));
+               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_DARK_CYAN));

                for (Pin p : component.getPins())
                {
                        Point pos = p.getPos();
                for (Pin p : component.getPins())
                {
                        Point pos = p.getPos();

diff --git a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java b/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java
index 724de54..04c5f1e 100644 (file)
--- a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java
+++ b/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java
@@ -26,7 +26,9 @@ public class WireCrossPoint extends GUIComponent
        @Override
        public void render(GeneralGC gc, Rectangle visibleRegion)
        {
        @Override
        public void render(GeneralGC gc, Rectangle visibleRegion)
        {

-               ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end), () -> gc.fillOval(-1, -1, 2, 2));
+               Rectangle bounds = getBounds();
+               ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
+                               () -> gc.fillOval(bounds.x - 1, bounds.y - 1, 2, 2));

        }
 
        public void setLogicModelBinding(ReadEnd end)
        }
 
        public void setLogicModelBinding(ReadEnd end)