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=7a2fcf4b4cbf8bea9f82c4234c1ac9b9e6b9c8bf;hb=0885062ad73925732b1a4e4c79f910dec9862fd3;hp=22868ccfb97a22f65e2b742ebd21d4311adbe535;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;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 22868ccf..7a2fcf4b 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,40 +1,72 @@
package net.mograsim.logic.ui.model.wires;
-import java.util.Map;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
-import net.mograsim.logic.core.LogicObservable;
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.ModelVisitor;
import net.mograsim.logic.ui.model.ViewModelModifiable;
import net.mograsim.logic.ui.model.components.GUIComponent;
-import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;
-
+import net.mograsim.logic.ui.serializing.IndirectGUIComponentCreator;
+import net.mograsim.preferences.ColorDefinition;
+import net.mograsim.preferences.ColorManager;
+
+/**
+ * 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
{
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;
- private final int logicWidth;
+ /**
+ * A {@link LogicObserver} calling {@link #requestRedraw()}.
+ */
private final LogicObserver logicObs;
+ /**
+ * The {@link ReadEnd} currently bound to this cross point.
+ */
private ReadEnd end;
+ // creation and destruction
+
public WireCrossPoint(ViewModelModifiable model, int logicWidth)
{
super(model);
logicObs = (i) -> requestRedraw();
- this.logicWidth = logicWidth;
setSize(CIRCLE_DIAM, CIRCLE_DIAM);
addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));
}
+ // pins
+
+ 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);
@@ -43,50 +75,49 @@ public class WireCrossPoint extends GUIComponent
@Override
public void render(GeneralGC gc, Rectangle visibleRegion)
{
- ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
- () -> gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM));
+ ColorDefinition wireColor = BitVectorFormatter.formatAsColor(end);
+ if (wireColor != null)
+ gc.setBackground(ColorManager.current().toColor(wireColor));
+ 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)
{
- deregisterLogicObs(this.end);
+ if (this.end != null)
+ this.end.deregisterObserver(logicObs);
this.end = end;
- registerLogicObs(end);
+ if (end != null)
+ end.registerObserver(logicObs);
}
- private void registerLogicObs(LogicObservable observable)
+ /**
+ * Returns whether this {@link WireCrossPoint} has a logic model binding or not.
+ */
+ public boolean hasLogicModelBinding()
{
- if (observable != null)
- observable.registerObserver(logicObs);
+ return end != null;
}
- private void deregisterLogicObs(LogicObservable observable)
- {
- if (observable != null)
- observable.deregisterObserver(logicObs);
- }
-
- public int getLogicWidth()
- {
- return logicWidth;
- }
-
- public Pin getPin()
- {
- return pin;
- }
+ // serializing
@Override
- public Map getInstantiationParameters()
+ public JsonElement getParams()
{
- Map m = super.getInstantiationParameters();
- m.put(SimpleRectangularGUIGate.kLogicWidth, logicWidth);
- return m;
+ return new JsonPrimitive(pin.logicWidth);
}
- @Override
- public void accept(ModelVisitor mv)
+ static
{
- mv.visit(this);
+ IndirectGUIComponentCreator.setComponentProvider(WireCrossPoint.class.getCanonicalName(),
+ (m, p) -> new WireCrossPoint(m, p.getAsInt()));
}
}
\ No newline at end of file