Skip to content

PVA Image: Decode image from PVXS 'group' demo #3224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasemir merged 1 commit into from
Jan 6, 2025
Merged

PVA Image: Decode image from PVXS 'group' demo #3224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions core/pv-pva/src/main/java/org/phoebus/pv/pva/ImageDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019-2022 Oak Ridge National Laboratory.
* Copyright (c) 2019-2025 Oak Ridge National Laboratory.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -19,13 +19,13 @@
import org.epics.pva.data.PVAInt;
import org.epics.pva.data.PVAIntArray;
import org.epics.pva.data.PVALongArray;
import org.epics.pva.data.PVANumber;
import org.epics.pva.data.PVAShortArray;
import org.epics.pva.data.PVAString;
import org.epics.pva.data.PVAStructure;
import org.epics.pva.data.PVAStructureArray;
import org.epics.pva.data.PVAUnion;
import org.epics.pva.data.PVAny;
import org.epics.pvdata.pv.PVInt;
import org.epics.util.array.ArrayByte;
import org.epics.util.array.ArrayDouble;
import org.epics.util.array.ArrayFloat;
Expand Down Expand Up @@ -104,14 +104,14 @@ public static VType decode(final PVAStructure struct) throws Exception
offsets = new int[n_dims];
reversed = new boolean[n_dims];
for (int i = 0; i < n_dims; ++i)
{
{ // 'size' is mandatory, 'offset' and 'reverse' are optional
final PVAStructure d = dim.get()[i];
PVAInt el = d.get("size");
dimensions[i] = el.get();
el = d.get("offset");
offsets[i] = el.get();
offsets[i] = el == null ? 0 : el.get();
final PVABool b = d.get("reverse");
reversed[i] = b.get();
reversed[i] = b == null ? false : b.get();
}
}

Expand All @@ -127,9 +127,9 @@ public static VType decode(final PVAStructure struct) throws Exception
{
final PVAny color_mode_field = attribute.get("value");
final PVAData cm = color_mode_field.get();
if (cm instanceof PVInt)
if (cm instanceof PVANumber n)
{
colorMode = ((PVInt) cm).get();
colorMode = n.getNumber().intValue();
break;
}
// else: log warning, or throw exception?
Expand Down Expand Up @@ -192,8 +192,16 @@ else if (colorMode <= 4 && colorMode >= 2 && dimensions.length != 3)
}

// Fetch pixel data
final PVAUnion value_field = struct.get("value");
PVAData value = value_field.get();
// NTNDArray is defined with 'union value',
// but PVXS 'group' demo generates 'any value'
final PVAData value_field = struct.get("value");
PVAData value;
if (value_field instanceof PVAUnion vf)
value = vf.get();
else if (value_field instanceof PVAny vf)
value = vf.get();
else
throw new Exception("NDArray expected with value of type 'union' or 'any', got '" + value_field.getType() + "'");

// Value might be compressed, which means that a PVAByteArray
// needs to be de-compressed and then converted into the
Expand Down
Loading