{
protected final ViewModelModifiable submodelModifiable;
public final ViewModel submodel;
- private final Map<MovablePin, MovablePin> submodelPinsPerSupermodelPin;
- private final Map<Pin, Pin> submodelPinsPerSupermodelPinUnmodifiable;
- private final Map<MovablePin, MovablePin> supermodelPinsPerSubmodelPin;
- private final Map<Pin, Pin> supermodelPinsPerSubmodelPinUnmodifiable;
+ private final Map<String, MovablePin> submodelPins;
+ private final Map<String, MovablePin> submodelMovablePinsUnmodifiable;
+ private final Map<String, Pin> submodelUnmovablePinsUnmodifiable;
+ private final Map<String, MovablePin> supermodelPins;
+ private final Map<String, MovablePin> supermodelMovablePinsUnmodifiable;
+ private final Map<String, Pin> supermodelUnmovablePinsUnmodifiable;
private final SubmodelInterface submodelInterface;
private double submodelScale;
super(model);
this.submodelModifiable = new ViewModelModifiable();
this.submodel = submodelModifiable;
- this.submodelPinsPerSupermodelPin = new HashMap<>();
- this.submodelPinsPerSupermodelPinUnmodifiable = Collections.unmodifiableMap(submodelPinsPerSupermodelPin);
- this.supermodelPinsPerSubmodelPin = new HashMap<>();
- this.supermodelPinsPerSubmodelPinUnmodifiable = Collections.unmodifiableMap(supermodelPinsPerSubmodelPin);
+ this.submodelPins = new HashMap<>();
+ this.submodelMovablePinsUnmodifiable = Collections.unmodifiableMap(submodelPins);
+ this.submodelUnmovablePinsUnmodifiable = Collections.unmodifiableMap(submodelPins);
+ this.supermodelPins = new HashMap<>();
+ this.supermodelMovablePinsUnmodifiable = Collections.unmodifiableMap(supermodelPins);
+ this.supermodelUnmovablePinsUnmodifiable = Collections.unmodifiableMap(supermodelPins);
this.submodelInterface = new SubmodelInterface(submodelModifiable);
this.submodelScale = 1;
{
this.submodelScale = submodelScale;
- for (Entry<MovablePin, MovablePin> e : supermodelPinsPerSubmodelPin.entrySet())
- e.getKey().setRelPos(e.getValue().getRelX() * submodelScale, e.getValue().getRelY() * submodelScale);
+ for (Entry<String, MovablePin> e : supermodelPins.entrySet())
+ getSubmodelMovablePin(e.getKey()).setRelPos(e.getValue().getRelX() * submodelScale, e.getValue().getRelY() * submodelScale);
requestRedraw();// needed if there is no submodel interface pin
}
protected Pin addSubmodelInterface(String name, int logicWidth, double relX, double relY)
{
MovablePin submodelPin = new MovablePin(submodelInterface, name, logicWidth, relX / submodelScale, relY / submodelScale);
- submodelInterface.addPin(submodelPin);
-
MovablePin supermodelPin = new MovablePin(this, name, logicWidth, relX, relY);
+
+ submodelPin.addPinMovedListener(p ->
+ {
+ double newRelX = p.getRelX() * submodelScale;
+ double newRelY = p.getRelY() * submodelScale;
+ if (supermodelPin.getRelX() != newRelX || supermodelPin.getRelY() != newRelY)
+ supermodelPin.setRelPos(newRelX, newRelY);
+ });
+ supermodelPin.addPinMovedListener(p ->
+ {
+ double newRelX = p.getRelX() / submodelScale;
+ double newRelY = p.getRelY() / submodelScale;
+ if (submodelPin.getRelX() != newRelX || submodelPin.getRelY() != newRelY)
+ submodelPin.setRelPos(newRelX, newRelY);
+ });
+
+ submodelInterface.addPin(submodelPin);
super.addPin(supermodelPin);
- submodelPinsPerSupermodelPin.put(supermodelPin, submodelPin);
- supermodelPinsPerSubmodelPin.put(submodelPin, supermodelPin);
+ submodelPins.put(name, submodelPin);
+ supermodelPins.put(name, supermodelPin);
// no need to call requestRedraw() because addPin() will request a redraw
return submodelPin;
}
- protected void moveSubmodelInterface(Pin supermodelPin, double relX, double relY)
+ protected void removeSubmodelInterface(String name)
{
- MovablePin submodelPin = getSubmodelMovablePin(supermodelPin);
- MovablePin supermodelPinMovable = getSupermodelMovablePin(submodelPin);
+ super.removePin(name);
+ Pin submodelPin = getSubmodelMovablePin(name);
+ submodelInterface.removePin(submodelPin.name);
- submodelPin.setRelPos(relX / submodelScale, relY / submodelScale);
- supermodelPinMovable.setRelPos(relX, relY);
+ submodelPins.remove(name);
+ supermodelPins.remove(name);
- // no need to call requestRedraw() because setRelPos() will request a redraw
+ // no need to call requestRedraw() because removePin() will request a redraw
}
- protected void removeSubmodelInterface(Pin supermodelPin)
+ public Map<String, Pin> getSubmodelPins()
{
- super.removePin(supermodelPin);
- Pin submodelPin = getSubmodelMovablePin(supermodelPin);
- submodelInterface.removePin(submodelPin);
-
- submodelPinsPerSupermodelPin.remove(supermodelPin);
- supermodelPinsPerSubmodelPin.remove(submodelPin);
+ return submodelUnmovablePinsUnmodifiable;
+ }
- // no need to call requestRedraw() because removePin() will request a redraw
+ public Pin getSubmodelPin(String name)
+ {
+ return getSubmodelMovablePin(name);
}
- public Map<Pin, Pin> getSupermodelPinsPerSubmodelPin()
+ protected Map<String, MovablePin> getSubmodelMovablePins()
{
- return supermodelPinsPerSubmodelPinUnmodifiable;
+ return submodelMovablePinsUnmodifiable;
}
- public Pin getSupermodelPin(Pin submodelPin)
+ protected MovablePin getSubmodelMovablePin(String name)
{
- return getSupermodelMovablePin(submodelPin);
+ return submodelPins.get(name);
}
- protected MovablePin getSupermodelMovablePin(Pin submodelPin)
+ public Map<String, Pin> getSupermodelPins()
{
- return supermodelPinsPerSubmodelPin.get(submodelPin);
+ return supermodelUnmovablePinsUnmodifiable;
}
- public Map<Pin, Pin> getSubmodelPinsPerSupermodelPin()
+ public Pin getSupermodelPin(String name)
{
- return submodelPinsPerSupermodelPinUnmodifiable;
+ return getSupermodelMovablePin(name);
}
- public Pin getSubmodelPin(Pin supermodelPin)
+ protected Map<String, MovablePin> getSupermodelMovablePins()
{
- return getSubmodelMovablePin(supermodelPin);
+ return supermodelMovablePinsUnmodifiable;
}
- protected MovablePin getSubmodelMovablePin(Pin supermodelPin)
+ protected MovablePin getSupermodelMovablePin(String name)
{
- return submodelPinsPerSupermodelPin.get(supermodelPin);
+ return supermodelPins.get(name);
}
@Override
public void render(GeneralGC gc, Rectangle visibleRegion)
{
- double posX = getBounds().x;
- double posY = getBounds().y;
-
GCConfig conf = new GCConfig(gc);
- TranslatedGC tgc = new TranslatedGC(gc, posX, posY, submodelScale, true);
+ TranslatedGC tgc = new TranslatedGC(gc, getPosX(), getPosY(), submodelScale, true);
conf.reset(tgc);
- double visibleRegionFillRatio = Math.max(getBounds().width / visibleRegion.width, getBounds().height / visibleRegion.height);
+ double visibleRegionFillRatio = Math.max(getWidth() / visibleRegion.width, getHeight() / visibleRegion.height);
double alphaFactor = map(visibleRegionFillRatio, maxVisibleRegionFillRatioForAlpha0, minVisibleRegionFillRatioForAlpha1, 0, 1);
alphaFactor = Math.max(0, Math.min(1, alphaFactor));
// we need to take the old alpha into account to support nested submodules better.
if (submodelAlpha != 0)
{
gc.setAlpha(submodelAlpha);
- renderer.render(tgc, visibleRegion.translate(posX / submodelScale, posY / submodelScale, 1 / submodelScale));
+ renderer.render(tgc, visibleRegion.translate(getPosX() / submodelScale, getPosY() / submodelScale, 1 / submodelScale));
}
if (labelAlpha != 0)
{
@Override
public boolean clicked(double x, double y)
{
- // TODO
- double scaledX = (x - getBounds().x) / submodelScale;
- double scaledY = (y - getBounds().y) / submodelScale;
- double roundedScaledX = Math.round(scaledX / 5 * 2) * 5 / 2.;
- double roundedScaledY = Math.round(scaledY / 5 * 2) * 5 / 2.;
- System.out.println(scaledX + "|" + scaledY + ", rounded " + roundedScaledX + "|" + roundedScaledY);
- return true;
+ double scaledX = (x - getPosX()) / submodelScale;
+ double scaledY = (y - getPosY()) / submodelScale;
+ for (GUIComponent component : submodel.getComponents())
+ if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY))
+ return true;
+ return false;
}
/**
params.type = SubmodelComponent.class.getSimpleName();
params.composition = calculateCompositionParams();
- Rectangle bounds = getBounds();
- params.width = bounds.width;
- params.height = bounds.height;
+ params.width = getWidth();
+ params.height = getHeight();
- List<Pin> pinList = pinsUnmodifiable;
- InterfacePinParams[] iPins = new InterfacePinParams[pinList.size()];
+ InterfacePinParams[] iPins = new InterfacePinParams[getPins().size()];
int i = 0;
- for (Pin p : pinList)
+ for (Pin p : getPins())
{
InterfacePinParams iPinParams = new InterfacePinParams();
iPins[i] = iPinParams;
GUIComponent component = componentIt.next();
InnerComponentParams inner = new InnerComponentParams();
comps[i] = inner;
- inner.logicWidth = component.getPins().get(0).logicWidth; // This could be done a little more elegantly
- Rectangle bounds = component.getBounds();
- inner.pos = new Point(bounds.x, bounds.y);
+ inner.params = component.getInstantiationParameters();
+ inner.pos = new Point(getPosX(), getPosY());
inner.type = component.getIdentifier();
i++;
}
wires[i] = inner;
InnerPinParams pin1Params = new InnerPinParams(), pin2Params = new InnerPinParams();
- pin1Params.pinIndex = wire.getPin1().component.getPins().indexOf(wire.getPin1());
+ pin1Params.pinName = wire.getPin1().name;
pin1Params.compId = compList.indexOf(wire.getPin1().component);
- pin2Params.pinIndex = wire.getPin2().component.getPins().indexOf(wire.getPin2());
+ pin2Params.pinName = wire.getPin2().name;
pin2Params.compId = compList.indexOf(wire.getPin2().component);
inner.pin1 = pin1Params;
inner.pin2 = pin2Params;
}
@Override
- protected void removePin(Pin pin)
+ protected void removePin(String name)
{
throw new UnsupportedOperationException("Can't remove pins of a SubmodelComponent directly, call removeSubmodelInterface instead");
}