epics/normativeTypes
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

updates to NTNDArray

Browse Source
This commit is contained in:
dhickin
2014-08-22 19:32:30 +01:00
parent 1fdcfb7ad1
commit 53c89e5a73
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/nt/ntndarray.cpp
View File

@@ -62,6 +62,7 @@ StructureConstPtr NTNDArray::createStructure(bool hasDescriptor,
const size_t NUMBER_OF_STRUCTURES = 1 << NUMBER_OF_INDICES;
static epics::pvData::StructureConstPtr ntndarrayStruc[NUMBER_OF_STRUCTURES];
static epics::pvData::UnionConstPtr valueType;
static epics::pvData::StructureConstPtr codecStruc;
static epics::pvData::StructureConstPtr dimensionStruc;
static epics::pvData::StructureConstPtr attributeStruc;
@@ -80,13 +81,21 @@ StructureConstPtr NTNDArray::createStructure(bool hasDescriptor,
StandardFieldPtr standardField = getStandardField();
FieldBuilderPtr fb = fieldCreate->createFieldBuilder();
UnionConstPtr codecParameters = fb->createUnion();
if (valueType == NULL)
{
for (int i = pvBoolean; i < pvString; ++i)
{
ScalarType st = static_cast<ScalarType>(i);
fb->addArray(std::string(ScalarTypeFunc::name(st)) + "Value", st);
}
valueType = fb->createUnion();
}
if (codecStruc == NULL)
{
codecStruc = fb->setId("codec_t")->
add("name", pvString)->
add("parameters", codecParameters)->
add("parameters", fieldCreate->createVariantUnion())->
createStructure();
}
@@ -113,7 +122,7 @@ StructureConstPtr NTNDArray::createStructure(bool hasDescriptor,
}
fb->setId(URI)->
add("value", makeValueType())->
add("value", valueType)->
add("compressedSize", pvLong)->
add("uncompressedSize", pvLong)->
add("codec", codecStruc)->
@@ -133,26 +142,6 @@ StructureConstPtr NTNDArray::createStructure(bool hasDescriptor,
return ntndarrayStruc[index];
}
UnionConstPtr NTNDArray::makeValueType()
{
static epics::pvData::UnionConstPtr valueType;
if (valueType == NULL)
{
FieldBuilderPtr fb = getFieldCreate()->createFieldBuilder();
for (int i = pvBoolean; i < pvString; ++i)
{
ScalarType st = static_cast<ScalarType>(i);
fb->addArray(std::string(ScalarTypeFunc::name(st)) + "Value", st);
}
valueType = fb->createUnion();
}
return valueType;
}
bool NTNDArray::attachTimeStamp(PVTimeStamp &pvTimeStamp) const
{
PVStructurePtr ts = getTimeStamp();

1
src/nt/ntndarray.h
View File

@@ -157,7 +157,6 @@ public:
private:
NTNDArray(epics::pvData::PVStructurePtr const & pvStructure);
static epics::pvData::UnionConstPtr makeValueType();
epics::pvData::PVStructurePtr pvNTNDArray;
};