Skip to content

Commit f8908dd

Browse files
authored
Merge pull request #2603 from ControlSystemStudio/trace-width
Legacy XYGraph trace width
2 parents ab1f33b + 5006f6b commit f8908dd

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,9 @@ private boolean handleLegacyTraces(final ModelReader model_reader, final Stripch
462462
XMLUtil.getChildString(xml, "trace_" + legacy_trace + "_visible")
463463
.ifPresent(show -> trace.traceVisible().setValue(Boolean.parseBoolean(show)) );
464464

465+
XMLUtil.getChildInteger(xml, "trace_" + legacy_trace + "_line_width")
466+
.ifPresent(width -> trace.traceWidth().setValue(width));
467+
465468
// Name
466469
String name = XMLUtil.getChildString(xml, "trace_" + legacy_trace + "_name").orElse("");
467470
name = name.replace("$(trace_" + legacy_trace + "_y_pv)", "$(traces[" + legacy_trace + "].y_pv)");

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,9 @@ private boolean handleLegacyTraces(final ModelReader model_reader,
324324
XMLUtil.getChildInteger(xml, "trace_" + legacy_trace + "_point_style")
325325
.ifPresent(style -> trace.tracePointType().setValue(StripchartWidget.mapPointType(style)));
326326

327+
XMLUtil.getChildInteger(xml, "trace_" + legacy_trace + "_line_width")
328+
.ifPresent(width -> trace.traceWidth().setValue(width));
329+
327330
// Name
328331
String name = XMLUtil.getChildString(xml, "trace_" + legacy_trace + "_name").orElse("");
329332
name = name.replace("$(trace_" + legacy_trace + "_y_pv)", "$(traces[" + legacy_trace + "].y_pv)");

0 commit comments

Comments
 (0)