ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Fixed bundling of referencing types

Browse Source
This commit is contained in:
Eberhard Graether
2016-04-22 00:09:43 +02:00
parent 780530ba3c
commit 1b23a44f20
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+16 -3
View File
@@ -701,7 +701,7 @@ bool GraphController::isTypeNodeWithSingleAggregation(
if (count > 1) if (count > 1)
{ {
return false; matches = false;
} }
return matches; return matches;
@@ -812,13 +812,26 @@ bool GraphController::isTypeUserNode(const DummyNode& node) const
n->forEachEdge( n->forEachEdge(
[tokenId, &matches](Edge* edge) [tokenId, &matches](Edge* edge)
{ {
if (edge->isType(Edge::EDGE_MEMBER | Edge::EDGE_AGGREGATION)) if (edge->isType(Edge::EDGE_MEMBER))
{ {
return; return;
} }
if (edge->isType(Edge::EDGE_AGGREGATION))
{
TokenComponentAggregation::Direction dir =
edge->getComponent<TokenComponentAggregation>()->getDirection();
if ((dir == TokenComponentAggregation::DIRECTION_FORWARD && edge->getTo()->getId() == tokenId) ||
(dir == TokenComponentAggregation::DIRECTION_BACKWARD && edge->getTo()->getId() != tokenId))
{
matches = false;
}
return;
}
if (!edge->isType(Edge::EDGE_TYPE_USAGE | Edge::EDGE_TYPE_OF | Edge::EDGE_TEMPLATE_ARGUMENT | Edge::EDGE_TYPEDEF_OF) || if (!edge->isType(Edge::EDGE_TYPE_USAGE | Edge::EDGE_TYPE_OF | Edge::EDGE_TEMPLATE_ARGUMENT | Edge::EDGE_TYPEDEF_OF) ||
edge->getFrom()->getId() != tokenId) edge->getTo()->getId() == tokenId)
{ {
matches = false; matches = false;
} }