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

change URI naming

Browse Source
This commit is contained in:
Marty Kraimer
2014-09-30 15:05:18 -04:00
parent a208171250
commit 36faf8c2ea
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/factory/StandardField.cpp
View File

@@ -503,28 +503,28 @@ StructureConstPtr StandardField::scalar(
ScalarType type,string const &properties)
{
ScalarConstPtr field = fieldCreate->createScalar(type); // scalar_t
return createProperties("uri:ev4:nt/2014/pwd:NTScalar",field,properties);
return createProperties("ev4:nt:NTScalar:1.0",field,properties);
}
StructureConstPtr StandardField::regUnion(
UnionConstPtr const &field,
string const & properties)
{
return createProperties("uri:ev4:nt/2014/pwd:NTUnion",field,properties);
return createProperties("ev4:nt:NTUnion:1.0",field,properties);
}
StructureConstPtr StandardField::variantUnion(
string const & properties)
{
UnionConstPtr field = fieldCreate->createVariantUnion();
return createProperties("uri:ev4:nt/2014/pwd:NTUnion",field,properties);
return createProperties("ev4:nt:NTUnion:1.0",field,properties);
}
StructureConstPtr StandardField::scalarArray(
ScalarType elementType, string const &properties)
{
ScalarArrayConstPtr field = fieldCreate->createScalarArray(elementType); // scalar_t[]
return createProperties("uri:ev4:nt/2014/pwd:NTScalarArray",field,properties);
return createProperties("ev4:nt:NTScalarArray:1.0",field,properties);
}
@@ -533,7 +533,7 @@ StructureConstPtr StandardField::structureArray(
{
StructureArrayConstPtr field = fieldCreate->createStructureArray(
structure);
return createProperties("uri:ev4:nt/2014/pwd:NTStructureArray",field,properties);
return createProperties("ev4:nt:NTStructureArray:1.0",field,properties);
}
StructureConstPtr StandardField::unionArray(
@@ -541,7 +541,7 @@ StructureConstPtr StandardField::unionArray(
{
UnionArrayConstPtr field = fieldCreate->createUnionArray(
punion);
return createProperties("uri:ev4:nt/2014/pwd:NTUnionArray",field,properties);
return createProperties("ev4:nt:NTUnionArray:1.0",field,properties);
}
StructureConstPtr StandardField::enumerated()
@@ -560,7 +560,7 @@ StructureConstPtr StandardField::enumerated()
StructureConstPtr StandardField::enumerated(string const &properties)
{
StructureConstPtr field = enumerated(); // enum_t
return createProperties("uri:ev4:nt/2014/pwd:NTEnum",field,properties);
return createProperties("ev4:nt:NTEnum:1.0",field,properties);
}
StructureConstPtr StandardField::alarm()

2
src/pv/standardField.h
View File

@@ -122,7 +122,7 @@ public:
*/
StructureConstPtr enumerated();
/** Create a structure that has an enumerated structure value field
* The id for the structure is "uri:ev4:nt/2014/pwd:NTEnum".
* The id for the structure is "ev4:nt:NTEnum:1.0".
* @param properties A comma separated list of properties.
* This is some combination of "alarm,timeStamp,display,control,valueAlarm".
* @return The const shared pointer to the structure.

2
src/pv/standardPVField.h
View File

@@ -84,7 +84,7 @@ public:
PVStructurePtr enumerated(StringArray const &choices);
/**
* Create a structure that has an enumerated structure value field.
* The id for the structure is "uri:ev4:nt/2014/pwd:NTEnum".
* The id for the structure is "ev4:nt:NTEnum:1.0".
* @param choices This is a StringArray of choices.
* @param properties A comma separated list of properties.
* @return The const shared pointer to the structure.