Rename pvDataApp to src, adjust Makefiles.

2014-03-28 10:20:24 -05:00
parent 1e40797bc4
commit 19269735ae
93 changed files with 29 additions and 29 deletions
--- a/src/factory/StandardPVField.cpp
+++ b/src/factory/StandardPVField.cpp
@@ -0,0 +1,97 @@
+/* StandardPVField.cpp */
+/**
+ * Copyright - See the COPYRIGHT that is included with this distribution.
+ * EPICS pvData is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution.
+ */
+/**
+ *  @author mrk
+ */
+#include <string>
+#include <stdexcept>
+
+#define epicsExportSharedSymbols
+#include <pv/lock.h>
+#include <pv/pvIntrospect.h>
+#include <pv/pvData.h>
+#include <pv/convert.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
+
+namespace epics { namespace pvData { 
+
+StandardPVField::StandardPVField()
+: standardField(getStandardField()),
+  fieldCreate(getFieldCreate()),
+  pvDataCreate(getPVDataCreate()),
+  notImplemented("not implemented")
+{}
+
+StandardPVField::~StandardPVField(){}
+
+PVStructurePtr StandardPVField::scalar(
+    ScalarType type,String const & properties)
+{
+    StructureConstPtr field = standardField->scalar(type,properties);
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
+    return pvStructure;
+}
+
+PVStructurePtr StandardPVField::scalarArray(
+    ScalarType elementType, String const & properties)
+{
+    StructureConstPtr field = standardField->scalarArray(elementType,properties);
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
+    return pvStructure;
+}
+
+PVStructurePtr StandardPVField::structureArray(
+    StructureConstPtr const & structure,String const & properties)
+{
+    StructureConstPtr field = standardField->structureArray(structure,properties);
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
+    return pvStructure;
+}
+
+PVStructurePtr StandardPVField::enumerated(StringArray const &choices)
+{
+    StructureConstPtr field = standardField->enumerated();
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
+    PVScalarArrayPtr pvScalarArray = pvStructure->getScalarArrayField(
+        "choices",pvString);
+    PVStringArray::svector cdata(choices.size());
+    std::copy(choices.begin(), choices.end(), cdata.begin());
+    static_cast<PVStringArray&>(*pvScalarArray).replace(freeze(cdata));
+    return pvStructure;
+}
+
+PVStructurePtr StandardPVField::enumerated(
+    StringArray const &choices,String const & properties)
+{
+    StructureConstPtr field = standardField->enumerated(properties);
+    PVStructurePtr pvStructure =  pvDataCreate->createPVStructure(field);
+    PVScalarArrayPtr pvScalarArray = pvStructure->getScalarArrayField(
+        "value.choices",pvString);
+    PVStringArray::svector cdata(choices.size());
+    std::copy(choices.begin(), choices.end(), cdata.begin());
+    static_cast<PVStringArray&>(*pvScalarArray).replace(freeze(cdata));
+    return pvStructure;
+}
+
+StandardPVFieldPtr StandardPVField::getStandardPVField()
+{
+    static StandardPVFieldPtr standardPVField;
+    static Mutex mutex;
+    Lock xx(mutex);
+
+    if(standardPVField.get()==NULL) {
+        standardPVField= StandardPVFieldPtr(new StandardPVField());
+    }
+    return standardPVField;
+}
+
+StandardPVFieldPtr getStandardPVField() {
+    return StandardPVField::getStandardPVField();
+}
+
+}}