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

Added option style to plantuml config section

Browse Source
This commit is contained in:
Bartek Kryza
2024-03-03 17:01:31 +01:00
parent c4ec8bef8a
commit 76fa811869
34 changed files with 363 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/class_diagram/generators/mermaid/class_diagram_generator.cc
View File

@@ -287,8 +287,8 @@ void generator::generate(const concept_ &c, std::ostream &ostr) const
ostr << indent(1) << "class"
<< " " << c.alias();
if (!c.style().empty())
ostr << " " << c.style();
if (!c.style())
ostr << " " << c.style().value();
ostr << " {" << '\n';
ostr << indent(2) << "<<concept>>\n";

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

@@ -108,7 +108,7 @@ void generator::generate_alias(const concept_ &c, std::ostream &ostr) const
if (config().generate_fully_qualified_name())
ostr << "class"
<< " \"" << c.name();
<< " \"" << c.full_name_no_ns();
else
ostr << "class"
<< " \"" << render_name(c.full_name());
@@ -137,8 +137,7 @@ void generator::generate(const class_ &c, std::ostream &ostr) const
common_generator<diagram_config, diagram_model>::generate_link(ostr, c);
}
if (!c.style().empty())
ostr << " " << c.style();
generate_style(ostr, c.type_name(), c);
ostr << " {" << '\n';
@@ -169,8 +168,7 @@ void generator::generate(const class_ &c, std::ostream &ostr) const
catch (error::uml_alias_missing &e) {
LOG_DBG("Skipping {} relation from {} to {} due "
"to: {}",
plantuml_common::to_plantuml(r.type(), r.style()),
c.full_name(), r.destination(), e.what());
to_string(r.type()), c.full_name(), r.destination(), e.what());
}
}
@@ -378,8 +376,7 @@ void generator::generate(const concept_ &c, std::ostream &ostr) const
common_generator<diagram_config, diagram_model>::generate_link(ostr, c);
}
if (!c.style().empty())
ostr << " " << c.style();
generate_style(ostr, c.type_name(), c);
ostr << " {" << '\n';
@@ -444,8 +441,7 @@ void generator::generate_relationship(
{
namespace plantuml_common = clanguml::common::generators::plantuml;
LOG_DBG("Processing relationship {}",
plantuml_common::to_plantuml(r.type(), r.style()));
LOG_DBG("Processing relationship {}", to_string(r.type()));
std::string destination;
@@ -463,7 +459,7 @@ void generator::generate_relationship(
if (!r.multiplicity_source().empty())
puml_relation += "\"" + r.multiplicity_source() + "\" ";
puml_relation += plantuml_common::to_plantuml(r.type(), r.style());
puml_relation += plantuml_common::to_plantuml(r, config());
if (!r.multiplicity_destination().empty())
puml_relation += " \"" + r.multiplicity_destination() + "\"";
@@ -491,7 +487,7 @@ void generator::generate_relationships(
continue;
LOG_DBG("== Processing relationship {}",
plantuml_common::to_plantuml(r.type(), r.style()));
plantuml_common::to_plantuml(r, config()));
std::stringstream relstr;
clanguml::common::id_t destination{0};
@@ -502,7 +498,7 @@ void generator::generate_relationships(
if (!r.multiplicity_source().empty())
puml_relation += "\"" + r.multiplicity_source() + "\" ";
puml_relation += plantuml_common::to_plantuml(r.type(), r.style());
puml_relation += plantuml_common::to_plantuml(r, config());
if (!r.multiplicity_destination().empty())
puml_relation += " \"" + r.multiplicity_destination() + "\"";
@@ -541,8 +537,7 @@ void generator::generate_relationships(
catch (error::uml_alias_missing &e) {
LOG_DBG("=== Skipping {} relation from {} to {} due "
"to: {}",
plantuml_common::to_plantuml(r.type(), r.style()),
c.full_name(), destination, e.what());
to_string(r.type()), c.full_name(), destination, e.what());
}
}
@@ -587,8 +582,7 @@ void generator::generate_relationships(
if (!model().should_include(r.type()))
continue;
LOG_DBG("== Processing relationship {}",
plantuml_common::to_plantuml(r.type(), r.style()));
LOG_DBG("== Processing relationship {}", to_string(r.type()));
std::stringstream relstr;
clanguml::common::id_t destination{0};
@@ -599,7 +593,7 @@ void generator::generate_relationships(
if (!r.multiplicity_source().empty())
puml_relation += "\"" + r.multiplicity_source() + "\" ";
puml_relation += plantuml_common::to_plantuml(r.type(), r.style());
puml_relation += plantuml_common::to_plantuml(r, config());
if (!r.multiplicity_destination().empty())
puml_relation += " \"" + r.multiplicity_destination() + "\"";
@@ -638,8 +632,7 @@ void generator::generate_relationships(
catch (error::uml_alias_missing &e) {
LOG_DBG("=== Skipping {} relation from {} to {} due "
"to: {}",
plantuml_common::to_plantuml(r.type(), r.style()),
c.full_name(), destination, e.what());
to_string(r.type()), c.full_name(), destination, e.what());
}
}
@@ -654,8 +647,7 @@ void generator::generate(const enum_ &e, std::ostream &ostr) const
common_generator<diagram_config, diagram_model>::generate_link(ostr, e);
}
if (!e.style().empty())
ostr << " " << e.style();
generate_style(ostr, e.type_name(), e);
ostr << " {" << '\n';
@@ -687,7 +679,7 @@ void generator::generate_relationships(const enum_ &e, std::ostream &ostr) const
relstr << e.alias() << " "
<< clanguml::common::generators::plantuml::to_plantuml(
r.type(), r.style())
r, config())
<< " " << target_alias;
if (!r.label().empty())
@@ -701,7 +693,7 @@ void generator::generate_relationships(const enum_ &e, std::ostream &ostr) const
LOG_DBG("Skipping {} relation from {} to {} due "
"to: {}",
clanguml::common::generators::plantuml::to_plantuml(
r.type(), r.style()),
r, config()),
e.full_name(), destination, ex.what());
}
}
@@ -724,8 +716,7 @@ void generator::generate(const package &p, std::ostream &ostr) const
if (p.is_deprecated())
ostr << " <<deprecated>>";
if (!p.style().empty())
ostr << " " << p.style();
generate_style(ostr, p.type_name(), p);
ostr << " {" << '\n';
}

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

@@ -462,12 +462,12 @@ void translation_unit_visitor::process_constraint_requirements(
parm_var_decl) {
parm_var_decl->getQualifiedNameAsString();
auto param_name = parm_var_decl->getQualifiedNameAsString();
auto param_name = parm_var_decl->getNameAsString();
auto param_type = common::to_string(
parm_var_decl->getType(), cpt->getASTContext());
LOG_DBG("=== Processing parameter variable declaration: {}, {}",
param_name, param_type);
param_type, param_name);
concept_model.add_parameter(
{std::move(param_type), std::move(param_name)});