Skip to content

Commit d91ba90

Browse files
authored
Merge pull request #2274 from ControlSystemStudio/csstudio-1339-jenks
fix: meter widget not using limits defined in editor when pv missing display limits
2 parents 0b5aae4 + 2368e15 commit d91ba90

File tree

1 file changed

+9
-2
lines changed
  • app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets

1 file changed

+9
-2
lines changed

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/MeterRepresentation.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,15 @@ private void valueChanged(final WidgetProperty<?> property, final Object old_val
104104
// Try display range from PV
105105
if (display_info != null)
106106
{
107-
min_val = display_info.getDisplayRange().getMinimum();
108-
max_val = display_info.getDisplayRange().getMaximum();
107+
// If the PV is a number, then use the values from the PV
108+
double pv_min_val = display_info.getDisplayRange().getMinimum();
109+
if(!Double.isNaN(pv_min_val)) {
110+
min_val = pv_min_val;
111+
}
112+
double pv_max_val = display_info.getDisplayRange().getMaximum();
113+
if(!Double.isNaN(pv_max_val)) {
114+
max_val = pv_max_val;
115+
}
109116
}
110117
}
111118
meter.setRange(min_val, max_val);

0 commit comments

Comments
 (0)