Reordered fields in NTNDArray

This commit is contained in:
dhickin
2014-09-23 10:50:20 +01:00
parent 0d21cb267a
commit 6a187d274e
2 changed files with 13 additions and 12 deletions

View File

@@ -99,9 +99,9 @@ StructureConstPtr NTNDArrayBuilder::createStructure()
fb->setId(NTNDArray::URI)->
add("value", valueType)->
add("codec", codecStruc)->
add("compressedSize", pvLong)->
add("uncompressedSize", pvLong)->
add("codec", codecStruc)->
addArray("dimension", dimensionStruc)->
add("uniqueId", pvInt)->
add("dataTimeStamp", standardField->timeStamp())->
@@ -284,6 +284,11 @@ PVUnionPtr NTNDArray::getValue() const
return pvNTNDArray->getSubField<PVUnion>("value");
}
PVStructurePtr NTNDArray::getCodec() const
{
return pvNTNDArray->getSubField<PVStructure>("codec");
}
PVLongPtr NTNDArray::getCompressedDataSize() const
{
return pvNTNDArray->getSubField<PVLong>("compressedSize");
@@ -294,11 +299,6 @@ PVLongPtr NTNDArray::getUncompressedDataSize() const
return pvNTNDArray->getSubField<PVLong>("uncompressedSize");
}
PVStructurePtr NTNDArray::getCodec() const
{
return pvNTNDArray->getSubField<PVStructure>("codec");
}
PVStructureArrayPtr NTNDArray::getAttribute() const
{
return pvNTNDArray->getSubField<PVStructureArray>("attribute");

View File

@@ -137,6 +137,7 @@ public:
* @return (false,true) if (is not, is) an NTNDArray.
*/
static bool is_a(epics::pvData::StructureConstPtr const & structure);
/**
* Is the pvStructure compatible with NTNDArray..
* This method introspects the fields to see if they are compatible.
@@ -192,6 +193,12 @@ public:
*/
epics::pvData::PVUnionPtr getValue() const;
/**
* Get the codec field.
* @return the PVStructurePtr.
*/
epics::pvData::PVStructurePtr getCodec() const;
/**
* Get the compressedDataSize field.
* @return PVStructurePtr.
@@ -204,12 +211,6 @@ public:
*/
epics::pvData::PVLongPtr getUncompressedDataSize() const;
/**
* Get the codec field.
* @return the PVStructurePtr.
*/
epics::pvData::PVStructurePtr getCodec() const;
/**
* Get the attribute field.
* @return the PVStructurePtr.