Skip to content

Commit ae04b41

Browse files
committed
CSSTUDIO-3346 Add field 'showWarnings' to the class 'RTLinearMeter' and add it as an argument to the constructor.
1 parent eda7464 commit ae04b41

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

app/display/linearmeter/src/main/java/org/csstudio/display/extra/widgets/linearmeter/LinearMeterRepresentation.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public Pane createJFXNode()
8484
model_widget.propNeedleWidth().getValue(),
8585
widgetColorToAWTColor(model_widget.propNeedleColor().getValue()),
8686
model_widget.propKnobSize().getValue(),
87-
widgetColorToAWTColor(model_widget.propKnobColor().getValue()));
87+
widgetColorToAWTColor(model_widget.propKnobColor().getValue()),
88+
model_widget.propShowWarnings().getValue());
8889
meter.setSize(model_widget.propWidth().getValue(),model_widget.propHeight().getValue());
8990
meter.setHorizontal(model_widget.propDisplayHorizontal().getValue());
9091
meter.setManaged(false);

app/display/linearmeter/src/main/java/org/csstudio/display/extra/widgets/linearmeter/RTLinearMeter.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import java.awt.image.DataBufferInt;
2222
import java.io.IOException;
2323
import java.util.Arrays;
24-
import java.util.concurrent.ExecutionException;
25-
import java.util.concurrent.FutureTask;
2624
import java.util.logging.Level;
2725

2826
import javafx.application.Platform;
@@ -76,7 +74,8 @@ public RTLinearMeter(double initialValue,
7674
int needleWidth,
7775
Color needleColor,
7876
int knobSize,
79-
Color knobColor)
77+
Color knobColor,
78+
boolean showWarnings)
8079
{
8180
if (warningTriangle == null) {
8281
try {
@@ -109,6 +108,7 @@ public RTLinearMeter(double initialValue,
109108
this.hiHi = hiHi;
110109
this.showUnits = showUnits;
111110
this.showLimits = showLimits;
111+
this.showWarnings = showWarnings;
112112

113113
layout();
114114

@@ -576,7 +576,7 @@ public void setFont(javafx.scene.text.Font font)
576576
});
577577
}
578578

579-
579+
private boolean showWarnings = true;
580580
private boolean lag = false;
581581
private Boolean isValueWaitingToBeDrawn = false;
582582
private double valueWaitingToBeDrawn;
@@ -633,7 +633,10 @@ else if (!Double.isNaN(oldValue)) {
633633
}
634634

635635
private WARNING determineWarning() {
636-
if (lag) {
636+
if (!showWarnings) {
637+
return WARNING.NONE;
638+
}
639+
else if (lag) {
637640
return WARNING.LAG;
638641
}
639642
else if (showUnits && units.equals("")) {

0 commit comments

Comments
 (0)