From 435ca63d1b3689cf20b78229469167bead9d9e53 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Tue, 28 Oct 2014 18:53:11 +0100 Subject: [PATCH] ev4 to epics URI --- documentation/pvDataCPP.html | 34 ++++++++++++++--------------- documentation/pvDataCPPCookbook.txt | 4 ++-- src/factory/StandardField.cpp | 14 ++++++------ src/pv/standardField.h | 2 +- src/pv/standardPVField.h | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/documentation/pvDataCPP.html b/documentation/pvDataCPP.html index 638385e..c430a2c 100644 --- a/documentation/pvDataCPP.html +++ b/documentation/pvDataCPP.html @@ -257,7 +257,7 @@ structure int userTag easy way -ev4:nt/NTScalarArray:1.0 +epics:nt/NTScalarArray:1.0 string[] value alarm_t alarm int severity @@ -277,7 +277,7 @@ via standardField:

It produces : 
-ev4:nt/NTScalarArray:1.0
+epics:nt/NTScalarArray:1.0
     string[] value
     alarm_t alarm
         int severity
@@ -305,7 +305,7 @@ A hard way to create an structure with an enumerated value field and a time stam
 
     StructureConstPtr ntEnumHard =
     fieldCreate->createFieldBuilder()->
-        setId("ev4:nt/NTEnum:1.0")->
+        setId("epics:nt/NTEnum:1.0")->
         add("value", enum_t)->
         addNestedStructure("timeStamp")->
             setId("time_t")->
@@ -318,7 +318,7 @@ A hard way to create an structure with an enumerated value field and a time stam
It produces: 
-ev4:nt/NTEnum:1.0
+epics:nt/NTEnum:1.0
     enum_t value
         int index
         string[] choices
@@ -335,7 +335,7 @@ fields: alarm and timeStamp:
It produces: 
-ev4:nt/NTEnum
+epics:nt/NTEnum
     enum_t value
         int index
         string[] choices
@@ -375,7 +375,7 @@ union
         int userTag
 
 structure with value field being a union
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     union value
         double doubleValue
         int intValue
@@ -473,7 +473,7 @@ structure
This produces: 
-ev4:nt/NTScalar:1.0
+epics:nt/NTScalar:1.0
     double value 100000
     alarm_t alarm
         int severity 0
@@ -506,7 +506,7 @@ from get 100000
This produces: 
-ev4:nt/NTScalarArray:1.0
+epics:nt/NTScalarArray:1.0
     double[] value [0,1,2,3,4,5,6,7,8,9]
     alarm_t alarm
         int severity 0
@@ -527,7 +527,7 @@ via getData 0 1 2 3 4 5 6 7 8 9
This produces: 
-ev4:nt/NTEnum:1.0
+epics:nt/NTEnum:1.0
     enum_t value
         int index 0
         string[] choices []
@@ -613,7 +613,7 @@ structure
This produces: 
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     union value
         time_t
             long secondsPastEpoch 1000
@@ -628,7 +628,7 @@ ev4:nt/NTUnion:1.0
         int nanoseconds 0
         int userTag 0
 0x60a2c8
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     union value
         double  100000
     alarm_t alarm
@@ -660,7 +660,7 @@ ev4:nt/NTUnion:1.0
This produces: 
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     any value
         time_t
             long secondsPastEpoch 1000
@@ -675,7 +675,7 @@ ev4:nt/NTUnion:1.0
         int nanoseconds 0
         int userTag 0
 0x60a2c8
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     any value
         double  100000
     alarm_t alarm
@@ -735,7 +735,7 @@ ev4:nt/NTUnion:1.0
 This produces:
 
 introspection
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     union value
         double doubleValue
         double[] doubleArrayValue
@@ -771,7 +771,7 @@ ev4:nt/NTUnion:1.0
         int userTag
 0x60a2c8
 data
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     union value
         (none)
     alarm_t alarm
@@ -784,7 +784,7 @@ ev4:nt/NTUnion:1.0
         int userTag 0
 0x60a2c8
 select valueDouble
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     union value
         double  1.55
     alarm_t alarm
@@ -798,7 +798,7 @@ ev4:nt/NTUnion:1.0
 0x60a2c8
 value = 1.55
 select structValue
-ev4:nt/NTUnion:1.0
+epics:nt/NTUnion:1.0
     union value
         structure
             double doubleValue 1.65
diff --git a/documentation/pvDataCPPCookbook.txt b/documentation/pvDataCPPCookbook.txt
index 6021e09..d408bc3 100644
--- a/documentation/pvDataCPPCookbook.txt
+++ b/documentation/pvDataCPPCookbook.txt
@@ -28,11 +28,11 @@ StructureConstPtr enum_t =
 // create a structure (cntd.)
 StructureConstPtr ntEnum = 
     getFieldCreate()->createFieldBuilder()->
-        setId("uri:ev4:nt/2012/pwd/NTEnum")->
+        setId("epics:nt/NTEnum:1.0")->
         add("value", enum_t)->
         addNestedStructure("timeStamp")->
             setId("time_t")->
-            add("secsPastEpoch", pvLong)->
+            add("secondsPastEpoch", pvLong)->
             add("nanoseconds", pvInt)->
             add("userTag", pvInt)->
             endNested()->
diff --git a/src/factory/StandardField.cpp b/src/factory/StandardField.cpp
index efc3086..d3009fa 100644
--- a/src/factory/StandardField.cpp
+++ b/src/factory/StandardField.cpp
@@ -503,28 +503,28 @@ StructureConstPtr StandardField::scalar(
     ScalarType type,string  const &properties)
 {
     ScalarConstPtr field = fieldCreate->createScalar(type); // scalar_t
-    return createProperties("ev4:nt/NTScalar:1.0",field,properties);
+    return createProperties("epics:nt/NTScalar:1.0",field,properties);
 }
 
 StructureConstPtr StandardField::regUnion(
     UnionConstPtr const &field,
         string const & properties)
 {
-   return createProperties("ev4:nt/NTUnion:1.0",field,properties);
+   return createProperties("epics:nt/NTUnion:1.0",field,properties);
 }
 
 StructureConstPtr StandardField::variantUnion(
     string const & properties)
 {
     UnionConstPtr field =  fieldCreate->createVariantUnion();
-    return createProperties("ev4:nt/NTUnion:1.0",field,properties);
+    return createProperties("epics:nt/NTUnion:1.0",field,properties);
 }
 
 StructureConstPtr StandardField::scalarArray(
     ScalarType elementType, string  const &properties)
 {
     ScalarArrayConstPtr field = fieldCreate->createScalarArray(elementType); // scalar_t[]
-    return createProperties("ev4:nt/NTScalarArray:1.0",field,properties);
+    return createProperties("epics:nt/NTScalarArray:1.0",field,properties);
 }
 
 
@@ -533,7 +533,7 @@ StructureConstPtr StandardField::structureArray(
 {
     StructureArrayConstPtr field = fieldCreate->createStructureArray(
         structure);
-    return createProperties("ev4:nt/NTStructureArray:1.0",field,properties);
+    return createProperties("epics:nt/NTStructureArray:1.0",field,properties);
 }
 
 StructureConstPtr StandardField::unionArray(
@@ -541,7 +541,7 @@ StructureConstPtr StandardField::unionArray(
 {
     UnionArrayConstPtr field = fieldCreate->createUnionArray(
         punion);
-    return createProperties("ev4:nt/NTUnionArray:1.0",field,properties);
+    return createProperties("epics: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("ev4:nt/NTEnum:1.0",field,properties);
+    return createProperties("epics:nt/NTEnum:1.0",field,properties);
 }
 
 StructureConstPtr StandardField::alarm()
diff --git a/src/pv/standardField.h b/src/pv/standardField.h
index f0dbf90..9dcf7ba 100644
--- a/src/pv/standardField.h
+++ b/src/pv/standardField.h
@@ -122,7 +122,7 @@ public:
      */
     StructureConstPtr enumerated();
     /** Create a structure that has an enumerated structure value field
-     * The id for the structure is "ev4:nt/NTEnum:1.0".
+     * The id for the structure is "epics: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.
diff --git a/src/pv/standardPVField.h b/src/pv/standardPVField.h
index 5b35afe..cad6c2e 100644
--- a/src/pv/standardPVField.h
+++ b/src/pv/standardPVField.h
@@ -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 "ev4:nt/NTEnum:1.0".
+     * The id for the structure is "epics: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.