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

16
src/common/model/diagram.cc
View File

@@ -40,28 +40,36 @@ void diagram::set_filter(std::unique_ptr<diagram_filter> filter)
filter_ = std::move(filter);
}
bool diagram::should_include(const element &e) const {
void diagram::set_complete(bool complete) { complete_ = complete; }
bool diagram::complete() const { return complete_; }
bool diagram::should_include(const element &e) const
{
if (filter_.get() == nullptr)
return true;
return filter_->should_include(e);
}
bool diagram::should_include(const std::string &name) const {
bool diagram::should_include(const std::string &name) const
{
if (filter_.get() == nullptr)
return true;
return filter_->should_include(name);
}
bool diagram::should_include(const relationship_t r) const {
bool diagram::should_include(const relationship_t r) const
{
if (filter_.get() == nullptr)
return true;
return filter_->should_include(r);
}
bool diagram::should_include(const scope_t s) const {
bool diagram::should_include(const scope_t s) const
{
if (filter_.get() == nullptr)
return true;

4
src/common/model/diagram.h
View File

@@ -44,6 +44,9 @@ public:
void set_filter(std::unique_ptr<diagram_filter> filter);
void set_complete(bool complete);
bool complete() const;
// TODO: refactor to a template method
bool should_include(const element &e) const;
bool should_include(const std::string &e) const;
@@ -55,6 +58,7 @@ public:
private:
std::string name_;
std::unique_ptr<diagram_filter> filter_;
bool complete_{false};
};
}

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

@@ -20,7 +20,8 @@
namespace clanguml::common::model {
std::optional<bool> filter_visitor::match(const diagram &d, const common::model::element &e)
std::optional<bool> filter_visitor::match(
const diagram &d, const common::model::element &e)
{
return {};
}
@@ -31,7 +32,8 @@ std::optional<bool> filter_visitor::match(
return {};
}
std::optional<bool> filter_visitor::match(const diagram &d, const common::model::scope_t &r)
std::optional<bool> filter_visitor::match(
const diagram &d, const common::model::scope_t &r)
{
return {};
}

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

@@ -61,19 +61,34 @@ struct namespace_filter : public filter_visitor {
std::optional<bool> match(const diagram &d, const namespace_ &ns) override
{
if (namespaces_.empty())
if (namespaces_.empty() || ns.is_empty())
return {};
return std::any_of(namespaces_.begin(), namespaces_.end(),
[&ns](const auto &nsit) { return ns.starts_with(nsit); });
return std::any_of(
namespaces_.begin(), namespaces_.end(), [&ns](const auto &nsit) {
return ns.starts_with(nsit) || ns == nsit;
});
}
std::optional<bool> match(const diagram &d, const element &e) override
{
return std::any_of(
namespaces_.begin(), namespaces_.end(), [&e](const auto &nsit) {
return e.get_namespace().starts_with(nsit);
});
if (namespaces_.empty())
return {};
if (dynamic_cast<const package *>(&e) != nullptr) {
return std::any_of(
namespaces_.begin(), namespaces_.end(), [&e](const auto &nsit) {
return (e.get_namespace() | e.name()).starts_with(nsit) ||
nsit.starts_with(e.get_namespace() | e.name()) ||
(e.get_namespace() | e.name()) == nsit;
});
}
else {
return std::any_of(
namespaces_.begin(), namespaces_.end(), [&e](const auto &nsit) {
return e.get_namespace().starts_with(nsit);
});
}
}
std::vector<namespace_> namespaces_;
@@ -114,6 +129,9 @@ struct subclass_filter : public filter_visitor {
if (roots_.empty())
return {};
if (!d.complete())
return {};
const auto &cd = dynamic_cast<const class_diagram::model::diagram &>(d);
// First get all parents of element e
@@ -200,11 +218,14 @@ struct context_filter : public filter_visitor {
std::optional<bool> match(const diagram &d, const element &r) override
{
if (!d.complete())
return {};
if (context_.empty())
return {};
return std::any_of(context_.begin(), context_.end(),
[&r](const auto &rel) { return true; });
[&r](const auto &rel) { return std::optional<bool>{}; });
}
std::vector<std::string> context_;
@@ -248,7 +269,7 @@ public:
auto m = ex->match(diagram_, e);
// Return a match if a filter is undefined for specific element
// or it's a match
return !m.has_value() || m.value();
return m.has_value() && m.value();
});
if (exc)
return false;
@@ -274,18 +295,14 @@ private:
if (c.include) {
inclusive_.emplace_back(std::make_unique<namespace_filter>(
filter_t::kInclusive, c.include().namespaces));
inclusive_.emplace_back(std::make_unique<relationship_filter>(
filter_t::kInclusive, c.include().relationships));
inclusive_.emplace_back(std::make_unique<scope_filter>(
filter_t::kInclusive, c.include().scopes));
inclusive_.emplace_back(std::make_unique<element_filter>(
filter_t::kInclusive, c.include().elements));
inclusive_.emplace_back(std::make_unique<subclass_filter>(
filter_t::kInclusive, c.include().subclasses));
inclusive_.emplace_back(std::make_unique<context_filter>(
filter_t::kInclusive, c.include().context));
}
@@ -308,9 +325,8 @@ private:
}
std::vector<std::unique_ptr<filter_visitor>> inclusive_;
// std::vector<std::unique_ptr<filter_visitor>> inclusive_and_;
std::vector<std::unique_ptr<filter_visitor>> exclusive_;
const common::model::diagram &diagram_;
};