Merge pull request #2354 from ControlSystemStudio/CSSTUDIO-1265

Add value of DESC (if non-null and non-empty) to pv_value in widget tooltip

Author: kasemir

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

@@ -22,6 +22,7 @@
 import org.csstudio.display.builder.representation.javafx.JFXPreferences;
 import org.epics.vtype.Alarm;
 import org.epics.vtype.AlarmSeverity;
+import org.epics.vtype.Display;
 import org.epics.vtype.Time;
 import org.phoebus.framework.macros.MacroHandler;
 import org.phoebus.framework.macros.MacroValueProvider;
@@ -108,6 +109,11 @@ public static void attach(final Node node, final WidgetProperty<String> tooltip_
                 if (time != null)
                     buf.append(", ").append(TimestampFormats.FULL_FORMAT.format(time.getTimestamp()));
 
+                String display = Display.displayOf(vtype).getDescription();
+                // Description is non-null only for pva.
+                if(display != null && !display.isEmpty()){
+                    buf.append(System.lineSeparator()).append(display);
+                }
                 spec = spec.replace("$(pv_value)", buf.toString());
             }
             final Widget widget = tooltip_property.getWidget();

core/pv/src/main/java/org/phoebus/pv/pva/Decoders.java

@@ -234,6 +234,7 @@ private static Display decodeDisplay(final PVAStructure struct)
         String units;
         NumberFormat format;
         Range display, control, alarm, warn;
+        String description = "";
 
         // Decode display_t display
         PVAStructure section = struct.get("display");
@@ -282,6 +283,11 @@ private static Display decodeDisplay(final PVAStructure struct)
                     : createNumberFormat(str.get());
             }
 
+            PVAString pvaStringDescription = section.get("description");
+            if(pvaStringDescription != null){
+                description = pvaStringDescription.get();
+            }
+
             display = Range.of(getDoubleValue(section, "limitLow", Double.NaN),
                                getDoubleValue(section, "limitHigh", Double.NaN));
         }
@@ -312,7 +318,7 @@ private static Display decodeDisplay(final PVAStructure struct)
         else
             alarm = warn = Range.undefined();
 
-        return Display.of(display, alarm, warn, control, units, format);
+        return Display.of(display, alarm, warn, control, units, format, description);
     }
 
     /** @param struct Structure