Skip to content

Add log scaling property to Meter widget #3764

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
rjwills28 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add log scaling property to Meter widget #3764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/MeterWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMinimum;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propPrecision;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propShowUnits;
import static org.csstudio.display.builder.model.widgets.plots.PlotWidgetProperties.propLogscale;

import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -158,6 +159,7 @@
private volatile WidgetProperty<Boolean> limits_from_pv;
private volatile WidgetProperty<Double> minimum;
private volatile WidgetProperty<Double> maximum;
private volatile WidgetProperty<Boolean> log_scale;

Check warning on line 162 in app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/MeterWidget.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this field "log_scale" to match the regular expression '^[a-z][a-zA-Z0-9]*$'. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AZ1SgIZXv4af9OZ52JZE&open=AZ1SgIZXv4af9OZ52JZE&pullRequest=3764

/** Constructor */
public MeterWidget()
Expand Down Expand Up @@ -195,6 +197,7 @@
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));

Check warning on line 200 in app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/MeterWidget.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract the assignment out of this expression. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AZ1SgIZXv4af9OZ52JZD&open=AZ1SgIZXv4af9OZ52JZD&pullRequest=3764
}

/** @return 'foreground_color' property */
Expand Down Expand Up @@ -274,4 +277,10 @@
{
return maximum;
}

/** @return 'log_scale' property */
public WidgetProperty<Boolean> propLogScale()
{
return log_scale;
}
}
4 changes: 4 additions & 0 deletions .../java/org/csstudio/display/builder/representation/javafx/widgets/MeterRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ protected void registerListeners()
model_widget.propMaximum().addUntypedPropertyListener(valueListener);
model_widget.propShowValue().addUntypedPropertyListener(valueListener);
model_widget.runtimePropValue().addUntypedPropertyListener(valueListener);
model_widget.propLogScale().addUntypedPropertyListener(valueListener);
valueChanged(null, null, null);
}

Expand All @@ -82,6 +83,7 @@ protected void unregisterListeners()
model_widget.propMaximum().removePropertyListener(valueListener);
model_widget.propShowValue().removePropertyListener(valueListener);
model_widget.runtimePropValue().removePropertyListener(valueListener);
model_widget.propLogScale().removePropertyListener(valueListener);
super.unregisterListeners();
}

Expand Down Expand Up @@ -142,6 +144,8 @@ private void valueChanged(final WidgetProperty<?> property, final Object old_val
}
else
meter.setValue(value, "");

meter.setLogScale(model_widget.propLogScale().getValue());
}

@Override
Expand Down
7 changes: 7 additions & 0 deletions app/rtplot/src/main/java/org/csstudio/javafx/rtplot/RTMeter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ public class RTMeter extends ImageView
/** Area of this meter */
protected volatile Rectangle area = new Rectangle(0, 0, 0, 0);

/** @param logscale Use log scale for y-axis? */
public void setLogScale(final boolean logscale)
{
scale.setLogarithmic(logscale);
requestUpdate();
}

/** Listener to {@link PlotPart}s (scale), triggering refresh of meter */
protected final PlotPartListener plot_part_listener = new PlotPartListener()
{
Expand Down
10 changes: 9 additions & 1 deletion app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/MeterScale.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,15 @@ public double getAngle(final double value)
if (Double.isFinite(value))
{
final AxisRange<Double> range = getValueRange();
return start_angle + (value - range.getLow()) * angle_range / (range.getHigh() - range.getLow());
if (isLogarithmic())
{
return start_angle + Math.log10(value/range.getLow()) * angle_range / Math.log10(range.getHigh()/range.getLow());
}
else
{
return start_angle + (value - range.getLow()) * angle_range / (range.getHigh() - range.getLow());
}

}
else
return Double.NaN;
Expand Down
Loading