Skip to content

Commit a51bf85

Browse files
committed
Data browser export: When stat/sevr is included, do that for all types
For reasons no longer known, the status/severity info was suppressed for string types and for NaN values, but actual archived data may contain those types with perfectly valid stat/sevr
1 parent bf699f3 commit a51bf85

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/ValueWithInfoFormatter.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2010-2018 Oak Ridge National Laboratory.
2+
* Copyright (c) 2010-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
@@ -8,8 +8,6 @@
88
package org.csstudio.trends.databrowser3.export;
99

1010
import org.csstudio.trends.databrowser3.Messages;
11-
import org.epics.vtype.VString;
12-
import org.epics.vtype.VStringArray;
1311
import org.epics.vtype.VType;
1412
import org.phoebus.archive.vtype.Style;
1513
import org.phoebus.archive.vtype.VTypeHelper;
@@ -40,12 +38,6 @@ public String getHeader()
4038
@Override
4139
public String format(final VType value)
4240
{
43-
if (value instanceof VString
44-
|| value instanceof VStringArray
45-
|| Double.isNaN(VTypeHelper.toDouble(value)))
46-
return super.format(value) +
47-
Messages.Export_Delimiter + Messages.Export_NoValueMarker +
48-
Messages.Export_Delimiter + Messages.Export_NoValueMarker;
4941
return super.format(value) + Messages.Export_Delimiter +
5042
org.phoebus.core.vtypes.VTypeHelper.getSeverity(value) + Messages.Export_Delimiter +
5143
VTypeHelper.getMessage(value);

0 commit comments

Comments
 (0)