CSSTUDIO-2939 Add the functionality to set the SVG rendering resolution factor in the Symbol Widget.

Author: abrahamwolk

app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/SymbolWidget.java

@@ -87,6 +87,9 @@ public Widget createWidget ( ) {
     /** Property */
     public static final WidgetPropertyDescriptor<String>                        propFallbackSymbol = newFilenamePropertyDescriptor (WidgetPropertyCategory.BEHAVIOR, "fallback_symbol", Messages.WidgetProperties_FallbackSymbol);
     public static final WidgetPropertyDescriptor<Boolean>                       propRunActionsOnMouseClick = newBooleanPropertyDescriptor (WidgetPropertyCategory.BEHAVIOR, "run_actions_on_mouse_click", Messages.WidgetProperties_RunActionsOnMouseClick);
+    /** 'svg_rendering_resolution_factor': */
+    public static final WidgetPropertyDescriptor<Double> propSVGRenderingResolutionFactor = newDoublePropertyDescriptor(WidgetPropertyCategory.DISPLAY, "svg_rendering_resolution_factor", Messages.WidgetProperties_SVGRenderingResolutionFactor);
+
 
     /** 'items' property: list of items (string properties) for combo box */
     public static final ArrayWidgetProperty.Descriptor<WidgetProperty<String> > propSymbols       = new ArrayWidgetProperty.Descriptor< >(
@@ -121,6 +124,7 @@ public Widget createWidget ( ) {
     private volatile WidgetProperty<String>                      fallbackSymbol;
     private volatile WidgetProperty<WidgetColor>                 disconnectOverlayColor;
     private volatile WidgetProperty<Boolean>                     run_actions_on_mouse_click;
+    private volatile WidgetProperty<Double>                      svgRenderingResolutionFactor;
 
     /** Returns 'symbol' property: element for list of 'symbols' property */
     private static WidgetPropertyDescriptor<String> propSymbol( int index ) {
@@ -225,6 +229,11 @@ public WidgetProperty<Boolean> propRunActionsOnMouseClick() {
         return run_actions_on_mouse_click;
     }
 
+    /** @return 'svgRenderingResolutionFactor' property */
+    public WidgetProperty<Double> propSVGRenderingResolutionFactor() {
+        return svgRenderingResolutionFactor;
+    }
+
     @Override
     protected void defineProperties ( final List<WidgetProperty<?>> properties ) {
 
@@ -243,6 +252,7 @@ protected void defineProperties ( final List<WidgetProperty<?>> properties ) {
         properties.add(enabled        = propEnabled.createProperty(this, true));
         properties.add(preserve_ratio = propPreserveRatio.createProperty(this, true));
         properties.add(fallbackSymbol = propFallbackSymbol.createProperty(this, DEFAULT_SYMBOL));
+        properties.add(svgRenderingResolutionFactor = propSVGRenderingResolutionFactor.createProperty(this, 1.0));
         WidgetColor alarmInvalidColor =
                 WidgetColorService.getColor(NamedWidgetColors.ALARM_INVALID);
         WidgetColor defaultDisconnectedOverlayColor =

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

@@ -100,6 +100,7 @@ public class SymbolRepresentation extends RegionBaseRepresentation<StackPane, Sy
     private final UntypedWidgetPropertyListener contentListener = this::contentChanged;
     private final UntypedWidgetPropertyListener geometryListener = this::geometryChanged;
     private final UntypedWidgetPropertyListener styleListener = this::styleChanged;
+    private final UntypedWidgetPropertyListener svgRenderingResolutionFactorChangedListener = this::svgRenderingResolutionFactorChanged;
     private final WidgetPropertyListener<VType> valueListener = this::valueChanged;
     private final WidgetPropertyListener<List<WidgetProperty<String>>> symbolsListener = this::symbolsChanged;
     private final WidgetPropertyListener<Integer> indexListener = this::initialIndexChanged;
@@ -610,6 +611,7 @@ protected void registerListeners()
         model_widget.propEnabled().addUntypedPropertyListener(styleListener);
         model_widget.propShowIndex().addUntypedPropertyListener(styleListener);
         model_widget.propTransparent().addUntypedPropertyListener(styleListener);
+        model_widget.propSVGRenderingResolutionFactor().addUntypedPropertyListener(svgRenderingResolutionFactorChangedListener);
 
         if (!toolkit.isEditMode())
             model_widget.runtimePropValue().addPropertyListener(valueListener);
@@ -639,6 +641,7 @@ protected void unregisterListeners()
         model_widget.propEnabled().removePropertyListener(styleListener);
         model_widget.propShowIndex().removePropertyListener(styleListener);
         model_widget.propTransparent().removePropertyListener(styleListener);
+        model_widget.propSVGRenderingResolutionFactor().removePropertyListener(svgRenderingResolutionFactorChangedListener);
 
         if (!toolkit.isEditMode())
             model_widget.runtimePropValue().removePropertyListener(valueListener);
@@ -788,6 +791,11 @@ void setSymbolSize ( double width, double height, boolean preserveRatio ) {
         }
     }
 
+    private void svgRenderingResolutionFactorChanged(final WidgetProperty<?> property, final Object oldValue, Object newValue) {
+        // Update the rendered SVG:
+        symbolChanged(null, null, null);
+    }
+
     private void styleChanged ( final WidgetProperty<?> property, final Object oldValue, final Object newValue ) {
         dirtyStyle.mark();
         toolkit.scheduleUpdate(this);
@@ -1027,7 +1035,20 @@ void resize(double width, double height, boolean preserveRatio){
          * @return An {@link Image} or <code>null</code>.
          */
         Image loadSVG(final String imageFileName, double width, double height){
-            return SVGHelper.loadSVG(imageFileName, width, height);
+            double svg_rendering_resolution_factor = model_widget.propSVGRenderingResolutionFactor().getValue();
+
+            double renderingWidth;
+            double renderingHeight;
+            if (!Double.isNaN(svg_rendering_resolution_factor) && svg_rendering_resolution_factor > 0) {
+                renderingWidth = svg_rendering_resolution_factor * width;
+                renderingHeight = svg_rendering_resolution_factor * height;
+            } else {
+                logger.log(Level.WARNING, "The SVG Rendering Factor is not set to a value greater than 0.0! Setting it to 1.0.");
+                renderingWidth = width;
+                renderingHeight = height;
+            }
+
+            return SVGHelper.loadSVG(imageFileName, renderingWidth, renderingHeight);
         }
     }
 }