Skip to content

CSSTUDIO-3661 Bugfix: Take into account Range.isReversed() when computing the alarm limits for the tooltip of a widget #3709

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

Open
abrahamwolk wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −4
Open

CSSTUDIO-3661 Bugfix: Take into account Range.isReversed() when computing the alarm limits for the tooltip of a widget #3709

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
22 changes: 18 additions & 4 deletions .../main/java/org/csstudio/display/builder/representation/javafx/widgets/TooltipSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,26 @@ public static void attach(final Node node, final WidgetProperty<String> tooltip_
if (vtype instanceof DisplayProvider && !Alarm.alarmOf(vtype).equals(Alarm.disconnected()) ) {

Range alarmRange = display.getAlarmRange();
double lolo = alarmRange.getMinimum();
double hihi = alarmRange.getMaximum();
double lolo;
double hihi;
if (!alarmRange.isReversed()) {
lolo = alarmRange.getMinimum();
hihi = alarmRange.getMaximum();
} else {
lolo = alarmRange.getMaximum();
hihi = alarmRange.getMinimum();
}

Range warningRange = display.getWarningRange();
double low = warningRange.getMinimum();
double high = warningRange.getMaximum();
double low;
double high;
if (!warningRange.isReversed()) {
low = warningRange.getMinimum();
high = warningRange.getMaximum();
} else {
low = warningRange.getMaximum();
high = warningRange.getMinimum();
}

String pv_alarm_limits = Messages.HIHI + ": " + (Double.isNaN(hihi) ? Messages.NotSet : hihi) + System.lineSeparator() +
Messages.HIGH + ": " + (Double.isNaN(high) ? Messages.NotSet : high) + System.lineSeparator() +
Expand Down