Skip to content

Trace legend: Fix layout when traces are hidden #2963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasemir merged 1 commit into from
Feb 27, 2024
Merged

Trace legend: Fix layout when traces are hidden #2963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/LegendPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015-2016 Oak Ridge National Laboratory.
* Copyright (c) 2015-2024 Oak Ridge National Laboratory.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -72,7 +72,7 @@ public int getDesiredHeight(final Graphics2D gc, final int bounds_width,

gc.setFont(orig_font);

final int items = traces.size();
final int items = (int) traces.stream().filter(Trace::isVisible).count();
final int items_per_row = Math.max(1, bounds_width / grid_x); // Round down, counting full items
final int rows = (items + items_per_row-1) / items_per_row; // Round up
return rows * grid_y;
Expand All @@ -84,9 +84,8 @@ private void computeGrid(final Graphics2D gc, final List<Trace<XTYPE>> traces){
int max_width = 1; // Start with 1 pixel to avoid later div-by-0
for (Trace<XTYPE> trace : traces)
{
if (!trace.isVisible()) {
if (!trace.isVisible())
continue;
}
final int width = metrics.stringWidth(trace.getLabel());
if (width > max_width)
max_width = width;
Expand Down Expand Up @@ -118,7 +117,7 @@ public void paint(final Graphics2D gc, final Font font,

// Need to compute grid since labels may have changed in case unit string was added when PV connects.
computeGrid(gc, traces);

super.paint(gc);

int x = bounds.x, y = bounds.y + base_offset;
Expand Down