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

support for ChannelArray UnionArray

Browse Source
This commit is contained in:
Marty Kraimer
2014-06-12 15:27:26 -04:00
parent 92be294bbf
commit 38574ed76f
2 changed files with 72 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pvAccess/channelLocal.cpp
View File

@@ -847,7 +847,9 @@ ChannelArrayLocalPtr ChannelArrayLocal::create(
status,channelArray,array);
return channelArray;
}
if(pvField->getField()->getType()!=scalarArray && pvField->getField()->getType()!=structureArray)
if(pvField->getField()->getType()!=scalarArray
&& pvField->getField()->getType()!=structureArray
&& pvField->getField()->getType()!=unionArray)
{
Status status(
Status::Status::STATUSTYPE_ERROR,fieldName +" not array");
@@ -897,9 +899,28 @@ ChannelArrayLocalPtr ChannelArrayLocal::create(
Status::Ok, array, pvCopy->getArray());
return array;
}
if(pvField->getField()->getType()==unionArray) {
PVUnionArrayPtr xxx = static_pointer_cast<PVUnionArray>(pvField);
pvCopy = getPVDataCreate()->createPVUnionArray(
xxx->getUnionArray()->getUnion());
ChannelArrayLocalPtr array(new ChannelArrayLocal(
channelLocal,
channelArrayRequester,
pvArray,
pvCopy,
pvRecord));
if(pvRecord->getTraceLevel()>0)
{
cout << "ChannelArrayLocal::create";
cout << " recordName " << pvRecord->getRecordName() << endl;
}
channelArrayRequester->channelArrayConnect(
Status::Ok, array, pvCopy->getArray());
return array;
}
Status status(Status::Status::STATUSTYPE_ERROR,
"Sorry only ScalarArray and Structure Array are supported");
"Logic error. Should not reach this code");
ChannelArrayLocalPtr channelArray;
ArrayConstPtr array;
channelArrayRequester->channelArrayConnect(status,channelArray,array);