[ADDITIVE] Add new std memory array to field. Update memory array val…

…idation.
kactus2 · Jul 24, 2023 · 523cab9 · 523cab9
1 parent b3ed700
commit 523cab9
Show file tree

Hide file tree

Showing 29 changed files with 963 additions and 654 deletions.
diff --git a/IPXACTmodels/Component/Field.cpp b/IPXACTmodels/Component/Field.cpp
@@ -14,6 +14,7 @@
 #include <IPXACTmodels/common/Parameter.h>
 #include <IPXACTmodels/Component/EnumeratedValue.h>
 #include <IPXACTmodels/Component/WriteValueConstraint.h>
+#include <IPXACTmodels/Component/MemoryArray.h>
 
 //-----------------------------------------------------------------------------
 // Function: Field::Field()
@@ -154,6 +155,22 @@ void Field::setIsPresent(QString const& newIsPresent)
  isPresent_ = newIsPresent;
 }
 
+//-----------------------------------------------------------------------------
+// Function: Field::getMemoryArray()
+//-----------------------------------------------------------------------------
+QSharedPointer<MemoryArray> Field::getMemoryArray() const
+{
+ return memoryArray_;
+}
+
+//-----------------------------------------------------------------------------
+// Function: Field::setMemoryArray()
+//-----------------------------------------------------------------------------
+void Field::setMemoryArray(QSharedPointer<MemoryArray> memArray)
+{
+ memoryArray_ = memArray;
+}
+
 //-----------------------------------------------------------------------------
 // Function: Field::getBitOffset()
 //-----------------------------------------------------------------------------

diff --git a/IPXACTmodels/Component/Field.h b/IPXACTmodels/Component/Field.h
@@ -30,6 +30,7 @@
 class Parameter;
 class EnumeratedValue;
 class WriteValueConstraint;
+class MemoryArray;
 
 //-----------------------------------------------------------------------------
 //! Describes the ipxact:field element.
@@ -91,6 +92,20 @@ class IPXACTMODELS_EXPORT Field : public NameGroup, public Extendable
  */
  void setIsPresent(QString const& newIsPresent);
 
+ /*!
+ * Get the memory array of the field.
+ * 
+ * @return The field's memory array.
+ */
+ QSharedPointer<MemoryArray> getMemoryArray() const;
+
+ /*!
+ * Set the field's memory array.
+ * 
+ * @param [in] memArray Description
+ */
+ void setMemoryArray(QSharedPointer<MemoryArray> memArray);
+
  /*!
  * Get the bit offset.
  *
@@ -366,6 +381,9 @@ class IPXACTMODELS_EXPORT Field : public NameGroup, public Extendable
  //! The presence of the field.
  QString isPresent_;
 
+ //! The field's memory array.
+ QSharedPointer<MemoryArray> memoryArray_;
+
  //! Describes the offset where this bit field starts.
  QString bitOffset_;
 

diff --git a/IPXACTmodels/Component/FieldReader.cpp b/IPXACTmodels/Component/FieldReader.cpp