Merge branch 'master' into feature/854_metadatastorage_is_not_movable

core/indigo-core/molecule/metadata_storage.h

@@ -18,6 +18,7 @@
 #ifndef __metadata_storage__
 #define __metadata_storage__
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -40,6 +41,8 @@ namespace indigo
     {
     public:
         DECL_ERROR;
+        void clone(const MetaDataStorage& other);
+        void append(const MetaDataStorage& other);
 
         using MetadataVector = std::vector<std::shared_ptr<MetaObject>>;
 

core/indigo-core/molecule/src/metadata_storage.cpp

@@ -31,7 +31,20 @@ int MetaDataStorage::addMetaObject(MetaObject* pobj)
     return index;
 }
 
-const MetaObject& MetaDataStorage::getMetaObject(uint32_t meta_type, int index) const
+void MetaDataStorage::append(const MetaDataStorage& other)
+{
+    const auto& meta = other.metaData();
+    for (int i = 0; i < meta.size(); i++)
+        addMetaObject(meta[i]->clone());
+}
+
+void MetaDataStorage::clone(const MetaDataStorage& other)
+{
+    resetMetaData();
+    append(other);
+}
+
+int MetaDataStorage::getMetaObjectIndex(uint32_t meta_type, int index) const
 {
     switch (meta_type)
     {

core/indigo-core/reaction/src/reaction_json_saver.cpp

@@ -82,7 +82,6 @@ void ReactionJsonSaver::saveReactionWithMetaData(BaseReaction& rxn, BaseMolecule
         merged.mergeWithMolecule(rxn.getBaseMolecule(i), 0, 0);
 
     merged.meta() = rxn.meta();
-
     StringBuffer s;
     JsonWriter writer(pretty_json);
     writer.Reset(s);