Skip to content

Fix image zoom/pan with "limits from PV" #2448

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
merged 1 commit into from
Nov 4, 2022
Merged

Fix image zoom/pan with "limits from PV" #2448

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions app/rtplot/src/main/java/org/csstudio/javafx/rtplot/RTImagePlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2014-2020 Oak Ridge National Laboratory.
* Copyright (c) 2014-2022 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 @@ -443,10 +443,10 @@ public void setCrosshairLocation(final double x_val, final double y_val)
}

/** Set axis range for 'full' image
* @param min_x
* @param max_x
* @param min_y
* @param max_y
* @param min_x User coordinates
* @param max_x ...
* @param min_y ...
* @param max_y ...
*/
public void setAxisRange(final double min_x, final double max_x,
final double min_y, final double max_y)
Expand Down
20 changes: 15 additions & 5 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-2020 Oak Ridge National Laboratory.
* Copyright (c) 2015-2022 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 @@ -237,18 +237,28 @@ public ColorMappingFunction getColorMapping()
}

/** Set axis range for 'full' image
* @param min_x
* @param max_x
* @param min_y
* @param max_y
* @param min_x User coordinates
* @param max_x ...
* @param min_y ...
* @param max_y ...
*/
public void setAxisRange(final double min_x, final double max_x,
final double min_y, final double max_y)
{
// Ignore if there are no changes, because otherwise
// each call would reset axes that had "zoomed" into the image
if (this.min_x == min_x &&
this.max_x == max_x &&
this.min_y == min_y &&
this.max_y == max_y)
return;

// Update the full image size
this.min_x = min_x;
this.max_x = max_x;
this.min_y = min_y;
this.max_y = max_y;
// .. and set axes to show complete image
x_axis.setValueRange(min_x, max_x);
y_axis.setValueRange(min_y, max_y);
}
Expand Down