Skip to content

CSSTUDIO-3653 Linear Meter widget tooltip improvements #3713

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 2 commits into
base: master
Choose a base branch
from
+22 −0
Open

CSSTUDIO-3653 Linear Meter widget tooltip improvements #3713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94a9c4
CSSTUDIO-3653 Linear Meter widget: Improve formatting in tooltip by o…
abrahamwolk Feb 26, 2026
84b6103
CSSTUDIO-3653 Linear Meter widget: Add propPrecision() to the Linear …
abrahamwolk Feb 26, 2026
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
13 changes: 13 additions & 0 deletions ...c/main/java/org/csstudio/display/extra/widgets/linearmeter/LinearMeterRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.representation.javafx.JFXUtil;
import org.csstudio.display.builder.representation.javafx.widgets.RegionBaseRepresentation;
import org.csstudio.display.builder.representation.javafx.widgets.TooltipSupport;
import org.epics.util.stats.Range;
import org.phoebus.ui.vtype.FormatOptionHandler;

import javafx.scene.layout.Pane;
import org.epics.vtype.Display;
Expand Down Expand Up @@ -96,6 +98,17 @@ private <T> void addUntypedWidgetPropertyListener(WidgetProperty<T> widgetProper
widgetPropertiesWithWidgetPropertyListeners.push(new Pair(widgetProperty, widgetPropertyListener));
}

@Override
protected void attachTooltip()
{
// Use formatted value for "$(pv_value)" instead of the default VType.toString()
TooltipSupport.attach(jfx_node, model_widget.propTooltip(), () ->
FormatOptionHandler.format(model_widget.runtimePropValue().getValue(),
model_widget.propFormat().getValue(),
model_widget.propPrecision().getValue(),
model_widget.propShowUnits().getValue()));
}

@Override
protected void registerListeners()
{
Expand Down
9 changes: 9 additions & 0 deletions ...meter/src/main/java/org/csstudio/display/extra/widgets/linearmeter/LinearMeterWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ public EnumWidgetProperty<RTLinearMeter.DisplayMode> createProperty(Widget widge
private WidgetProperty<WidgetColor> background;
private WidgetProperty<WidgetFont> font;
private WidgetProperty<FormatOption> format;
private WidgetProperty<Integer> precision;
private WidgetProperty<Boolean> show_units;
private WidgetProperty<Boolean> show_limits;
private WidgetProperty<Boolean> show_warnings;
Expand Down Expand Up @@ -260,6 +261,7 @@ protected void defineProperties(List<WidgetProperty<?>> properties) {
properties.add(logScale = propLogScale.createProperty(this, false));
properties.add(font = propFont.createProperty(this, WidgetFontService.get(NamedWidgetFonts.DEFAULT)));
properties.add(format = propFormat.createProperty(this, FormatOption.DEFAULT));
properties.add(precision = propPrecision.createProperty(this, -1));
properties.add(show_units = propShowUnits.createProperty(this, true));
properties.add(scale_visible = propScaleVisible.createProperty(this, true));
properties.add(show_limits = propShowLimits.createProperty(this, true));
Expand Down Expand Up @@ -325,6 +327,13 @@ public WidgetProperty<FormatOption> propFormat() {
return format;
}

/**
* @return 'precision' property
*/
public WidgetProperty<Integer> propPrecision() {
return precision;
}

/**
* @return 'show_units' property
*/
Expand Down