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

PVUnion/PVUnionArray support and tests

Browse Source
This commit is contained in:
Matej Sekoranja
2013-11-07 14:12:26 +01:00
parent cbf7b69ef0
commit d40c41048d
15 changed files with 1416 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pvDataApp/factory/PVStructure.cpp
View File

@@ -38,6 +38,8 @@ PVDoublePtr PVStructure::nullPVDouble;
PVStringPtr PVStructure::nullPVString;
PVStructurePtr PVStructure::nullPVStructure;
PVStructureArrayPtr PVStructure::nullPVStructureArray;
PVUnionPtr PVStructure::nullPVUnion;
PVUnionArrayPtr PVStructure::nullPVUnionArray;
PVScalarArrayPtr PVStructure::nullPVScalarArray;
static PVFieldPtr findSubField(
@@ -520,6 +522,24 @@ PVStructurePtr PVStructure::getStructureField(String const &fieldName)
return nullPVStructure;
}
PVUnionPtr PVStructure::getUnionField(String const &fieldName)
{
PVFieldPtr pvField = findSubField(fieldName,this);
if(pvField.get()==NULL) {
String message("fieldName ");
message += fieldName + " does not exist";
this->message(message, errorMessage);
return nullPVUnion;
}
if(pvField->getField()->getType()==union_) {
return std::tr1::static_pointer_cast<PVUnion>(pvField);
}
String message("fieldName ");
message += fieldName + " does not have type union ";
this->message(message, errorMessage);
return nullPVUnion;
}
PVScalarArrayPtr PVStructure::getScalarArrayField(
String const &fieldName,ScalarType elementType)
{
@@ -569,6 +589,25 @@ PVStructureArrayPtr PVStructure::getStructureArrayField(
return nullPVStructureArray;
}
PVUnionArrayPtr PVStructure::getUnionArrayField(
String const &fieldName)
{
PVFieldPtr pvField = findSubField(fieldName,this);
if(pvField.get()==NULL) {
String message("fieldName ");
message += fieldName + " does not exist";
this->message(message, errorMessage);
return nullPVUnionArray;
}
if(pvField->getField()->getType()==unionArray) {
return std::tr1::static_pointer_cast<PVUnionArray>(pvField);
}
String message("fieldName ");
message += fieldName + " does not have type unionArray ";
this->message(message, errorMessage);
return nullPVUnionArray;
}
String PVStructure::getExtendsStructureName() const
{
return extendsStructureName;