From f05390137e98cbbffbbeccb8ed296fdfeeb222b0 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Thu, 6 Jun 2019 21:30:08 +0200 Subject: [PATCH] renderOutline() and renderSymbol() now have access to visibleRegion --- .../components/SimpleRectangularSubmodelComponent.java | 5 +++-- .../logic/ui/model/components/SubmodelComponent.java | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java index 96f1a339..89a55f01 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java @@ -7,6 +7,7 @@ import java.util.List; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; +import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.ui.model.ViewModelModifiable; import net.mograsim.logic.ui.model.wires.Pin; @@ -103,7 +104,7 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent } @Override - protected void renderSymbol(GeneralGC gc) + protected void renderSymbol(GeneralGC gc, Rectangle visibleRegion) { double posX = getBounds().x; double posY = getBounds().y; @@ -117,7 +118,7 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent } @Override - protected void renderOutline(GeneralGC gc) + protected void renderOutline(GeneralGC gc, Rectangle visibleRegion) { gc.drawRectangle(getBounds()); } diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java index 72663a2a..a4fe1aa4 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java @@ -153,16 +153,16 @@ public abstract class SubmodelComponent extends GUIComponent if (labelAlpha != 0) { gc.setAlpha(labelAlpha); - renderSymbol(gc); + renderSymbol(gc, visibleRegion); } conf.reset(gc); // draw the outline after all other operations to make interface pins look better - renderOutline(gc); + renderOutline(gc, visibleRegion); } - protected abstract void renderOutline(GeneralGC gc); + protected abstract void renderOutline(GeneralGC gc, Rectangle visibleRegion); - protected abstract void renderSymbol(GeneralGC gc); + protected abstract void renderSymbol(GeneralGC gc, Rectangle visibleRegion); private static double map(double val, double valMin, double valMax, double mapMin, double mapMax) { -- 2.17.1