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

logic: Fixed base and derived classes not correctly at top or bottom

Browse Source 
Prioritize inheritance and override over all other edges.
This commit is contained in:
Eberhard Graether
2016-05-23 15:58:31 +02:00
parent d80a123a5a
commit 4e08d86602
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/helper/BucketGrid.cpp
+14 -5
View File
@@ -172,11 +172,6 @@ void BucketGrid::createBuckets(
DummyNode* owner = findTopMostDummyNodeRecursive(nodes, edge->ownerId);
DummyNode* target = findTopMostDummyNodeRecursive(nodes, edge->targetId);
if (edge->getDirection() == TokenComponentAggregation::DIRECTION_BACKWARD)
{
std::swap(owner, target);
}
bool removeEdge = false;
if (!owner || !target)
{
@@ -185,6 +180,20 @@ void BucketGrid::createBuckets(
else
{
bool horizontal = !owner->bundleInfo.layoutVertical && !target->bundleInfo.layoutVertical;
if (!horizontal)
{
if ((owner->bundleInfo.layoutVertical && owner->bundleInfo.isReferenced) ||
(target->bundleInfo.layoutVertical && target->bundleInfo.isReferencing))
{
std::swap(owner, target);
}
}
else if (edge->getDirection() == TokenComponentAggregation::DIRECTION_BACKWARD)
{
std::swap(owner, target);
}
removeEdge = addNode(owner, target, horizontal);
}