Implemented diagram append metod (#415)

Author: bkryza

src/class_diagram/model/diagram.cc

@@ -118,6 +118,111 @@ common::optional_ref<clanguml::common::model::diagram_element> diagram::get(
     return res;
 }
 
+void diagram::add_class(std::unique_ptr<class_> &&c)
+{
+    assert(c->id().value() != 0);
+
+    if ((config().generate_packages() &&
+            config().package_type() == config::package_type_t::kDirectory)) {
+        assert(!c->file().empty());
+
+        const auto file = config().make_path_relative(c->file());
+
+        common::model::path p{
+            file.string(), common::model::path_type::kFilesystem};
+        p.pop_back();
+
+        add(p, std::move(c));
+    }
+    else if ((config().generate_packages() &&
+                 config().package_type() == config::package_type_t::kModule)) {
+
+        const auto module_path = config().make_module_relative(c->module());
+
+        common::model::path p{module_path, common::model::path_type::kModule};
+
+        add(p, std::move(c));
+    }
+    else {
+        add(c->path(), std::move(c));
+    }
+}
+
+void diagram::add_objc_interface(std::unique_ptr<objc_interface> &&c)
+{
+    if ((config().generate_packages() &&
+            config().package_type() == config::package_type_t::kDirectory)) {
+        assert(!c->file().empty());
+
+        const auto file = config().make_path_relative(c->file());
+
+        common::model::path p{
+            file.string(), common::model::path_type::kFilesystem};
+        p.pop_back();
+
+        add(p, std::move(c));
+    }
+    else {
+        add(c->path(), std::move(c));
+    }
+}
+
+void diagram::add_enum(std::unique_ptr<enum_> &&e)
+{
+    if ((config().generate_packages() &&
+            config().package_type() == config::package_type_t::kDirectory)) {
+        assert(!e->file().empty());
+
+        const auto file = config().make_path_relative(e->file());
+
+        common::model::path p{
+            file.string(), common::model::path_type::kFilesystem};
+        p.pop_back();
+
+        add(p, std::move(e));
+    }
+    else if ((config().generate_packages() &&
+                 config().package_type() == config::package_type_t::kModule)) {
+
+        const auto module_path = config().make_module_relative(e->module());
+
+        common::model::path p{module_path, common::model::path_type::kModule};
+
+        add(p, std::move(e));
+    }
+    else {
+        add(e->path(), std::move(e));
+    }
+}
+
+void diagram::add_concept(std::unique_ptr<concept_> &&c)
+{
+    if ((config().generate_packages() &&
+            config().package_type() == config::package_type_t::kDirectory)) {
+        assert(!c->file().empty());
+
+        const auto file = config().make_path_relative(c->file());
+
+        common::model::path p{
+            file.string(), common::model::path_type::kFilesystem};
+        p.pop_back();
+
+        add(p, std::move(c));
+    }
+    else if ((config().generate_packages() &&
+                 config().package_type() == config::package_type_t::kModule)) {
+
+        const auto module_path = config().make_module_relative(c->module());
+
+        common::model::path p{module_path, common::model::path_type::kModule};
+
+        add(p, std::move(c));
+    }
+    else {
+        add(c->path(), std::move(c));
+    }
+}
+
 template <>
 bool diagram::add_with_namespace_path<common::model::package>(
     std::unique_ptr<common::model::package> &&p)

src/class_diagram/model/diagram.h

@@ -57,12 +57,17 @@ class diagram : public common::model::diagram,
 public:
     using nested_trait_t = nested_trait_ns;
 
-    diagram() = default;
+    diagram(const config::class_diagram &config)
+        : config_{config}
+    {
+    }
 
     diagram(const diagram &) = delete;
     diagram(diagram &&) = default;
     diagram &operator=(const diagram &) = delete;
-    diagram &operator=(diagram &&) = default;
+    diagram &operator=(diagram &&) = delete;
+
+    const config::class_diagram &config() const { return config_; }
 
     /**
      * @brief Get the diagram model type - in this case class.
@@ -216,6 +221,29 @@ class diagram : public common::model::diagram,
         return add_with_filesystem_path(parent_path, std::move(e));
     }
 
+    /**
+     * @brief Add class (or template class) to the diagram.
+     *
+     * @param c Class model
+     */
+    void add_class(std::unique_ptr<class_> &&c);
+
+    /**
+     * @brief Add enum to the diagram.
+     *
+     * @param e Enum model
+     */
+    void add_enum(std::unique_ptr<enum_> &&e);
+
+    /**
+     * @brief Add concept to the diagram.
+     *
+     * @param c Concept model
+     */
+    void add_concept(std::unique_ptr<concept_> &&c);
+
+    void add_objc_interface(std::unique_ptr<objc_interface> &&c);
+
     template <typename ElementT> void move(eid_t id, const path &parent_path)
     {
         LOG_DBG("Moving element {} to package {}", id.value(),
@@ -278,7 +306,26 @@ class diagram : public common::model::diagram,
 
     void apply_filter() override;
 
+    void append(diagram &&other)
+    {
+        clanguml::common::model::diagram::append(
+            dynamic_cast<clanguml::common::model::diagram &&>(other));
+
+        element_views<class_, enum_, concept_, objc_interface>::append(
+            dynamic_cast<
+                element_views<class_, enum_, concept_, objc_interface> &&>(
+                other));
+
+        nested_trait_t::append(dynamic_cast<nested_trait_t &&>(other));
+
+        for (auto &&ae : other.added_elements_) {
+            added_elements_.emplace(std::move(ae));
+        }
+    }
+
 private:
+    const config::class_diagram &config_;
+
     std::set<eid_t> added_elements_;
 
     template <typename ElementT>