fix some serialization regressions

monadgroup · Jul 21, 2018 · 28a1fa3 · 28a1fa3
1 parent b116ef6
commit 28a1fa3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/editor/model/Library.cpp b/editor/model/Library.cpp
@@ -15,7 +15,14 @@ Library::~Library() = default;
 
 Library::Library(QString activeTag, QString activeSearch,
                  std::vector<std::unique_ptr<AxiomModel::LibraryEntry>> entries)
-    : _entries(std::move(entries)), _activeTag(std::move(activeTag)), _activeSearch(std::move(activeSearch)) {}
+    : _entries(std::move(entries)), _activeTag(std::move(activeTag)), _activeSearch(std::move(activeSearch)) {
+    // add tags of all entries
+    for (const auto &entry : _entries) {
+        for (const auto &tag : entry->tags()) {
+            addTag(tag);
+        }
+    }
+}
 
 void Library::import(
     AxiomModel::Library *library,

diff --git a/editor/model/serialize/ModelObjectSerializer.h b/editor/model/serialize/ModelObjectSerializer.h
@@ -35,7 +35,7 @@ namespace AxiomModel {
             for (const auto &obj : objects) {
                 QByteArray objectBuffer;
                 QDataStream objectStream(&objectBuffer, QIODevice::WriteOnly);
-                serialize(obj, stream, parent);
+                serialize(obj, objectStream, parent);
                 stream << objectBuffer;
             }
         }

diff --git a/editor/model/serialize/NodeSerializer.cpp b/editor/model/serialize/NodeSerializer.cpp
@@ -36,6 +36,7 @@ std::unique_ptr<Node> NodeSerializer::deserialize(QDataStream &stream, uint32_t
 
     QPoint pos;
     stream >> pos;
+    pos = ref->mapPos(parentUuid, pos);
 
     QSize size;
     stream >> size;

diff --git a/editor/model/serialize/ProjectSerializer.cpp b/editor/model/serialize/ProjectSerializer.cpp
@@ -27,6 +27,7 @@ bool ProjectSerializer::readHeader(QDataStream &stream, uint64_t expectedMagic,
 void ProjectSerializer::serialize(AxiomModel::Project *project, QDataStream &stream) {
     writeHeader(stream, projectSchemaMagic);
     ModelObjectSerializer::serializeRoot(&project->mainRoot(), stream);
+    LibrarySerializer::serialize(&project->library(), stream);
 }
 
 std::unique_ptr<Project> ProjectSerializer::deserialize(QDataStream &stream, uint32_t *versionOut) {