matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabled subclass filter to generate class inheritance diagram

Browse Source
This commit is contained in:
Bartek Kryza
2022-03-29 00:26:21 +02:00
parent ece02c09df
commit 3d7c446d57
62 changed files with 253 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/class_diagram/generators/plantuml/class_diagram_generator.cc
View File

@@ -355,14 +355,18 @@ void generator::generate(const package &p, std::ostream &ostr,
generate(sp, ostr, relationships_ostr);
}
else if (dynamic_cast<class_ *>(subpackage.get())) {
generate_alias(dynamic_cast<class_ &>(*subpackage), ostr);
generate(
dynamic_cast<class_ &>(*subpackage), ostr, relationships_ostr);
if (m_model.should_include(*subpackage)) {
generate_alias(dynamic_cast<class_ &>(*subpackage), ostr);
generate(dynamic_cast<class_ &>(*subpackage), ostr,
relationships_ostr);
}
}
else if (dynamic_cast<enum_ *>(subpackage.get())) {
generate_alias(dynamic_cast<enum_ &>(*subpackage), ostr);
generate(
dynamic_cast<enum_ &>(*subpackage), ostr, relationships_ostr);
if (m_model.should_include(*subpackage)) {
generate_alias(dynamic_cast<enum_ &>(*subpackage), ostr);
generate(dynamic_cast<enum_ &>(*subpackage), ostr,
relationships_ostr);
}
}
}
@@ -392,12 +396,16 @@ void generator::generate(std::ostream &ostr) const
generate(sp, ostr, relationships_ostr);
}
else if (dynamic_cast<class_ *>(p.get())) {
generate_alias(dynamic_cast<class_ &>(*p), ostr);
generate(dynamic_cast<class_ &>(*p), ostr, relationships_ostr);
if (m_model.should_include(*p)) {
generate_alias(dynamic_cast<class_ &>(*p), ostr);
generate(dynamic_cast<class_ &>(*p), ostr, relationships_ostr);
}
}
else if (dynamic_cast<enum_ *>(p.get())) {
generate_alias(dynamic_cast<enum_ &>(*p), ostr);
generate(dynamic_cast<enum_ &>(*p), ostr, relationships_ostr);
if (m_model.should_include(*p)) {
generate_alias(dynamic_cast<enum_ &>(*p), ostr);
generate(dynamic_cast<enum_ &>(*p), ostr, relationships_ostr);
}
}
ostr << '\n';
}

14
src/class_diagram/model/diagram.cc
View File

@@ -124,14 +124,12 @@ void diagram::get_parents(
{
bool found_new = false;
for (const auto &parent : parents) {
for (const auto &rel : parent.get().relationships()) {
if (rel.type() == common::model::relationship_t::kExtension) {
const auto p = get_class(rel.destination());
if (p.has_value()) {
auto [it, found] = parents.emplace(p.value());
if (found)
found_new = true;
}
for (const auto &pp : parent.get().parents()) {
const auto p = get_class(pp.name());
if (p.has_value()) {
auto [it, found] = parents.emplace(p.value());
if (found)
found_new = true;
}
}
}

3
src/class_diagram/visitor/translation_unit_context.cc
View File

@@ -184,7 +184,8 @@ clanguml::class_diagram::model::diagram &translation_unit_context::diagram()
return diagram_;
}
clanguml::class_diagram::model::diagram &translation_unit_context::diagram() const
clanguml::class_diagram::model::diagram &
translation_unit_context::diagram() const
{
return diagram_;
}

13
src/class_diagram/visitor/translation_unit_visitor.cc
View File

@@ -241,13 +241,13 @@ void translation_unit_visitor::process_namespace(
auto usn = ctx.config().using_namespace();
if (ctx.diagram().should_include(package_path)) {
auto p = std::make_unique<common::model::package>(usn);
package_path = package_path.relative_to(usn);
auto p = std::make_unique<common::model::package>(usn);
package_path = package_path.relative_to(usn);
p->set_name(e.name());
p->set_namespace(package_parent);
p->set_name(e.name());
p->set_namespace(package_parent);
if (ctx.diagram().should_include(*p)) {
if (e.comment().has_value())
p->set_comment(e.comment().value());
@@ -580,7 +580,8 @@ void translation_unit_visitor::process_class_bases(
cx::util::ns(base.type(), ctx.entity_index())};
base_ns = base_ns | common::model::namespace_{base.name()}.name();
cp.set_name(
base_ns.relative_to(ctx.config().using_namespace()).to_string());
// base_ns.relative_to(ctx.config().using_namespace()).to_string());
base_ns.to_string());
cp.is_virtual(base.is_virtual());
switch (base.access_specifier()) {