Skip to content

Commit

Permalink
chore: Make FlamegraphRenderEngine not optional
Browse files Browse the repository at this point in the history 
This allow to simplify some code and to fix the property syntax
in kotlin.
  • Loading branch information
@bric3
bric3 committed Mar 11, 2024
1 parent 5712c58 commit bd14ea6
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 95 deletions.
2 changes: 1 addition & 1 deletion fireplace-app/src/main/kotlin/io/github/bric3/fireplace/ui/FlamegraphPane.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class FlamegraphPane : JPanel(BorderLayout()) {
*(colorPaletteJComboBox.selectedItem as Colors.Palette).colors()
)
)
jfrFlamegraphView.setFrameColorProvider(DimmingFrameColorProvider(frameBoxColorFunction))
jfrFlamegraphView.frameColorProvider = DimmingFrameColorProvider(frameBoxColorFunction)
jfrFlamegraphView.requestRepaint()
}.also {
colorPaletteJComboBox.addActionListener(it)
Expand Down
183 changes: 89 additions & 94 deletions fireplace-swing/src/main/java/io/github/bric3/fireplace/flamegraph/FlamegraphView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;

import static java.lang.Boolean.TRUE;
Expand Down Expand Up @@ -259,6 +258,12 @@ static Point getPointLeveledToFrameDepth(@NotNull MouseEvent mouseEvent, @NotNul
*/
public FlamegraphView() {
canvas = new FlamegraphCanvas<>(this);
// default configuration
setRenderConfiguration(
FrameTextsProvider.of(frameBox -> frameBox.actualNode.toString()),
FrameColorProvider.defaultColorProvider(f -> UIManager.getColor("Button.background")),
FrameFontProvider.defaultFontProvider()
);
canvas.putClientProperty(OWNER_KEY, this);
scrollPaneListener = new FlamegraphHoveringScrollPaneMouseListener<>(canvas);
var scrollPane = createScrollPane();
Expand Down Expand Up @@ -440,21 +445,20 @@ public void configureCanvas(@NotNull Consumer<@NotNull JComponent> canvasConfigu
*/
public void setFrameColorProvider(@NotNull FrameColorProvider<@NotNull T> frameColorProvider) {
this.canvas.getFlamegraphRenderEngine()
.ifPresent(fgp -> fgp.getFrameRenderer()
.setFrameColorProvider(frameColorProvider));
.getFrameRenderer()
.setFrameColorProvider(frameColorProvider);
}

/**
* Returns the frame colors provider.
*
* @return The frame colors provider, may return <code>null</code> if renderer not configured.
*/
@Nullable // TODO make it non-nullable for kotlin
@NotNull
public FrameColorProvider<@NotNull T> getFrameColorProvider() {
return canvas.getFlamegraphRenderEngine()
.map(fgp -> fgp.getFrameRenderer()
.getFrameColorProvider())
.orElse(null);
.getFrameRenderer()
.getFrameColorProvider();
}

/**
Expand All @@ -465,21 +469,20 @@ public void setFrameColorProvider(@NotNull FrameColorProvider<@NotNull T> frameC
*/
public void setFrameFontProvider(@NotNull FrameFontProvider<@NotNull T> frameFontProvider) {
this.canvas.getFlamegraphRenderEngine()
.ifPresent(fgp -> fgp.getFrameRenderer()
.setFrameFontProvider(frameFontProvider));
.getFrameRenderer()
.setFrameFontProvider(frameFontProvider);
}

/**
* Returns the frane font provider.
*
* @return The frame font provider, may return <code>null</code> if renderer not configured.
*/
@Nullable // TODO make it non-nullable for kotlin
@NotNull
public FrameFontProvider<@NotNull T> getFrameFontProvider() {
return canvas.getFlamegraphRenderEngine()
.map(fgp -> fgp.getFrameRenderer()
.getFrameFontProvider())
.orElse(null);
.getFrameRenderer()
.getFrameFontProvider();
}

/**
Expand All @@ -490,21 +493,20 @@ public void setFrameFontProvider(@NotNull FrameFontProvider<@NotNull T> frameFon
*/
public void setFrameTextsProvider(@NotNull FrameTextsProvider<@NotNull T> frameTextsProvider) {
this.canvas.getFlamegraphRenderEngine()
.ifPresent(fgp -> fgp.getFrameRenderer()
.setFrameTextsProvider(frameTextsProvider));
.getFrameRenderer()
.setFrameTextsProvider(frameTextsProvider);
}

/**
* Returns the frame texts candidate provider.
*
* @return The frame texts candidate provider, may return <code>null</code> if renderer not configured.
*/
@Nullable // TODO make it non-nullable for kotlin
@NotNull
public FrameTextsProvider<@NotNull T> getFrameTextsProvider() {
return canvas.getFlamegraphRenderEngine()
.map(fgp -> fgp.getFrameRenderer()
.getFrameTextsProvider())
.orElse(null);
.getFrameRenderer()
.getFrameTextsProvider();
}

/**
Expand All @@ -514,7 +516,8 @@ public void setFrameTextsProvider(@NotNull FrameTextsProvider<@NotNull T> frameT
*/
public void setFrameGapEnabled(boolean frameGapEnabled) {
canvas.getFlamegraphRenderEngine()
.ifPresent(fgp -> fgp.getFrameRenderer().setDrawingFrameGap(frameGapEnabled));
.getFrameRenderer()
.setDrawingFrameGap(frameGapEnabled);
}

/**
Expand All @@ -524,8 +527,8 @@ public void setFrameGapEnabled(boolean frameGapEnabled) {
*/
public boolean isFrameGapEnabled() {
return canvas.getFlamegraphRenderEngine()
.map(fgp -> fgp.getFrameRenderer().isDrawingFrameGap())
.orElse(false);
.getFrameRenderer()
.isDrawingFrameGap();
}

/**
Expand Down Expand Up @@ -562,8 +565,7 @@ public boolean isShowMinimap() {
* @param showHoveredSiblings {@code true} to show the siblings of the hovered frame, {@code false} otherwise.
*/
public void setShowHoveredSiblings(boolean showHoveredSiblings) {
canvas.getFlamegraphRenderEngine()
.ifPresent(fre -> fre.setShowHoveredSiblings(showHoveredSiblings));
canvas.getFlamegraphRenderEngine().setShowHoveredSiblings(showHoveredSiblings);
}

/**
Expand All @@ -573,8 +575,7 @@ public void setShowHoveredSiblings(boolean showHoveredSiblings) {
*/
public boolean isShowHoveredSiblings() {
return canvas.getFlamegraphRenderEngine()
.map(FlamegraphRenderEngine::isShowHoveredSiblings)
.orElse(false);
.isShowHoveredSiblings();
}

/**
Expand Down Expand Up @@ -646,25 +647,25 @@ public void setHoverListener(@NotNull HoverListener<@NotNull T> hoverListener) {
*/
public void setModel(@NotNull FrameModel<@NotNull T> frameModel) {
framesModel = Objects.requireNonNull(frameModel);
canvas.getFlamegraphRenderEngine().ifPresent(fre -> fre.init(frameModel));
canvas.getFlamegraphRenderEngine().init(frameModel);

// force invalidation of the canvas so that the scrollpane will fetch the new preferredSize
// force invalidation of the canvas so that the scroll-pane will fetch the new preferredSize
// otherwise old cached preferredSize will be used.
canvas.invalidate();
component.revalidate();
component.repaint();
}

/**
* Configures the rendering of {@link FlamegraphView}.
* Configures a new rendering engine of {@link FlamegraphView}.
*
* <p>
* When this method is invoked after a model has been set this request
* a new repaint.
* </p>
*
* <p>
* In particular this function defines the behavior to access the typed data:
* In particular, this function defines the behavior to access the typed data:
* <ul>
* <li>Possible string candidates to display in frames, those are
* selected based on the available space</li>
Expand Down Expand Up @@ -717,8 +718,7 @@ public void setTooltipTextFunction(
public void clear() {
framesModel = FrameModel.empty();

canvas.getFlamegraphRenderEngine()
.ifPresent(FlamegraphRenderEngine::reset);
canvas.getFlamegraphRenderEngine().reset();
canvas.revalidate();
canvas.repaint();
}
Expand Down Expand Up @@ -843,7 +843,7 @@ public void highlightFrames(@NotNull Set<@NotNull FrameBox<@NotNull T>> framesTo
Objects.requireNonNull(framesToHighlight);
Objects.requireNonNull(searched);
canvas.getFlamegraphRenderEngine()
.ifPresent(painter -> painter.setHighlightFrames(framesToHighlight, searched));
.setHighlightFrames(framesToHighlight, searched);
canvas.repaint();
}

Expand Down Expand Up @@ -879,7 +879,7 @@ static class FlamegraphCanvas<T> extends JPanel implements ZoomableComponent<T>
@NotNull
private final FlamegraphView<@NotNull T> flamegraphView;
private final ZoomModel<T> zoomModel = new ZoomModel<>();

private long lastDrawTime;

public FlamegraphCanvas(@NotNull FlamegraphView<@NotNull T> flamegraphView) {
Expand Down Expand Up @@ -1345,8 +1345,9 @@ void setFlamegraphRenderEngine(@NotNull FlamegraphRenderEngine<@NotNull T> flame
this.flamegraphRenderEngine = flamegraphRenderEngine;
}

Optional<FlamegraphRenderEngine<@NotNull T>> getFlamegraphRenderEngine() {
return Optional.ofNullable(flamegraphRenderEngine);
@NotNull
FlamegraphRenderEngine<@NotNull T> getFlamegraphRenderEngine() {
return flamegraphRenderEngine;
}

public void setToolTipTextFunction(@NotNull BiFunction<@NotNull FrameModel<@NotNull T>, FrameBox<@NotNull T>, @NotNull String> tooltipTextFunction) {
Expand Down Expand Up @@ -1380,17 +1381,13 @@ public void setMode(@NotNull Mode mode) {
return;
}

getFlamegraphRenderEngine().ifPresent(fre -> fre.setIcicle(Mode.ICICLEGRAPH == mode));
getFlamegraphRenderEngine().setIcicle(Mode.ICICLEGRAPH == mode);
firePropertyChange(GRAPH_MODE, oldMode, mode);
}

@NotNull
public FlamegraphView.Mode getMode() {
Function<Boolean, Mode> toFlamegraphViewMode = isIcicle -> isIcicle ? Mode.ICICLEGRAPH : Mode.FLAMEGRAPH;
return getFlamegraphRenderEngine()
.map(FlamegraphRenderEngine::isIcicle)
.map(toFlamegraphViewMode)
.orElse(toFlamegraphViewMode.apply(FlamegraphRenderEngine.DEFAULT_ICICLE_MODE));
return getFlamegraphRenderEngine().isIcicle() ? Mode.ICICLEGRAPH : Mode.FLAMEGRAPH;
}

public void setPopupConsumer(
Expand Down Expand Up @@ -1470,8 +1467,8 @@ public void zoom(@NotNull ZoomTarget<@NotNull T> zoomTarget) {
* * Hovering frames
* </p>
*
* @see HoverListener
* @param <T>
* @see HoverListener
*/
private static class FlamegraphHoveringScrollPaneMouseListener<T> implements MouseInputListener, FocusListener {
private Point pressedPoint;
Expand Down Expand Up @@ -1542,22 +1539,22 @@ public void mouseClicked(@NotNull MouseEvent e) {

if (e.getClickCount() == 2) {
// find zoom target then do an animated transition
canvas.getFlamegraphRenderEngine().flatMap(fgp -> fgp.calculateZoomTargetForFrameAt(
canvas.getFlamegraphRenderEngine().calculateZoomTargetForFrameAt(
(Graphics2D) canvas.getGraphics(),
canvas.getBounds(tmpBounds),
canvas.getVisibleRect(),
latestMouseLocation
)).ifPresent(zoomTarget -> zoom(canvas, zoomTarget));
).ifPresent(zoomTarget -> zoom(canvas, zoomTarget));
return;
}

canvas.getFlamegraphRenderEngine()
.ifPresent(fgp -> fgp.toggleSelectedFrameAt(
.toggleSelectedFrameAt(
(Graphics2D) viewPort.getView().getGraphics(),
canvas.getBounds(tmpBounds),
latestMouseLocation,
(frame, r) -> canvas.repaint()
));
);
}


Expand All @@ -1572,11 +1569,11 @@ public void mouseExited(@NotNull MouseEvent e) {
hoveredFrameRectangle = null;
hoveredFrame = null;
canvas.getFlamegraphRenderEngine()
.ifPresent(fgp -> fgp.stopHover(
.stopHover(
(Graphics2D) canvas.getGraphics(),
canvas.getBounds(tmpBounds),
canvas::repaint
));
);
canvas.repaint();

// mouse exit is triggered when the pointer leaves the scroll pane and enters the canvas
Expand Down Expand Up @@ -1614,50 +1611,48 @@ public void mouseMoved(@NotNull MouseEvent e) {
}
// Find hovered frame, repaint previous hovered frame and current hovered frame
// configure tooltip, invoke hover listener
canvas.getFlamegraphRenderEngine()
.ifPresent(fgp -> {
var canvasGraphics = (Graphics2D) canvas.getGraphics();
var canvasBounds = canvas.getBounds(tmpBounds);
fgp.getFrameAt(
canvasGraphics,
canvasBounds,
latestMouseLocation
)
.ifPresentOrElse(
frame -> {
fgp.hoverFrame(
frame,
canvasGraphics,
canvasBounds,
canvas::repaint
);
canvas.setToolTipText(frame);
hoveredFrameRectangle = fgp.getFrameRectangle(
canvasGraphics,
canvasBounds,
frame
);
hoveredFrame = frame;
if (hoverListener != null) {
hoverListener.onFrameHover(frame, hoveredFrameRectangle, e);
}
},
() -> {
fgp.stopHover(
canvasGraphics,
canvasBounds,
canvas::repaint
);
var prevHoveredFrameRectangle = hoveredFrameRectangle;
var prevHoveredFrame = hoveredFrame;
hoveredFrameRectangle = null;
hoveredFrame = null;
if (hoverListener != null) {
hoverListener.onStopHover(prevHoveredFrame, prevHoveredFrameRectangle, e);
}
}
);
});
var fgp = canvas.getFlamegraphRenderEngine();
var canvasGraphics = (Graphics2D) canvas.getGraphics();
var canvasBounds = canvas.getBounds(tmpBounds);
fgp.getFrameAt(
canvasGraphics,
canvasBounds,
latestMouseLocation
)
.ifPresentOrElse(
frame -> {
fgp.hoverFrame(
frame,
canvasGraphics,
canvasBounds,
canvas::repaint
);
canvas.setToolTipText(frame);
hoveredFrameRectangle = fgp.getFrameRectangle(
canvasGraphics,
canvasBounds,
frame
);
hoveredFrame = frame;
if (hoverListener != null) {
hoverListener.onFrameHover(frame, hoveredFrameRectangle, e);
}
},
() -> {
fgp.stopHover(
canvasGraphics,
canvasBounds,
canvas::repaint
);
var prevHoveredFrameRectangle = hoveredFrameRectangle;
var prevHoveredFrame = hoveredFrame;
hoveredFrameRectangle = null;
hoveredFrame = null;
if (hoverListener != null) {
hoverListener.onStopHover(prevHoveredFrame, prevHoveredFrameRectangle, e);
}
}
);
}

public void setHoverListener(HoverListener<T> hoveringListener) {
Expand Down Expand Up @@ -1719,7 +1714,7 @@ public void install(JScrollPane scrollPane) {
/**
* The zoom model is responsible to keep track
* of the current zoom target and the last user interaction.
*
*
* @param <T>
*/
@Experimental
Expand Down

0 comments on commit bd14ea6

Please sign in to comment.