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

StandardField IDs, dumpValue fix for (u)int8

Browse Source
This commit is contained in:
Matej Sekoranja
2012-10-10 17:59:12 +02:00
parent 04db13d00e
commit bd9f1d1949
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pvDataApp/factory/PVScalar.cpp
View File

@@ -28,4 +28,15 @@ namespace epics { namespace pvData {
return static_pointer_cast<const Scalar>(PVField::getField());
}
template<>
std::ostream& PVScalarValue<int8>::dumpValue(std::ostream& o) const
{
return o << static_cast<int>(get());
}
template<>
std::ostream& PVScalarValue<uint8>::dumpValue(std::ostream& o) const
{
return o << static_cast<unsigned int>(get());
}
}}

12
pvDataApp/factory/PVScalarArray.cpp
View File

@@ -28,4 +28,16 @@ namespace epics { namespace pvData {
return static_pointer_cast<const ScalarArray>(PVField::getField());
}
template<>
std::ostream& PVValueArray<int8>::dumpValue(std::ostream& o, size_t index) const
{
return o << static_cast<int>(*(get() + index));
}
template<>
std::ostream& PVValueArray<uint8>::dumpValue(std::ostream& o, size_t index) const
{
return o << static_cast<unsigned int>(*(get() + index));
}
}}

19
pvDataApp/factory/StandardField.cpp
View File

@@ -165,7 +165,7 @@ void StandardField::createTimeStamp() {
fields[0] = fieldCreate->createScalar(pvLong);
fields[1] = fieldCreate->createScalar(pvInt);
fields[2] = fieldCreate->createScalar(pvInt);
timeStampField = fieldCreate->createStructure("timeStamp_t",names,fields);
timeStampField = fieldCreate->createStructure("time_t",names,fields);
}
void StandardField::createDisplay() {
@@ -500,15 +500,15 @@ void StandardField::createEnumeratedAlarm() {
StructureConstPtr StandardField::scalar(
ScalarType type,String const &properties)
{
ScalarConstPtr field = fieldCreate->createScalar(type);
return createProperties("scalar_t",field,properties);
ScalarConstPtr field = fieldCreate->createScalar(type); // scalar_t
return createProperties("uri:ev4:nt/2012/pwd:NTScalar",field,properties);
}
StructureConstPtr StandardField::scalarArray(
ScalarType elementType, String const &properties)
{
ScalarArrayConstPtr field = fieldCreate->createScalarArray(elementType);
return createProperties("scalarArray_t",field,properties);
ScalarArrayConstPtr field = fieldCreate->createScalarArray(elementType); // scalar_t[]
return createProperties("uri:ev4:nt/2012/pwd:NTScalarArray",field,properties);
}
@@ -517,7 +517,7 @@ StructureConstPtr StandardField::structureArray(
{
StructureArrayConstPtr field = fieldCreate->createStructureArray(
structure);
return createProperties("structureArray_t",field,properties);
return createProperties("uri:ev4:nt/2012/pwd:NTAny",field,properties);
}
StructureConstPtr StandardField::enumerated()
@@ -529,13 +529,14 @@ StructureConstPtr StandardField::enumerated()
names[1] = "choices";
fields[0] = fieldCreate->createScalar(pvInt);
fields[1] = fieldCreate->createScalarArray(pvString);
return fieldCreate->createStructure("enumerated_t",names,fields);
return fieldCreate->createStructure("enum_t",names,fields);
// NOTE: if this method is used to get NTEnum wihtout properties the ID will be wrong!
}
StructureConstPtr StandardField::enumerated(String const &properties)
{
StructureConstPtr field = enumerated();
return createProperties("enumerated_t",field,properties);
StructureConstPtr field = enumerated(); // enum_t
return createProperties("uri:ev4:nt/2012/pwd:NTEnum",field,properties);
}
StructureConstPtr StandardField::alarm()

19
pvDataApp/pv/pvData.h
View File

@@ -895,18 +895,15 @@ public:
std::ostream& dumpValue(std::ostream& o) const
{
o << "[";
pointer iter = get();
pointer last = iter + getLength();
if (iter != last)
std::size_t len = getLength();
bool first = true;
for (std::size_t i = 0; i < len; i++)
{
while (true)
{
o << *(iter++);
if (iter == last)
break;
else
o << ",";
}
if (first)
first = false;
else
o << ",";
dumpValue(o, i);
}
return o << "]";
}