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

simplified definition and implementation of PVAuxInfo.

Browse Source
This commit is contained in:
Marty Kraimer
2011-02-10 07:46:38 -05:00
parent de19e4b4dc
commit 54782139c7
6 changed files with 93 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pvDataApp/factory/PVDataCreateFactory.cpp
View File

@@ -437,15 +437,14 @@ PVScalar *PVDataCreate::createPVScalar(PVStructure *parent,
PVScalar *pvScalar = createPVScalar(parent,fieldName,
scalarToClone->getScalar()->getScalarType());
convert->copyScalar(scalarToClone, pvScalar);
PVScalarMap attributes = scalarToClone->getPVAuxInfo()->getInfos();
PVAuxInfo *pvAttribute = pvScalar->getPVAuxInfo();
PVScalarMapIter p;
for(p=attributes.begin(); p!=attributes.end(); p++) {
String key = p->first;
PVScalar *fromAttribute = p->second;
PVScalar *toAttribute = pvAttribute->createInfo(key,
fromAttribute->getScalar()->getScalarType());
convert->copyScalar(fromAttribute,toAttribute);
PVAuxInfo *from = scalarToClone->getPVAuxInfo();
PVAuxInfo *to = pvScalar->getPVAuxInfo();
int numberInfo = from->getNumberInfo();
for(int i=0; i<numberInfo; i++) {
PVScalar *pvFrom = from->getInfo(i);
ScalarConstPtr scalar = pvFrom->getScalar();
PVScalar *pvTo = to->createInfo(scalar->getFieldName(),scalar->getScalarType());
convert->copyScalar(pvFrom,pvTo);
}
return pvScalar;
}
@@ -490,15 +489,14 @@ PVScalarArray *PVDataCreate::createPVScalarArray(PVStructure *parent,
PVScalarArray *pvArray = createPVScalarArray(parent,fieldName,
arrayToClone->getScalarArray()->getElementType());
convert->copyScalarArray(arrayToClone,0, pvArray,0,arrayToClone->getLength());
PVScalarMap attributes = arrayToClone->getPVAuxInfo()->getInfos();
PVAuxInfo *pvAttribute = pvArray->getPVAuxInfo();
PVScalarMapIter p;
for(p=attributes.begin(); p!=attributes.end(); p++) {
String key = p->first;
PVScalar *fromAttribute = p->second;
PVScalar *toAttribute = pvAttribute->createInfo(key,
fromAttribute->getScalar()->getScalarType());
convert->copyScalar(fromAttribute,toAttribute);
PVAuxInfo *from = arrayToClone->getPVAuxInfo();
PVAuxInfo *to = pvArray->getPVAuxInfo();
int numberInfo = from->getNumberInfo();
for(int i=0; i<numberInfo; i++) {
PVScalar *pvFrom = from->getInfo(i);
ScalarConstPtr scalar = pvFrom->getScalar();
PVScalar *pvTo = to->createInfo(scalar->getFieldName(),scalar->getScalarType());
convert->copyScalar(pvFrom,pvTo);
}
return pvArray;
}