X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIComponent.java;h=5f74dadd9a411636a3f50039502b5de20379224f;hb=b2f3d0b16783289fab229c667c18d61f84119bbd;hp=9cea86a6a1870dbde04a6d67dce6057ef7eb4952;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
index 9cea86a6..5f74dadd 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
@@ -5,34 +5,38 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
-import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.wires.Pin;
 
 public abstract class GUIComponent
 {
-	protected final ViewModel model;
+	protected final ViewModelModifiable model;
 	private final Rectangle bounds;
 	private final List<Pin> pins;
 	protected final List<Pin> pinsUnmodifiable;
 
-	private final List<Consumer<? super GUIComponent>> componentLookChangedListeners;
 	private final List<Consumer<? super GUIComponent>> componentMovedListeners;
 	private final List<Consumer<? super Pin>> pinAddedListeners;
 	private final List<Consumer<? super Pin>> pinRemovedListeners;
+	private final List<Runnable> redrawListeners;
+
+	private final Runnable redrawListenerForSubcomponents;
 
-	public GUIComponent(ViewModel model)
+	public GUIComponent(ViewModelModifiable model)
 	{
 		this.model = model;
 		this.bounds = new Rectangle(0, 0, 0, 0);
 		this.pins = new ArrayList<>();
 		this.pinsUnmodifiable = Collections.unmodifiableList(pins);
 
-		this.componentLookChangedListeners = new ArrayList<>();
 		this.componentMovedListeners = new ArrayList<>();
 		this.pinAddedListeners = new ArrayList<>();
 		this.pinRemovedListeners = new ArrayList<>();
+		this.redrawListeners = new ArrayList<>();
+
+		redrawListenerForSubcomponents = this::callRedrawListeners;
 
 		model.componentCreated(this);
 	}
@@ -77,43 +81,57 @@ public abstract class GUIComponent
 	}
 
 	// @formatter:off
-	public void addComponentLookChangedListener   (Consumer<? super GUIComponent> listener) {componentLookChangedListeners.add   (listener);}
-	public void addComponentMovedListener         (Consumer<? super GUIComponent> listener) {componentMovedListeners      .add   (listener);}
-	public void addPinAddedListener               (Consumer<? super Pin         > listener) {pinAddedListeners            .add   (listener);}
-	public void addPinRemovedListener             (Consumer<? super Pin         > listener) {pinRemovedListeners          .add   (listener);}
-                                                  
-	public void removeComponentLookChangedListener(Consumer<? super GUIComponent> listener) {componentLookChangedListeners.remove(listener);}
-	public void removeComponentMovedListener      (Consumer<? super GUIComponent> listener) {componentMovedListeners      .remove(listener);}
-	public void removePinAddedListener            (Consumer<? super Pin         > listener) {pinAddedListeners            .remove(listener);}
-	public void removePinRemovedListener          (Consumer<? super Pin         > listener) {pinRemovedListeners          .remove(listener);}
-
-	protected void callComponentLookChangedListeners(     ) {componentLookChangedListeners.forEach(l -> l.accept(this));}
-	private   void callComponentMovedListeners      (     ) {componentMovedListeners      .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   ));}
-	// @form  atter:on
+	public void addComponentMovedListener   (Consumer<? super GUIComponent> listener) {componentMovedListeners.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 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 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
 
 	/**
 	 * Render this component to the given gc.
 	 */
 	public abstract void render(GeneralGC gc, Rectangle visibleRegion);
 
+	protected void requestRedraw()
+	{
+		callRedrawListeners();
+	}
+
 	protected void setSize(double width, double height)
 	{
 		bounds.width = width;
 		bounds.height = height;
-		callComponentLookChangedListeners();
+		callRedrawListeners();
 	}
 
 	protected void addPin(Pin pin)
 	{
 		pins.add(pin);
 		callPinAddedListeners(pin);
+		pin.addRedrawListener(redrawListenerForSubcomponents);
+		callRedrawListeners();
 	}
 
 	protected void removePin(Pin pin)
 	{
 		pins.remove(pin);
 		callPinRemovedListeners(pin);
+		pin.removeRedrawListener(redrawListenerForSubcomponents);
+		callRedrawListeners();
+	}
+
+	public String getIdentifier()
+	{
+		return "class:".concat(getClass().getCanonicalName());
 	}
 }
\ No newline at end of file