Skip to content
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

Jump to bottom

Image plot fixes #3166

Merged
merged 5 commits into from
Oct 14, 2024
Merged

Image plot fixes #3166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f5e1de
Image widget: Fix VImage handling
Oct 11, 2024
470cb81
Remove unused imports
Oct 11, 2024
837ad40
Image plot: Fix response to toolbar show/hide
Oct 14, 2024
c72c19e
Image Plot: Enforce non-empty range for auto-scaling color bar
Oct 14, 2024
869ddc7
typo
Oct 14, 2024
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
3 changes: 0 additions & 3 deletions ...fx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetInfoDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
import javafx.scene.layout.FlowPane;
import javafx.event.EventHandler;
import javafx.geometry.Insets;
import javafx.scene.Group;
import javafx.scene.Scene;
import javafx.scene.control.*;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.input.ContextMenuEvent;
import javafx.scene.layout.TilePane;
import javafx.stage.Stage;
import javafx.scene.input.Clipboard;
Expand All @@ -42,7 +40,6 @@
import org.csstudio.display.builder.model.util.DisplayWidgetStats;
import org.csstudio.display.builder.model.util.VTypeUtil;
import org.csstudio.display.builder.representation.javafx.widgets.JFXBaseRepresentation;
import org.epics.pva.data.PVAValue;
import org.epics.vtype.Alarm;
import org.epics.vtype.AlarmSeverity;
import org.epics.vtype.VNumberArray;
Expand Down
12 changes: 10 additions & 2 deletions ...org/csstudio/display/builder/representation/javafx/widgets/plots/ImageRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015-2022 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 @@ -455,7 +455,7 @@ else if (value instanceof VImage)
final int height = image.getHeight();
if (model_widget.propLimitsFromPV().getValue())
{
final int x0, x1, y0, y1;
final double x0, x1, y0, y1;
if (image.isXReversed())
{
x1 = image.getXOffset();
Expand All @@ -476,6 +476,14 @@ else if (value instanceof VImage)
y0 = image.getYOffset() + height;
y1 = image.getYOffset();
}

// Update model because otherwise we'll revert back to its range
changing_axis_range = true;
model_widget.propXAxis().minimum().setValue(x0);
model_widget.propXAxis().maximum().setValue(x1);
model_widget.propYAxis().minimum().setValue(y0);
model_widget.propYAxis().maximum().setValue(y1);
changing_axis_range = false;
image_plot.setAxisRange(x0, x1, y0, y1);
}
image_plot.setValue(width, height, image.getData(),
Expand Down
47 changes: 28 additions & 19 deletions app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/ImagePlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015-2023 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 @@ -600,26 +600,19 @@ else if (numbers instanceof ArrayInteger)

// Transform from full axis range into data range,
// using the current 'zoom' state of each axis
final LinearScreenTransform t = new LinearScreenTransform();
final LinearScreenTransform zoom_trans_x = new LinearScreenTransform();
AxisRange<Double> zoomed = x_axis.getValueRange();
t.config(min_x, max_x, 0, data_width);
zoom_trans_x.config(min_x, max_x, 0, data_width);
// Round down .. up to always cover the image_area
final int src_x1 = Math.max(0, (int) t.transform(zoomed.getLow()));
final int src_x2 = Math.min(data_width, (int)(t.transform(zoomed.getHigh()) + 1));

// Pixels of the image need to be aligned to their axis location,
// especially when zoomed way in and the pixels are huge.
// Turn pixel back into axis value, and then determine its destination on screen.
final int dst_x1 = x_axis.getScreenCoord(t.inverse(src_x1));
final int dst_x2 = x_axis.getScreenCoord(t.inverse(src_x2));
final int src_x1 = Math.max(0, (int) zoom_trans_x.transform(zoomed.getLow()));
final int src_x2 = Math.min(data_width, (int)(zoom_trans_x.transform(zoomed.getHigh()) + 1));

// For Y axis, min_y == bottom == data_height
final LinearScreenTransform zoom_trans_y = new LinearScreenTransform();
zoomed = y_axis.getValueRange();
t.config(min_y, max_y, data_height, 0);
final int src_y1 = Math.max(0, (int) t.transform(zoomed.getHigh()));
final int src_y2 = Math.min(data_height, (int) (t.transform(zoomed.getLow() ) + 1));
final int dst_y1 = y_axis.getScreenCoord(t.inverse(src_y1));
final int dst_y2 = y_axis.getScreenCoord(t.inverse(src_y2));
zoom_trans_y.config(min_y, max_y, data_height, 0);
final int src_y1 = Math.max(0, (int) zoom_trans_y.transform(zoomed.getHigh()));
final int src_y2 = Math.min(data_height, (int) (zoom_trans_y.transform(zoomed.getLow() ) + 1));

// Value range: Start with min..max from model
double min_value = this.min, max_value = this.max;
Expand Down Expand Up @@ -656,13 +649,29 @@ else if (numbers instanceof ArrayInteger)
logger.log(Level.FINE, "Autoscale range {0} .. {1}", new Object[] { min_value, max_value });
}

// If log, min needs to be > 0
if (colorbar_axis.isLogarithmic() && min_value <= 0.0)
min_value = 0.001; // arbitrary minimum
if (colorbar_axis.isLogarithmic())
{ // If log, min needs to be > 0
if (min_value <= 0.0)
min_value = 0.001; // arbitrary minimum
}
else
{ // Linear axis needs non-empty value range
if (Math.abs(max_value - min_value) < 1e-100)
max_value = min_value + 1.0; // Range suitable for most histogram-type plots
}
colorbar_axis.setValueRange(min_value, max_value);
if (need_layout.getAndSet(false))
computeLayout(gc, area_copy, min_value, max_value);

// After potential layout update, get destination x,y of image.
// Pixels of the image need to be aligned to their axis location,
// especially when zoomed way in and the pixels are huge.
// Turn pixel back into axis value, and then determine its destination on screen.
final int dst_x1 = x_axis.getScreenCoord(zoom_trans_x.inverse(src_x1));
final int dst_x2 = x_axis.getScreenCoord(zoom_trans_x.inverse(src_x2));
final int dst_y1 = y_axis.getScreenCoord(zoom_trans_y.inverse(src_y1));
final int dst_y2 = y_axis.getScreenCoord(zoom_trans_y.inverse(src_y2));

// Fill with a 'background' color
if (background.getAlpha() < 255)
{ // Clear because fill alone with transparent background leaves previous content
Expand Down
Loading