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

union/unionArray support for terse mode

Browse Source
This commit is contained in:
Matej Sekoranja
2014-10-10 10:44:55 +02:00
parent 283d7a36ec
commit 0e1769d8ce
2 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
pvtoolsSrc/pvutils.cpp
View File

@ -86,6 +86,12 @@ std::ostream& terse(std::ostream& o, PVField::shared_pointer const & pv)
case structureArray:
return terseStructureArray(o, static_pointer_cast<PVStructureArray>(pv));
break;
case union_:
return terseUnion(o, static_pointer_cast<PVUnion>(pv));
break;
case unionArray:
return terseUnionArray(o, static_pointer_cast<PVUnionArray>(pv));
break;
default:
std::ostringstream msg("unknown Field type: ");
msg << type;
@ -95,6 +101,12 @@ std::ostream& terse(std::ostream& o, PVField::shared_pointer const & pv)
std::ostream& terseStructure(std::ostream& o, PVStructure::shared_pointer const & pvStructure)
{
if (!pvStructure)
{
o << "(null)";
return o;
}
PVFieldPtrArray fieldsData = pvStructure->getPVFields();
size_t length = pvStructure->getStructure()->getNumberFields();
bool first = true;
@ -109,6 +121,17 @@ std::ostream& terseStructure(std::ostream& o, PVStructure::shared_pointer const
return o;
}
std::ostream& terseUnion(std::ostream& o, PVUnion::shared_pointer const & pvUnion)
{
if (!pvUnion || !pvUnion->get())
{
o << "(null)";
return o;
}
return terse(o, pvUnion->get());
}
std::ostream& terseScalarArray(std::ostream& o, PVScalarArray::shared_pointer const & pvArray)
{
size_t length = pvArray->getLength();
@ -166,6 +189,31 @@ std::ostream& terseStructureArray(std::ostream& o, PVStructureArray::shared_poin
return o;
}
std::ostream& terseUnionArray(std::ostream& o, PVUnionArray::shared_pointer const & pvArray)
{
size_t length = pvArray->getLength();
if (arrayCountFlag)
{
if (length<=0)
{
o << '0';
return o;
}
o << length << separator;
}
PVUnionArray::const_svector data = pvArray->view();
bool first = true;
for (size_t i = 0; i < length; i++) {
if (first)
first = false;
else
o << separator;
terseUnion(o, data[i]);
}
return o;
}