Skip to content

Plot: Add hysteresis to autoscale #3177

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
Oct 25, 2024
Merged

Plot: Add hysteresis to autoscale #3177

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
30 changes: 22 additions & 8 deletions app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/PlotProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2014-2023 Oak Ridge National Laboratory.
* Copyright (c) 2014-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 @@ -497,7 +497,6 @@ public void autoscale()
Pair<Double, Double> adjustedRange = axis.ticks.adjustRange(low, high);
low = adjustedRange.getKey();
high = adjustedRange.getValue();

}
else {
final ValueRange rounded = roundValueRange(low, high);
Expand All @@ -511,16 +510,31 @@ public void autoscale()
high += headroom;
}

// Autoscale happens 'all the time'.
// Do not use undo, but notify listeners.
if (low != high)
{
final AxisRange<Double> orig = axis.getValueRange();
final boolean normal = orig.getLow() < orig.getHigh();
final boolean changed = normal ? axis.setValueRange(low, high)
: axis.setValueRange(high, low);
if (changed)
plot.fireYAxisChange(axis);
final double span = Math.abs(high - low);
if (span > 0)
{
boolean changed = false;
if (normal)
{ // Hysteresis: Did low..high change beyond headroom?
if (Math.abs(orig.getLow() - low) / span > 0.05 ||
Math.abs(orig.getHigh() - high) / span > 0.05)
changed = axis.setValueRange(low, high);
}
else
{ // Hysteresis for inverted high...low range
if (Math.abs(orig.getLow() - high) / span > 0.05 ||
Math.abs(orig.getHigh() - low) / span > 0.05)
changed = axis.setValueRange(high, low);
}
// Autoscale happens 'all the time'.
// Do not use undo, but notify listeners.
if (changed)
plot.fireYAxisChange(axis);
}
}
}
catch (Exception ex)
Expand Down
Loading