Merge branch 'master' into release/4.1

epics-base · Mar 22, 2022 · 44a2f86 · 44a2f86
2 parents 0c5ccec + 9c400fe
commit 44a2f86
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/src/pvaccess/PvObject.cpp b/src/pvaccess/PvObject.cpp
@@ -49,6 +49,22 @@ PvObject::PvObject(const pvd::PVStructurePtr& pvStructurePtr_)
 {
 }
 
+PvObject::PvObject(const bp::dict& structureDict)
+    : numPyInitialized(initializeBoostNumPy()),
+    pvStructurePtr(pvd::getPVDataCreate()->createPVStructure(PyPvDataUtility::createStructureFromDict(structureDict, StructureId))),
+    dataType(PvType::Structure),
+    useNumPyArrays(UseNumPyArraysDefault)
+{
+}
+
+PvObject::PvObject(const bp::dict& structureDict, const std::string& structureId)
+    : numPyInitialized(initializeBoostNumPy()),
+    pvStructurePtr(pvd::getPVDataCreate()->createPVStructure(PyPvDataUtility::createStructureFromDict(structureDict, structureId))),
+    dataType(PvType::Structure),
+    useNumPyArrays(UseNumPyArraysDefault)
+{
+}
+
 PvObject::PvObject(const bp::dict& structureDict, const std::string& structureId, const boost::python::dict& structureFieldIdDict)
     : numPyInitialized(initializeBoostNumPy()),
     pvStructurePtr(pvd::getPVDataCreate()->createPVStructure(PyPvDataUtility::createStructureFromDict(structureDict, structureId, structureFieldIdDict))),
@@ -57,6 +73,15 @@ PvObject::PvObject(const bp::dict& structureDict, const std::string& structureId
 {
 }
 
+PvObject::PvObject(const bp::dict& structureDict, const bp::dict& valueDict)
+    : numPyInitialized(initializeBoostNumPy()),
+    pvStructurePtr(pvd::getPVDataCreate()->createPVStructure(PyPvDataUtility::createStructureFromDict(structureDict, StructureId))),
+    dataType(PvType::Structure),
+    useNumPyArrays(UseNumPyArraysDefault)
+{
+    PyPvDataUtility::pyDictToStructure(valueDict, pvStructurePtr);
+}
+
 PvObject::PvObject(const bp::dict& structureDict, const bp::dict& valueDict, const std::string& structureId)
     : numPyInitialized(initializeBoostNumPy()),
     pvStructurePtr(pvd::getPVDataCreate()->createPVStructure(PyPvDataUtility::createStructureFromDict(structureDict, structureId))),

diff --git a/src/pvaccess/PvObject.h b/src/pvaccess/PvObject.h
@@ -29,8 +29,11 @@ class PvObject
 
     // Constructors
     PvObject(const epics::pvData::PVStructurePtr& pvStructurePtr);
-    PvObject(const boost::python::dict& structureDict, const std::string& structureId=StructureId, const boost::python::dict& structureFieldIdDict=boost::python::dict());
-    PvObject(const boost::python::dict& structureDict, const boost::python::dict& valueDict, const std::string& structureId=StructureId);
+    PvObject(const boost::python::dict& structureDict);
+    PvObject(const boost::python::dict& structureDict, const std::string& structureId);
+    PvObject(const boost::python::dict& structureDict, const std::string& structureId, const boost::python::dict& structureFieldIdDict);
+    PvObject(const boost::python::dict& structureDict, const boost::python::dict& valueDict);
+    PvObject(const boost::python::dict& structureDict, const boost::python::dict& valueDict, const std::string& structureId);
     PvObject(const PvObject& pvObject);
 
     // Destructor

diff --git a/src/pvaccess/PyPvDataUtility.cpp b/src/pvaccess/PyPvDataUtility.cpp
@@ -1980,7 +1980,7 @@ bool updateFieldArrayFromPvObject(const bp::object& pyObject, const std::string&
         }
         default: {
             std::string structureFieldId = PyUtility::extractKeyValueFromPyDict<std::string>(fieldName, structureFieldIdDict, std::string());
-            addStructureField(fieldName, pvObject, fields, names, structureFieldId);
+            addStructureField(fieldName, pvObject, fields, names);
         }
     }
     return true;