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

Fixed handling of enums in class diagram context filter (#275)

Browse Source
This commit is contained in:
Bartek Kryza
2024-05-31 19:09:28 +02:00
parent 9ad5336d83
commit 1283364ef4
6 changed files with 69 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/common/model/diagram_filter.cc
View File

@@ -669,6 +669,24 @@ void context_filter::initialize_effective_context(
effective_context.emplace(maybe_match.value().id());
}
const auto &context_enum_matches =
dynamic_cast<const class_diagram::model::diagram &>(d)
.find<class_diagram::model::enum_>(context.pattern);
for (const auto &maybe_match : context_enum_matches) {
if (maybe_match)
effective_context.emplace(maybe_match.value().id());
}
const auto &context_concept_matches =
dynamic_cast<const class_diagram::model::diagram &>(d)
.find<class_diagram::model::concept_>(context.pattern);
for (const auto &maybe_match : context_concept_matches) {
if (maybe_match)
effective_context.emplace(maybe_match.value().id());
}
// Now repeat radius times - extend the effective context with elements
// matching in direct relationship to what is in context
auto radius_counter = context.radius;
@@ -688,14 +706,14 @@ void context_filter::initialize_effective_context(
find_elements_inheritance_relationship(
d, effective_context, current_iteration_context);
// For each enum in the model
find_elements_in_relationship_with_enum(
d, effective_context, current_iteration_context);
// For each concept in the model
find_elements_in_direct_relationship<class_diagram::model::concept_>(
d, effective_context, current_iteration_context);
// For each enum in the model
find_elements_in_direct_relationship<class_diagram::model::enum_>(
d, effective_context, current_iteration_context);
for (auto id : current_iteration_context) {
if (effective_context.count(id) == 0) {
// Found new element to add to context
@@ -706,31 +724,6 @@ void context_filter::initialize_effective_context(
}
}
void context_filter::find_elements_in_relationship_with_enum(const diagram &d,
std::set<id_t> &effective_context,
std::set<clanguml::common::id_t> &current_iteration_context) const
{
const auto &cd = dynamic_cast<const class_diagram::model::diagram &>(d);
for (const auto &enm : cd.enums()) {
for (const auto &ec : effective_context) {
const auto &maybe_class = cd.find<class_diagram::model::class_>(ec);
if (!maybe_class)
continue;
for (const relationship &rel :
maybe_class.value().relationships()) {
if (d.should_include(rel.type()) &&
rel.destination() == enm.get().id())
current_iteration_context.emplace(enm.get().id());
}
}
}
}
void context_filter::find_elements_inheritance_relationship(const diagram &d,
std::set<id_t> &effective_context,
std::set<clanguml::common::id_t> &current_iteration_context) const

25
src/common/model/diagram_filter.h
View File

@@ -496,27 +496,34 @@ private:
std::set<clanguml::common::id_t> &current_iteration_context) const
{
static_assert(std::is_same_v<ElementT, class_diagram::model::class_> ||
std::is_same_v<ElementT, class_diagram::model::enum_> ||
std::is_same_v<ElementT, class_diagram::model::concept_>,
"ElementT must be either class_ or concept_");
"ElementT must be either class_ or enum_ or concept_");
const auto &cd = dynamic_cast<const class_diagram::model::diagram &>(d);
for (const auto &el : cd.elements<ElementT>()) {
// First search all elements of type ElementT in the diagram
// which have a relationship to any of the effective_context
// elements
for (const relationship &rel : el.get().relationships()) {
for (const auto &ec : effective_context) {
if (d.should_include(rel.type()) && rel.destination() == ec)
for (const auto &element_id : effective_context) {
if (d.should_include(rel.type()) &&
rel.destination() == element_id)
current_iteration_context.emplace(el.get().id());
}
}
for (const auto &ec : effective_context) {
const auto &maybe_concept = cd.find<ElementT>(ec);
// Now search current effective_context elements and add any
// elements of any type in the diagram which to that element
for (const auto element_id : effective_context) {
const auto &maybe_element = cd.get(element_id);
if (!maybe_concept)
if (!maybe_element)
continue;
for (const relationship &rel :
maybe_concept.value().relationships()) {
maybe_element.value().relationships()) {
if (d.should_include(rel.type()) &&
rel.destination() == el.get().id())
@@ -530,10 +537,6 @@ private:
std::set<id_t> &effective_context,
std::set<clanguml::common::id_t> &current_iteration_context) const;
void find_elements_in_relationship_with_enum(const diagram &d,
std::set<id_t> &effective_context,
std::set<clanguml::common::id_t> &current_iteration_context) const;
std::vector<config::context_config> context_;
/*!