feature: set grid color for x/y plot widget

Author: cjenkscybercom

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

@@ -20,6 +20,7 @@
 import org.csstudio.display.builder.model.WidgetPropertyDescriptor;
 import org.csstudio.display.builder.model.persist.NamedWidgetColors;
 import org.csstudio.display.builder.model.persist.NamedWidgetFonts;
+import org.csstudio.display.builder.model.persist.WidgetColorService;
 import org.csstudio.display.builder.model.persist.WidgetFontService;
 import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
 import org.csstudio.display.builder.model.properties.EnumWidgetProperty;
@@ -144,6 +145,7 @@ protected AxisWidgetProperty(final StructuredWidgetProperty.Descriptor axis_desc
         public WidgetProperty<WidgetFont> scaleFont()   { return getElement(7); }
         /** @return Is axis visible? */
         public WidgetProperty<Boolean> visible()        { return getElement(8); }
+
     };
 
     /** 'on_right' property: Should axis be on the right? */
@@ -170,7 +172,10 @@ public static YAxisWidgetProperty create(final StructuredWidgetProperty.Descript
                                 propTitleFont.createProperty(widget, WidgetFontService.get(NamedWidgetFonts.DEFAULT_BOLD)),
                                 propScaleFont.createProperty(widget, WidgetFontService.get(NamedWidgetFonts.DEFAULT)),
                                 propOnRight.createProperty(widget, false),
-                                CommonWidgetProperties.propVisible.createProperty(widget, true)));
+                                CommonWidgetProperties.propVisible.createProperty(widget, true),
+                                propGridColor.createProperty(widget, WidgetColorService.getColor(NamedWidgetColors.GRID))
+                  )
+            );
         }
 
         protected YAxisWidgetProperty(final StructuredWidgetProperty.Descriptor axis_descriptor,
@@ -185,6 +190,9 @@ protected YAxisWidgetProperty(final StructuredWidgetProperty.Descriptor axis_des
         // Element shifted from 8 in basic axis to 9 in Y axis
         @Override
         public WidgetProperty<Boolean> visible()        { return getElement(9); }
+
+        /** @return Grid color */
+        public WidgetProperty<WidgetColor> gridColor()  { return getElement(10); }
     };
 
 

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

@@ -43,6 +43,8 @@
 import org.csstudio.javafx.rtplot.TraceType;
 import org.csstudio.javafx.rtplot.YAxis;
 import org.csstudio.javafx.rtplot.internal.NumericAxis;
+import org.csstudio.javafx.rtplot.internal.YAxisImpl;
+import org.csstudio.javafx.rtplot.internal.util.GraphicsUtils;
 import org.epics.util.array.ArrayDouble;
 import org.epics.util.array.ListNumber;
 import org.epics.vtype.Display;
@@ -544,8 +546,10 @@ private void trackAxisChanges(final AxisWidgetProperty axis)
         axis.titleFont().addUntypedPropertyListener(config_listener);
         axis.scaleFont().addUntypedPropertyListener(config_listener);
         axis.visible().addUntypedPropertyListener(config_listener);
-        if (axis instanceof YAxisWidgetProperty)
+        if (axis instanceof YAxisWidgetProperty) {
             ((YAxisWidgetProperty) axis).onRight().addUntypedPropertyListener(config_listener);
+            ((YAxisWidgetProperty) axis).gridColor().addUntypedPropertyListener(config_listener);
+        }
     }
 
     /** Ignore changed axis properties
@@ -562,8 +566,10 @@ private void ignoreAxisChanges(final AxisWidgetProperty axis)
         axis.titleFont().removePropertyListener(config_listener);
         axis.scaleFont().removePropertyListener(config_listener);
         axis.visible().removePropertyListener(config_listener);
-        if (axis instanceof YAxisWidgetProperty)
+        if (axis instanceof YAxisWidgetProperty) {
             ((YAxisWidgetProperty) axis).onRight().removePropertyListener(config_listener);
+            ((YAxisWidgetProperty) axis).gridColor().removePropertyListener(config_listener);
+        }
     }
 
     private void yAxesChanged(final WidgetProperty<List<YAxisWidgetProperty>> property,
@@ -632,7 +638,7 @@ private void updateConfig()
         final Color foreground = JFXUtil.convert(model_widget.propForeground().getValue());
         plot.setForeground(foreground);
         plot.setBackground(JFXUtil.convert(model_widget.propBackground().getValue()));
-        plot.setGridColor(JFXUtil.convert(model_widget.propGridColor().getValue()));
+//        plot.setGridColor(JFXUtil.convert(model_widget.propGridColor().getValue()));
         plot.setTitleFont(JFXUtil.convert(model_widget.propTitleFont().getValue()));
         plot.setTitle(model_widget.propTitle().getValue());
 
@@ -675,6 +681,18 @@ private void updateAxisConfig(final Axis<Double> plot_axis, final AxisWidgetProp
         plot_axis.setLabelFont(JFXUtil.convert(model_axis.titleFont().getValue()));
         plot_axis.setScaleFont(JFXUtil.convert(model_axis.scaleFont().getValue()));
         plot_axis.setVisible(model_axis.visible().getValue());
+        if(plot_axis instanceof YAxisImpl) {
+            ((YAxisImpl)plot_axis).setGridColor(
+                    GraphicsUtils.convert(
+                            JFXUtil.convert(
+                                    ((YAxisWidgetProperty) model_axis).gridColor().getValue()
+                            )
+                    )
+            );
+            plot_axis.setColor(JFXUtil.convert(
+                    ((YAxisWidgetProperty) model_axis).gridColor().getValue()
+            ));
+        }
     }
 
     private void updateRanges()