From 3c5e4a1db5853e30f6ef5ec089913e7f9595dec0 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Tue, 28 Oct 2014 20:18:08 +0100 Subject: [PATCH] URI: ev4 to epics --- documentation/ntCPP.html | 16 ++++++++-------- src/nt/ntmultiChannel.cpp | 2 +- src/nt/ntnameValue.cpp | 2 +- src/nt/ntndarray.cpp | 6 +++--- src/nt/ntscalar.cpp | 2 +- src/nt/ntscalarArray.cpp | 2 +- src/nt/nttable.cpp | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/documentation/ntCPP.html b/documentation/ntCPP.html index d214380..7722c64 100644 --- a/documentation/ntCPP.html +++ b/documentation/ntCPP.html @@ -422,7 +422,7 @@ This has methods to do the following:

Normative Type NTScalar

This has the following fields:

-ev4:nt/NTScalar:1.0
+epics:nt/NTScalar:1.0
     double value                        // mandatory and can be any numeric type
     string descriptor                   // optional
     alarm_t alarm                       // optional
@@ -666,7 +666,7 @@ string message = alarm.getMessage();
 field is a scalar array field instead of just a scalar.

 
This has the following fields:

 
-ev4:nt/NTScalarArray:1.0
+epics:nt/NTScalarArray:1.0
     double[] value                      // mandatory and can be any numeric type
     string descriptor                   // optional
     alarm_t alarm                       // optional
@@ -838,7 +838,7 @@ where
 
 
Normative Type NTNameValue

 
-ev4:nt/NTNameValue:1.0
+epics:nt/NTNameValue:1.0
     string[] name                 // mandatory
     double[] value                // madatory, can be any type, must be same length as name
     string descriptor              // optional
@@ -978,7 +978,7 @@ where
 
 
Normative Type NTTable

 
-ev4:nt/NTTable:1.0 
+epics:nt/NTTable:1.0 
     string[] labels [column0,column1,column2]    // mandatory
     structure value                              // mandatory; 
         double[] column0 []                      // name=labels[0]; can be any scalar type
@@ -1291,7 +1291,7 @@ where
 
 
Normative Type NTNDArray
 
 
-ev4:nt/NTNDArray:1.0 
+epics:nt/NTNDArray:1.0 
     union value                                 //mandatory
     codec_t codec                               //mandatory
         string name 
@@ -1311,9 +1311,9 @@ ev4:nt/NTNDArray:1.0
         long secondsPastEpoch
         int nanoseconds
         int userTag
-    ev4:nt/NTAttribute:1.0[] attribute //mandatory
-        ev4:nt/NTAttribute:1.0[]
-            ev4:nt/NTAttribute:1.0
+    epics:nt/NTAttribute:1.0[] attribute //mandatory
+        epics:nt/NTAttribute:1.0[]
+            epics:nt/NTAttribute:1.0
                 string name
                 any value
                 string description
diff --git a/src/nt/ntmultiChannel.cpp b/src/nt/ntmultiChannel.cpp
index f9c6124..0fc53e2 100644
--- a/src/nt/ntmultiChannel.cpp
+++ b/src/nt/ntmultiChannel.cpp
@@ -195,7 +195,7 @@ NTMultiChannelBuilder::shared_pointer NTMultiChannelBuilder::add(string const &
 
 }
 
-const std::string NTMultiChannel::URI("ev4:nt/NTMultiChannel:1.0");
+const std::string NTMultiChannel::URI("epics:nt/NTMultiChannel:1.0");
 
 NTMultiChannel::shared_pointer NTMultiChannel::wrap(PVStructurePtr const & structure)
 {
diff --git a/src/nt/ntnameValue.cpp b/src/nt/ntnameValue.cpp
index b1dd26a..e80b558 100644
--- a/src/nt/ntnameValue.cpp
+++ b/src/nt/ntnameValue.cpp
@@ -108,7 +108,7 @@ NTNameValueBuilder::shared_pointer NTNameValueBuilder::add(string const & name,
 
 }
 
-const std::string NTNameValue::URI("ev4:nt/NTNameValue:1.0");
+const std::string NTNameValue::URI("epics:nt/NTNameValue:1.0");
 
 NTNameValue::shared_pointer NTNameValue::wrap(PVStructurePtr const & structure)
 {
diff --git a/src/nt/ntndarray.cpp b/src/nt/ntndarray.cpp
index 1635dc5..85bbeb6 100644
--- a/src/nt/ntndarray.cpp
+++ b/src/nt/ntndarray.cpp
@@ -18,7 +18,7 @@ static NTFieldPtr ntField = NTField::get();
 
 namespace detail {
 
-const std::string ntAttrStr("ev4:nt/NTAttribute:1.0");
+const std::string ntAttrStr("epics:nt/NTAttribute:1.0");
 
 static FieldCreatePtr fieldCreate = getFieldCreate();
 static PVDataCreatePtr pvDataCreate = getPVDataCreate();
@@ -198,8 +198,8 @@ NTNDArrayBuilder::shared_pointer NTNDArrayBuilder::add(string const & name, Fiel
 
 }
 
-const std::string NTNDArray::URI("ev4:nt/NTNDArray:1.0");
-const std::string ntAttrStr("ev4:nt/NTAttribute:1.0");
+const std::string NTNDArray::URI("epics:nt/NTNDArray:1.0");
+const std::string ntAttrStr("epics:nt/NTAttribute:1.0");
 
 static FieldCreatePtr fieldCreate = getFieldCreate();
 static PVDataCreatePtr pvDataCreate = getPVDataCreate();
diff --git a/src/nt/ntscalar.cpp b/src/nt/ntscalar.cpp
index 3b3c660..e28b729 100644
--- a/src/nt/ntscalar.cpp
+++ b/src/nt/ntscalar.cpp
@@ -128,7 +128,7 @@ NTScalarBuilder::shared_pointer NTScalarBuilder::add(string const & name, FieldC
 
 }
 
-const std::string NTScalar::URI("ev4:nt/NTScalar:1.0");
+const std::string NTScalar::URI("epics:nt/NTScalar:1.0");
 
 NTScalar::shared_pointer NTScalar::wrap(PVStructurePtr const & structure)
 {
diff --git a/src/nt/ntscalarArray.cpp b/src/nt/ntscalarArray.cpp
index 511c2b0..6e6addf 100644
--- a/src/nt/ntscalarArray.cpp
+++ b/src/nt/ntscalarArray.cpp
@@ -125,7 +125,7 @@ NTScalarArrayBuilder::shared_pointer NTScalarArrayBuilder::add(string const & na
 
 }
 
-const std::string NTScalarArray::URI("ev4:nt/NTScalarArray:1.0");
+const std::string NTScalarArray::URI("epics:nt/NTScalarArray:1.0");
 
 NTScalarArray::shared_pointer NTScalarArray::wrap(PVStructurePtr const & structure)
 {
diff --git a/src/nt/nttable.cpp b/src/nt/nttable.cpp
index 207f462..dc96906 100644
--- a/src/nt/nttable.cpp
+++ b/src/nt/nttable.cpp
@@ -123,7 +123,7 @@ NTTableBuilder::shared_pointer NTTableBuilder::add(string const & name, FieldCon
 
 }
 
-const std::string NTTable::URI("ev4:nt/NTTable:1.0");
+const std::string NTTable::URI("epics:nt/NTTable:1.0");
 
 NTTable::shared_pointer NTTable::wrap(PVStructurePtr const & structure)
 {