if (comp instanceof SubmodelComponent)
modelsToIterate.offer(((SubmodelComponent) comp).submodel);
}
- wiresIncludingSubmodels.forEach(w -> w.addRedrawListener(() ->
+ viewModel.setRedrawHandler(() -> wiresIncludingSubmodels.forEach(w ->
{
if (debugWires)
{
setBackground(background);// this.setBackground, not gc.setBackground to have the background fill the canvas
renderer.render(gc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom));
});
- model.addRedrawListener(this::redrawThreadsafe);
+ model.setRedrawHandler(this::redrawThreadsafe);
addListener(SWT.MouseDown, this::mouseDown);
private final List<Consumer<? super GUIComponent>> componentRemovedListeners;
private final List<Consumer<? super GUIWire>> wireAddedListeners;
private final List<Consumer<? super GUIWire>> wireRemovedListeners;
- private final List<Runnable> redrawListeners;
- private final Runnable redrawListenerForSubcomponents;
+ private Runnable redrawHandler;
protected ViewModel()
{
componentRemovedListeners = new ArrayList<>();
wireAddedListeners = new ArrayList<>();
wireRemovedListeners = new ArrayList<>();
- redrawListeners = new ArrayList<>();
-
- redrawListenerForSubcomponents = this::callRedrawListeners;
}
/**
throw new IllegalStateException("Don't add the same component twice!");
components.put(component.name, component);
callComponentAddedListeners(component);
- component.addRedrawListener(redrawListenerForSubcomponents);
- callRedrawListeners();
+ requestRedraw();
}
/**
throw new IllegalStateException("Don't remove the same component twice!");
components.remove(component.name);
callComponentRemovedListeners(component);
- component.removeRedrawListener(redrawListenerForSubcomponents);
- callRedrawListeners();
+ requestRedraw();
}
/**
throw new IllegalStateException("Don't add the same wire twice!");
wires.put(wire.name, wire);
callWireAddedListeners(wire);
- wire.addRedrawListener(redrawListenerForSubcomponents);
- callRedrawListeners();
+ requestRedraw();
}
/**
throw new IllegalStateException("Don't remove the same wire twice!");
wires.remove(wire.name);
callWireRemovedListeners(wire);
- wire.removeRedrawListener(redrawListenerForSubcomponents);
- callRedrawListeners();
+ requestRedraw();
}
public Map<String, GUIComponent> getComponentsByName()
public void addComponentRemovedListener (Consumer<? super GUIComponent> listener) {componentRemovedListeners.add (listener);}
public void addWireAddedListener (Consumer<? super GUIWire > listener) {wireAddedListeners .add (listener);}
public void addWireRemovedListener (Consumer<? super GUIWire > listener) {wireRemovedListeners .add (listener);}
- public void addRedrawListener (Runnable listener) {redrawListeners .add (listener);}
public void removeComponentAddedListener (Consumer<? super GUIComponent> listener) {componentAddedListeners .remove(listener);}
public void removeComponentRemovedListener(Consumer<? super GUIComponent> listener) {componentRemovedListeners.remove(listener);}
public void removeWireAddedListener (Consumer<? super GUIWire > listener) {wireAddedListeners .remove(listener);}
public void removeWireRemovedListener (Consumer<? super GUIWire > listener) {wireRemovedListeners .remove(listener);}
- public void removeRedrawListener (Runnable listener) {redrawListeners .remove(listener);}
private void callComponentAddedListeners (GUIComponent c) {componentAddedListeners .forEach(l -> l.accept(c));}
private void callComponentRemovedListeners(GUIComponent c) {componentRemovedListeners.forEach(l -> l.accept(c));}
private void callWireAddedListeners (GUIWire w ) {wireAddedListeners .forEach(l -> l.accept(w));}
private void callWireRemovedListeners (GUIWire w ) {wireRemovedListeners .forEach(l -> l.accept(w));}
- private void callRedrawListeners ( ) {redrawListeners .forEach(l -> l.run( ));}
// @formatter:on
+
+ public void setRedrawHandler(Runnable handler)
+ {
+ this.redrawHandler = handler;
+ }
+
+ public Runnable getRedrawHandler()
+ {
+ return redrawHandler;
+ }
+
+ public void requestRedraw()
+ {
+ if (redrawHandler != null)
+ redrawHandler.run();
+ }
}
\ No newline at end of file
private final List<Consumer<? super GUIComponent>> componentResizedListeners;
private final List<Consumer<? super Pin>> pinAddedListeners;
private final List<Consumer<? super Pin>> pinRemovedListeners;
- private final List<Runnable> redrawListeners;
-
- private final Runnable redrawListenerForSubcomponents;
private HighLevelStateHandler highLevelStateHandler;
this.componentResizedListeners = new ArrayList<>();
this.pinAddedListeners = new ArrayList<>();
this.pinRemovedListeners = new ArrayList<>();
- this.redrawListeners = new ArrayList<>();
-
- redrawListenerForSubcomponents = this::requestRedraw;
// TODO this will crash the high level state debug shell because submodel is not yet set.
// The same problem exists in ViewModelModifiable.getDefaultComponentName; see there
throw new IllegalArgumentException("Duplicate pin name: " + pin.name);
pinsByName.put(pin.name, pin);
callPinAddedListeners(pin);
- pin.addRedrawListener(redrawListenerForSubcomponents);
- requestRedraw();
+ model.requestRedraw();
}
/**
{
Pin pin = pinsByName.remove(name);
callPinRemovedListeners(pin);
- pin.removeRedrawListener(redrawListenerForSubcomponents);
- requestRedraw();
+ model.requestRedraw();
}
/**
bounds.x = x;
bounds.y = y;
callComponentMovedListeners();
- requestRedraw();
+ model.requestRedraw();
}
/**
bounds.width = width;
bounds.height = height;
callComponentResizedListener();
- requestRedraw();
+ model.requestRedraw();
}
/**
// listeners
- /**
- * Calls redraw listeners.
- *
- * @author Daniel Kirschten
- */
- protected void requestRedraw()
- {
- callRedrawListeners();
- }
-
// @formatter:off
public void addComponentMovedListener (Consumer<? super GUIComponent> listener) {componentMovedListeners .add (listener);}
public void addComponentResizedListener (Consumer<? super GUIComponent> listener) {componentResizedListeners.add (listener);}
public void addPinAddedListener (Consumer<? super Pin > listener) {pinAddedListeners .add (listener);}
public void addPinRemovedListener (Consumer<? super Pin > listener) {pinRemovedListeners .add (listener);}
- public void addRedrawListener (Runnable listener) {redrawListeners .add (listener);}
public void removeComponentMovedListener (Consumer<? super GUIComponent> listener) {componentMovedListeners .remove(listener);}
public void removeComponentResizedListener (Consumer<? super GUIComponent> listener) {componentResizedListeners.remove(listener);}
public void removePinAddedListener (Consumer<? super Pin > listener) {pinAddedListeners .remove(listener);}
public void removePinRemovedListener (Consumer<? super Pin > listener) {pinRemovedListeners .remove(listener);}
- public void removeRedrawListener (Runnable listener) {redrawListeners .remove(listener);}
private void callComponentMovedListeners ( ) {componentMovedListeners .forEach(l -> l.accept(this));}
private void callComponentResizedListener( ) {componentResizedListeners.forEach(l -> l.accept(this));}
private void callPinAddedListeners (Pin p) {pinAddedListeners .forEach(l -> l.accept(p ));}
private void callPinRemovedListeners (Pin p) {pinRemovedListeners .forEach(l -> l.accept(p ));}
- private void callRedrawListeners ( ) {redrawListeners .forEach(l -> l.run( ));}
// @formatter:on
}
\ No newline at end of file
public GUIBitDisplay(ViewModelModifiable model, String name)
{
super(model, name);
- logicObs = (i) -> requestRedraw();
+ logicObs = (i) -> model.requestRedraw();
setSize(width, height);
addPin(this.inputPin = new Pin(this, "", 1, 0, height / 2));
public GUIManualSwitch(ViewModelModifiable model, String name)
{
super(model, name);
- logicObs = (i) -> requestRedraw();
+ logicObs = (i) -> model.requestRedraw();
setSize(width, height);
addPin(this.outputPin = new Pin(this, "", 1, width, height / 2));
this.minVisibleRegionFillRatioForAlpha1 = 0.8;
this.renderer = new LogicUIRenderer(submodelModifiable);
- submodelModifiable.addRedrawListener(this::requestRedraw);
+ submodelModifiable.setRedrawHandler(model.getRedrawHandler());
}
// pins
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
+ model.requestRedraw();// needed if there is no submodel interface pin
}
/**
protected void setSymbolRenderer(Renderer symbolRenderer)
{
this.symbolRenderer = symbolRenderer;
- requestRedraw();
+ model.requestRedraw();
}
/**
protected void setOutlineRenderer(Renderer outlineRenderer)
{
this.outlineRenderer = outlineRenderer;
- requestRedraw();
+ model.requestRedraw();
}
/**
*/
private double[] effectivePath;
- private final List<Runnable> redrawListeners;
private final List<Consumer<GUIWire>> pathChangedListeners;
/**
this.path = path == null ? null : Arrays.copyOf(path, path.length);
this.bounds = new Rectangle(0, 0, -1, -1);
- redrawListeners = new ArrayList<>();
pathChangedListeners = new ArrayList<>();
- logicObs = (i) -> callRedrawListeners();
+ logicObs = (i) -> model.requestRedraw();
pin1.addPinMovedListener(p -> pinMoved());
pin2.addPinMovedListener(p -> pinMoved());
private void pinMoved()
{
recalculateEffectivePath();
- callRedrawListeners();
+ model.requestRedraw();
}
// "graphical" operations
this.path = deepPathCopy(path);
recalculateEffectivePath();
callPathChangedListeners();
- callRedrawListeners();
+ model.requestRedraw();
}
public Point getPathPoint(int index)
path[index] = pointCopy(p);
recalculateEffectivePath();
callPathChangedListeners();
- callRedrawListeners();
+ model.requestRedraw();
}
public void insertPathPoint(Point p, int index)
// listeners
// @formatter:off
- public void addRedrawListener (Runnable listener) {redrawListeners .add (listener);}
public void addPathChangedListener (Consumer<GUIWire> listener) {pathChangedListeners.add (listener);}
- public void removeRedrawListener (Runnable listener) {redrawListeners .remove(listener);}
public void removePathChangedListener(Consumer<GUIWire> listener) {pathChangedListeners.remove(listener);}
- private void callRedrawListeners () {redrawListeners .forEach(l -> l.run ( ));}
private void callPathChangedListeners() {pathChangedListeners.forEach(l -> l.accept(this));}
// @formatter:on
public WireCrossPoint(ViewModelModifiable model, int logicWidth, String name)
{
super(model, name);
- logicObs = (i) -> requestRedraw();
+ logicObs = (i) -> model.requestRedraw();
setSize(CIRCLE_DIAM, CIRCLE_DIAM);
addPin(this.pin = new Pin(this, "", logicWidth, CIRCLE_RADIUS, CIRCLE_RADIUS));
public void setOutlineRenderer(Renderer outlineRenderer)
{
super.setOutlineRenderer(outlineRenderer);
- requestRedraw();
}
@Override
projects / Mograsim.git / commitdiff