Merge pull request #2327 from ControlSystemStudio/tank-widget

Log-scale property for tank widget

Author: shroffk

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015-2019 Oak Ridge National Laboratory.
+ * Copyright (c) 2015-2022 Oak Ridge National Laboratory.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
 import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propLimitsFromPV;
 import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMaximum;
 import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMinimum;
+import static org.csstudio.display.builder.model.widgets.plots.PlotWidgetProperties.propLogscale;
 
 import java.util.Arrays;
 import java.util.List;
@@ -128,6 +129,7 @@ public WidgetConfigurator getConfigurator(final Version persisted_version)
     private volatile WidgetProperty<Boolean> limits_from_pv;
     private volatile WidgetProperty<Double> minimum;
     private volatile WidgetProperty<Double> maximum;
+    private volatile WidgetProperty<Boolean> log_scale;
 
     /** Constructor */
     public TankWidget()
@@ -148,6 +150,7 @@ protected void defineProperties(final List<WidgetProperty<?>> properties)
         properties.add(limits_from_pv = propLimitsFromPV.createProperty(this, true));
         properties.add(minimum = propMinimum.createProperty(this, 0.0));
         properties.add(maximum = propMaximum.createProperty(this, 100.0));
+        properties.add(log_scale = propLogscale.createProperty(this, false));
     }
 
     @Override
@@ -212,4 +215,10 @@ public WidgetProperty<Double> propMaximum()
     {
         return maximum;
     }
+
+    /** @return 'log_scale' property */
+    public WidgetProperty<Boolean> propLogScale()
+    {
+        return log_scale;
+    }
 }

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

@@ -57,6 +57,7 @@ protected void registerListeners()
         model_widget.propLimitsFromPV().addUntypedPropertyListener(valueListener);
         model_widget.propMinimum().addUntypedPropertyListener(valueListener);
         model_widget.propMaximum().addUntypedPropertyListener(valueListener);
+	model_widget.propLogScale().addUntypedPropertyListener(valueListener);
         model_widget.runtimePropValue().addUntypedPropertyListener(valueListener);
         valueChanged(null, null, null);
     }
@@ -76,6 +77,7 @@ protected void unregisterListeners()
         model_widget.propLimitsFromPV().removePropertyListener(valueListener);
         model_widget.propMinimum().removePropertyListener(valueListener);
         model_widget.propMaximum().removePropertyListener(valueListener);
+	model_widget.propLogScale().removePropertyListener(valueListener);
         model_widget.runtimePropValue().removePropertyListener(valueListener);
         super.unregisterListeners();
     }
@@ -111,6 +113,8 @@ private void valueChanged(final WidgetProperty<?> property, final Object old_val
         else
             value = VTypeUtil.getValueNumber(vtype).doubleValue();
         tank.setValue(value);
+
+        tank.setLogScale(model_widget.propLogScale().getValue());
     }
 
     @Override

app/rtplot/src/main/java/org/csstudio/javafx/rtplot/RTTank.java

@@ -185,6 +185,13 @@ public void setScaleVisible (boolean visible)
         }
     }
 
+    /** @param logscale Use log scale for y-axis? */
+    public void setLogScale(final boolean logscale)
+    {
+        scale.setLogarithmic(logscale);
+        requestUpdate();
+    }
+
     /** Set value range
      *  @param low
      *  @param high