AbstractPVField now finished

2010-10-22 10:41:17 -04:00
parent fce7b9914b ef709eb6b9
commit a2b35d1e82
10 changed files with 495 additions and 315 deletions
@@ -10,72 +10,78 @@
 namespace epics { namespace pvData { 

 static String notImplemented("not implemented");
+static FieldCreate* fieldCreate = 0;
+static PVDataCreate* pvDataCreate = 0;

-    StandardField::StandardField(){}
+StandardField::StandardField(){}

-    StandardField::~StandardField(){}
+StandardField::~StandardField(){}

-    PVScalar * StandardField::scalarValue(ScalarType scalarType)
-    {
-        ScalarConstPtr scalar = getFieldCreate()->createScalar(
-           String("value"),scalarType);
-        return getPVDataCreate()->createPVScalar(0,scalar);
+PVScalar * StandardField::scalarValue(ScalarType scalarType)
+{
+    ScalarConstPtr scalar = fieldCreate->createScalar(
+       String("value"),scalarType);
+    return getPVDataCreate()->createPVScalar(0,scalar);
+}
+
+PVScalarArray * StandardField::scalarArrayValue(ScalarType elementType)
+{
+    ScalarArrayConstPtr scalarArray = fieldCreate->createScalarArray(
+       String("value"),elementType);
+    return pvDataCreate->createPVScalarArray(0,scalarArray);
+}
+
+PVStructure * StandardField::scalarValue(ScalarType type,String properties)
+{
+    throw std::logic_error(notImplemented);
+}
+
+PVStructure * StandardField::scalarArrayValue(ScalarType elementType,
+    String properties)
+{
+    throw std::logic_error(notImplemented);
+}
+
+PVStructure * StandardField::enumeratedValue(StringArray choices)
+{
+    throw std::logic_error(notImplemented);
+}
+
+PVStructure * StandardField::enumeratedValue(StringArray choices,
+    String properties)
+{
+    throw std::logic_error(notImplemented);
+}
+
+PVStructure * StandardField::alarm()
+{
+    throw std::logic_error(notImplemented);
+}
+
+PVStructure * StandardField::timeStamp()
+{
+    throw std::logic_error(notImplemented);
+}
+
+
+static StandardField* instance = 0;
+
+
+class StandardFieldExt : public StandardField {
+public:
+    StandardFieldExt(): StandardField(){};
+};
+
+StandardField * getStandardField() {
+    static Mutex mutex = Mutex();
+    Lock xx(&mutex);
+
+    if(instance==0) {
+        instance = new StandardFieldExt();
+        fieldCreate = getFieldCreate();
+        pvDataCreate = getPVDataCreate();
    }
+    return instance;
+}

-    PVScalarArray * StandardField::scalarArrayValue(ScalarType elementType)
-    {
-        ScalarArrayConstPtr scalarArray = getFieldCreate()->createScalarArray(
-           String("value"),elementType);
-        return getPVDataCreate()->createPVScalarArray(0,scalarArray);
-    }
-
-    PVStructure * StandardField::scalarValue(ScalarType type,String properties)
-    {
-        throw std::logic_error(notImplemented);
-    }
-
-    PVStructure * StandardField::scalarArrayValue(ScalarType elementType,
-        String properties)
-    {
-        throw std::logic_error(notImplemented);
-    }
-
-    PVStructure * StandardField::enumeratedValue(StringArray choices)
-    {
-        throw std::logic_error(notImplemented);
-    }
-
-    PVStructure * StandardField::enumeratedValue(StringArray choices,
-        String properties)
-    {
-        throw std::logic_error(notImplemented);
-    }
-
-    PVStructure * StandardField::alarm()
-    {
-        throw std::logic_error(notImplemented);
-    }
-
-    PVStructure * StandardField::timeStamp()
-    {
-        throw std::logic_error(notImplemented);
-    }
-
-
-    static StandardField* instance = 0;
-
-
-    class StandardFieldExt : public StandardField {
-    public:
-        StandardFieldExt(): StandardField(){};
-    };
-
-    StandardField * getStandardField() {
-        static Mutex mutex = Mutex();
-        Lock xx(&mutex);
-
-        if(instance==0) instance = new StandardFieldExt();
-        return instance;
-    }
-    
 }}