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

Fixed package diagram generation after refactoring class diagram model

Browse Source
This commit is contained in:
Bartek Kryza
2022-02-23 21:35:40 +01:00
parent 1c619a9695
commit af38f56046
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,8 +229,7 @@ void translation_unit_visitor::process_namespace(
auto usn = util::split(ctx.config().using_namespace()[0], "::"); auto usn = util::split(ctx.config().using_namespace()[0], "::");
if (!util::starts_with(usn, package_path)) { if (!util::starts_with(usn, package_path)) {
auto p = std::make_unique<common::model::package>( auto p = std::make_unique<common::model::package>(usn);
util::split(ctx.config().using_namespace()[0], "::"));
util::remove_prefix(package_path, usn); util::remove_prefix(package_path, usn);
p->set_name(e.name()); p->set_name(e.name());

8
src/package_diagram/visitor/translation_unit_visitor.cc
View File

@@ -98,10 +98,8 @@ void translation_unit_visitor::operator()(const cppast::cpp_entity &file)
ctx.config().using_namespace()[0], "::"); ctx.config().using_namespace()[0], "::");
if (!util::starts_with(usn, package_path)) { if (!util::starts_with(usn, package_path)) {
auto p = std::make_unique<package>( auto p = std::make_unique<package>(usn);
ctx.config().using_namespace());
util::remove_prefix(package_path, usn); util::remove_prefix(package_path, usn);
util::remove_prefix(package_parent, usn);
p->set_name(e.name()); p->set_name(e.name());
p->set_namespace(package_parent); p->set_namespace(package_parent);
@@ -122,8 +120,8 @@ void translation_unit_visitor::operator()(const cppast::cpp_entity &file)
} }
if (!p->skip()) { if (!p->skip()) {
ctx.diagram().add_element( auto rns = p->get_relative_namespace();
package_parent, std::move(p)); ctx.diagram().add_element(rns, std::move(p));
ctx.set_current_package( ctx.set_current_package(
ctx.diagram().get_element<package>( ctx.diagram().get_element<package>(
package_path)); package_path));