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

Added a new method to PVDataCreate that allows a PVStructure to be created from a PVField array where the elements have a null parent.

Browse Source 
PVField::message was changed to pass the message to the top level field adding the field name at each level.
This commit is contained in:
Marty Kraimer
2011-04-15 14:21:55 -04:00
parent efdef77461
commit 3a00b879ee
24 changed files with 375 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvDataApp/factory/PVStructure.cpp
+34
View File
@@ -76,6 +76,34 @@ namespace epics { namespace pvData {
}
}
PVStructure::PVStructure(PVStructure *parent,StructureConstPtr structurePtr,
PVFieldPtrArray pvFields
)
: PVField(parent,structurePtr),pImpl(new PVStructurePvt())
{
int numberFields = structurePtr->getNumberFields();
pImpl->numberFields = numberFields;
pImpl->pvFields = pvFields;
for(int i=0; i<numberFields; i++) {
PVField *pvField = pvFields[i];
setParentPvt(pvField,this);
}
}
void PVStructure::setParentPvt(PVField *pvField,PVStructure *parent)
{
pvField->setParent(parent);
if(pvField->getField()->getType()==structure) {
PVStructure *subStructure = static_cast<PVStructure*>(pvField);
PVFieldPtr *subFields = subStructure->getPVFields();
int numberFields = subStructure->getStructure()->getNumberFields();
for(int i=0; i<numberFields; i++) {
PVField *subField = static_cast<PVField*>(subFields[i]);
setParentPvt(subField,subStructure);
}
}
}
PVStructure::~PVStructure()
{
delete pImpl;
@@ -554,6 +582,8 @@ namespace epics { namespace pvData {
class BasePVStructure : public PVStructure {
public:
BasePVStructure(PVStructure *parent,StructureConstPtr structure);
BasePVStructure(PVStructure *parent,StructureConstPtr structure,
PVFieldPtrArray pvFields);
~BasePVStructure();
private:
};
@@ -561,6 +591,10 @@ namespace epics { namespace pvData {
BasePVStructure::BasePVStructure(PVStructure *parent,StructureConstPtr structure)
: PVStructure(parent,structure) {}
BasePVStructure::BasePVStructure(PVStructure *parent,StructureConstPtr structure,
PVFieldPtrArray pvFields)
: PVStructure(parent,structure,pvFields) {}
BasePVStructure::~BasePVStructure() {}
}}