Skip to content

Commit 0a5e8cd

Browse files
authored
Merge pull request #2604 from ControlSystemStudio/plot_invisible_2601
Stripchart: Create all traces, even those initially 'invisible'
2 parents b508e0c + 898aa44 commit 0a5e8cd

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2019-2022 Oak Ridge National Laboratory.
2+
* Copyright (c) 2019-2023 Oak Ridge National Laboratory.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -19,7 +19,6 @@
1919
import org.csstudio.display.builder.model.WidgetProperty;
2020
import org.csstudio.display.builder.model.WidgetPropertyListener;
2121
import org.csstudio.display.builder.model.widgets.plots.StripchartWidget;
22-
import org.csstudio.display.builder.model.widgets.plots.StripchartWidget.AxisWidgetProperty;
2322
import org.csstudio.display.builder.model.widgets.plots.StripchartWidget.TraceWidgetProperty;
2423
import org.csstudio.display.builder.representation.javafx.JFXUtil;
2524
import org.csstudio.display.builder.representation.javafx.widgets.RegionBaseRepresentation;
@@ -201,7 +200,6 @@ private void ignoreAxisChanges(final StripchartWidget.YAxisWidgetProperty axis)
201200
axis.grid().removePropertyListener(modelChangedListener);
202201
axis.visible().removePropertyListener(modelChangedListener);
203202
axis.color().removePropertyListener(modelChangedListener);
204-
205203
}
206204

207205

@@ -350,9 +348,6 @@ private void updateModel()
350348

351349
for (TraceWidgetProperty trace : model_widget.propTraces().getValue())
352350
{
353-
if (! trace.traceVisible().getValue())
354-
continue;
355-
356351
final PVItem item = new PVItem(trace.traceYPV().getValue(), 0.0);
357352
item.setDisplayName(trace.traceName().getValue());
358353
item.setAxis(model.getAxis(trace.traceYAxis().getValue()));
@@ -361,6 +356,7 @@ private void updateModel()
361356
item.setLineWidth(trace.traceWidth().getValue());
362357
item.setPointType(XYPlotRepresentation.map(trace.tracePointType().getValue()));
363358
item.setPointSize(trace.tracePointSize().getValue());
359+
item.setVisible(trace.traceVisible().getValue());
364360
item.useDefaultArchiveDataSources();
365361
try
366362
{

0 commit comments

Comments
 (0)