X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FWireCrossPoint.java;h=07bddc6ca3149192518d8c5167860e0fcfb7c14d;hb=4ac977cb31feb34f24e05e9d5e7976951dccf557;hp=927e4e508cec37acefbbae5f3b6267f3e8c52739;hpb=f338e2a024c8edca6ab72230747ea5e4889d8b0b;p=Mograsim.git
diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
index 927e4e50..07bddc6c 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
@@ -1,49 +1,116 @@
package net.mograsim.logic.ui.model.wires;
-import net.mograsim.logic.ui.ColorHelper;
-import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.components.GUIComponent;
+import java.util.Map;
+
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.core.LogicObserver;
import net.mograsim.logic.core.types.BitVectorFormatter;
import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.ui.ColorHelper;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;
-public class WireCrossPoint extends GUIComponent
+/**
+ * A {@link GUIComponent} with only one pin. Is used to create wires connecting more than two pins.
+ * Example: There are three pins P1
, P2
, P3
that need to be connected. Solution: Create a
+ * WireCrossPoint (WCP
) and create the GUIWires P1
-WCP
, P2
-WCP
,
+ * P3
-WCP
.
+ * Cross points are drawn as circles. The pin of cross points is in the center of this circle.
+ *
+ * @author Daniel Kirschten
+ */
+public class WireCrossPoint extends GUIComponent implements ConnectionPoint
{
+ private static final int CIRCLE_RADIUS = 1;
+ private static final int CIRCLE_DIAM = CIRCLE_RADIUS * 2;
+
+ /**
+ * The (single) pin of this cross point.
+ */
private final Pin pin;
+ /**
+ * A {@link LogicObserver} calling {@link #requestRedraw()}.
+ */
+ private final LogicObserver logicObs;
+ /**
+ * The {@link ReadEnd} currently bound to this cross point.
+ */
private ReadEnd end;
- private final int logicWidth;
- public WireCrossPoint(ViewModel model, int logicWidth)
+ // creation and destruction
+
+ public WireCrossPoint(ViewModelModifiable model, int logicWidth)
{
super(model);
- this.logicWidth = logicWidth;
- setSize(0, 0);
- addPin(this.pin = new Pin(this, logicWidth, 0, 0));
+ logicObs = (i) -> requestRedraw();
+
+ setSize(CIRCLE_DIAM, CIRCLE_DIAM);
+ addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));
+ }
+
+ // pins
+
+ @Override
+ public Pin getPin()
+ {
+ return pin;
+ }
+
+ // "graphical" operations
+
+ /**
+ * Moves the center (and therefore the pin) of this {@link WireCrossPoint} to the given location.
+ *
+ * @author Daniel Kirschten
+ */
+ public void moveCenterTo(double x, double y)
+ {
+ moveTo(x - CIRCLE_RADIUS, y - CIRCLE_RADIUS);
}
@Override
public void render(GeneralGC gc, Rectangle visibleRegion)
{
- Rectangle bounds = getBounds();
ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
- () -> gc.fillOval(bounds.x - 1, bounds.y - 1, 2, 2));
+ () -> gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM));
}
+ // logic model binding
+
+ /**
+ * Binds this {@link WireCrossPoint} to the given {@link ReadEnd}: The color of this {@link WireCrossPoint} will now depend on the state
+ * of the given {@link ReadEnd}, and further changes of the given {@link ReadEnd} will result in readrawListeners being called.
+ * The argument can be null, in which case the old binding is stopped.
+ *
+ * @author Daniel Kirschten
+ */
public void setLogicModelBinding(ReadEnd end)
{
+ if (this.end != null)
+ this.end.deregisterObserver(logicObs);
this.end = end;
- end.registerObserver((i) -> callComponentLookChangedListeners());
+ if (end != null)
+ end.registerObserver(logicObs);
}
- public int getLogicWidth()
+ /**
+ * Returns whether this {@link WireCrossPoint} has a logic model binding or not.
+ */
+ public boolean hasLogicModelBinding()
{
- return logicWidth;
+ return end != null;
}
- public Pin getPin()
+ // serializing
+
+ @Override
+ public Map getInstantiationParameters()
{
- return pin;
+ Map m = super.getInstantiationParameters();
+ m.put(SimpleRectangularGUIGate.kLogicWidth, pin.logicWidth);
+ return m;
}
}
\ No newline at end of file