EPICS_base/pvaClient
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

add zeroArrayLength

Browse Source
This commit is contained in:
mrkraimer
2019-07-16 10:33:39 -04:00
parent 9153036ccc
commit ddb36536fe
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pv/pvaClient.h
View File

@ -687,6 +687,9 @@ public:
* @return The timeStamp.
*/
epics::pvData::TimeStamp getTimeStamp();
/** @brief set length of all array fields to 0
*/
void zeroArrayLength();
/** @brief Factory method for creating an instance of PvaClientData.
*
* NOTE: Not normally called by clients
@ -706,6 +709,7 @@ private:
void parse(
const std::string &arg,
const epics::pvData::PVUnionPtr &dest);
void zeroArrayLength(const epics::pvData::PVStructurePtr &pvStructure);
epics::pvData::StructureConstPtr structure;
epics::pvData::PVStructurePtr pvStructure;

41
src/pvaClientData.cpp
View File

@ -155,7 +155,6 @@ void PvaClientData::parse(const std::vector<std::string> &args)
{
if(!pvStructure) throw std::runtime_error(messagePrefix + noStructure);
if(!bitSet) throw std::runtime_error(messagePrefix + noStructure);
bitSet->clear();
size_t num = args.size();
for(size_t i=0; i<num; ++i)
{
@ -191,8 +190,6 @@ void PvaClientData::parse(const std::vector<std::string> &args)
bitSet->set(pvUnion->getFieldOffset());
return;
}
PVScalarArrayPtr pvScalarArray(pvStructure->getSubField<PVScalarArray>(field));
if(pvScalarArray) pvScalarArray->setLength(0);
parse(rest,pvField,bitSet);
}
}
@ -449,4 +446,42 @@ TimeStamp PvaClientData::getTimeStamp()
throw std::runtime_error(messagePrefix + noTimeStamp);
}
void PvaClientData::zeroArrayLength()
{
if(!pvStructure) throw new std::runtime_error(messagePrefix + noStructure);
zeroArrayLength(pvStructure);
}
void PvaClientData::zeroArrayLength(const epics::pvData::PVStructurePtr &pvStructure)
{
const PVFieldPtrArray pvFields(pvStructure->getPVFields());
for(size_t i=0; i<pvFields.size(); ++i) {
PVFieldPtr pvField = pvFields[i];
Type type(pvField->getField()->getType());
switch(type) {
case epics::pvData::scalarArray:
{
PVScalarArrayPtr pvScalarArray = static_pointer_cast<PVScalarArray>(pvField);
pvScalarArray->setLength(0);
}
break;
case epics::pvData::structureArray:
{
PVStructureArrayPtr pvStructureArray = static_pointer_cast<PVStructureArray>(pvField);
pvStructureArray->setLength(0);
}
break;
case epics::pvData::structure:
{
PVStructurePtr pvStructure = static_pointer_cast<PVStructure>(pvField);
zeroArrayLength(pvStructure);
}
break;
default:
break;
}
}
}
}}