From 476f18332ab85c49c8864c1d0437179c0be152b3 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Fri, 31 May 2013 21:15:54 +0200 Subject: [PATCH] valueAlarm for numeric scalar arrays support --- pvDataApp/factory/StandardField.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pvDataApp/factory/StandardField.cpp b/pvDataApp/factory/StandardField.cpp index e596332..172af00 100644 --- a/pvDataApp/factory/StandardField.cpp +++ b/pvDataApp/factory/StandardField.cpp @@ -65,9 +65,10 @@ StructureConstPtr StandardField::createProperties(String id,FieldConstPtr field, StructureConstPtr valueAlarm; Type type= field->getType(); while(gotValueAlarm) { - if(type==epics::pvData::scalar) { - ScalarConstPtr scalar = static_pointer_cast(field); - ScalarType scalarType = scalar->getScalarType(); + if(type==epics::pvData::scalar || type==epics::pvData::scalarArray) { + ScalarType scalarType = (type==epics::pvData::scalar) ? + static_pointer_cast(field)->getScalarType() : + static_pointer_cast(field)->getElementType(); switch(scalarType) { case pvBoolean: valueAlarm = booleanAlarmField; break; case pvByte: valueAlarm = byteAlarmField; break;