Skip to content

Commit eda7464

Browse files
committed
CSSTUDIO-3346 Add "Show Warnings"-property to the class LinearMeterWidget.
1 parent 3ad242e commit eda7464

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ else if (xml_version.getMajor() < 3)
103103
public static WidgetPropertyDescriptor<Boolean> propShowLimits =
104104
newBooleanPropertyDescriptor(WidgetPropertyCategory.DISPLAY, "show_limits", Messages.WidgetProperties_ShowLimits);
105105

106+
public static WidgetPropertyDescriptor<Boolean> propShowWarnings =
107+
newBooleanPropertyDescriptor(WidgetPropertyCategory.DISPLAY, "show_warnings", Messages.WidgetProperties_ShowWarnings);
108+
106109
public static WidgetPropertyDescriptor<Boolean> propDisplayHorizontal =
107110
newBooleanPropertyDescriptor(WidgetPropertyCategory.DISPLAY, "displayHorizontal", Messages.WidgetProperties_Horizontal);
108111

@@ -162,6 +165,7 @@ else if (xml_version.getMajor() < 3)
162165
private WidgetProperty<FormatOption> format;
163166
private WidgetProperty<Boolean> show_units;
164167
private WidgetProperty<Boolean> show_limits;
168+
private WidgetProperty<Boolean> show_warnings;
165169
private WidgetProperty<WidgetColor> needle_color;
166170
private WidgetProperty<Boolean> scale_visible;
167171
private WidgetProperty<WidgetColor> knob_color;
@@ -206,6 +210,7 @@ protected void defineProperties(List<WidgetProperty<?>> properties)
206210
properties.add(show_units = propShowUnits.createProperty(this, true));
207211
properties.add(scale_visible = propScaleVisible.createProperty(this, true));
208212
properties.add(show_limits = propShowLimits.createProperty(this, true));
213+
properties.add(show_warnings = propShowWarnings.createProperty(this, true));
209214
properties.add(limits_from_pv = propLimitsFromPV.createProperty(this, true));
210215
properties.add(minimum = propMinimum.createProperty(this, 0.0));
211216
properties.add(maximum = propMaximum.createProperty(this, 100.0));
@@ -281,6 +286,12 @@ public WidgetProperty<Boolean> propShowLimits()
281286
return show_limits;
282287
}
283288

289+
/** @return 'show_warnings' property */
290+
public WidgetProperty<Boolean> propShowWarnings()
291+
{
292+
return show_warnings;
293+
}
294+
284295
/** @return 'needle_color' property */
285296
public WidgetProperty<WidgetColor> propNeedleColor()
286297
{

app/display/model/src/main/java/org/csstudio/display/builder/model/Messages.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ public class Messages
296296
WidgetProperties_ShowScale,
297297
WidgetProperties_ShowUnits,
298298
WidgetProperties_ShowValue,
299+
WidgetProperties_ShowWarnings,
299300
WidgetProperties_Skin,
300301
WidgetProperties_Square,
301302
WidgetProperties_StartFromZero,

app/display/model/src/main/resources/org/csstudio/display/builder/model/messages.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ WidgetProperties_ShowOK=Show OK
281281
WidgetProperties_ShowScale=Show Scale
282282
WidgetProperties_ShowUnits=Show Units
283283
WidgetProperties_ShowValue=Show Value
284+
WidgetProperties_ShowWarnings=Show Warnings
284285
WidgetProperties_Skin=Skin
285286
WidgetProperties_Square=Square
286287
WidgetProperties_StartFromZero=Start From Zero

0 commit comments

Comments
 (0)