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

ui: Fixed group related issues in graph

Browse Source 
* fixed aggregation layout within group
* fixed moving of group did not resize view
* fixed edges behind group could not be hovered
* fixed overlapping lines in sublayout
* fixed use of correct column width in sublayout
This commit is contained in:
Eberhard Graether
2018-04-11 14:11:53 +02:00
parent cbd782d0c1
commit 5f56a167d1
12 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp
+24 -9
View File
@@ -100,18 +100,21 @@ void QtGraphEdge::updateLine()
Vec4i ownerParentRect;
Vec4i targetParentRect;
const QtGraphNode* ownerParent = owner->getLastParent();
const QtGraphNode* targetParent = target->getLastParent();
const QtGraphNode* ownerNonGroupParent = owner->getLastNonGroupParent();
const QtGraphNode* targetNonGroupParent = target->getLastNonGroupParent();
if (owner->getLastParent() == target->getLastParent() && owner->getLastParent()->isGroupNode())
if (ownerParent == targetParent && ownerParent->isGroupNode())
{
ownerParentRect = ownerNonGroupParent->getBoundingRect();
targetParentRect = targetNonGroupParent->getBoundingRect();
}
else
{
ownerParentRect = owner->getLastParent()->getBoundingRect();
targetParentRect = target->getLastParent()->getBoundingRect();
ownerParentRect = ownerParent->getBoundingRect();
targetParentRect = targetParent->getBoundingRect();
}
if (m_useBezier)
@@ -168,10 +171,22 @@ void QtGraphEdge::updateLine()
}
else
{
const Vec2i& ownerColumnSize = m_owner->getLastParent()->getColumnSize();
const Vec2i& targetColumnSize = m_target->getLastParent()->getColumnSize();
ownerParentRect.z = std::max(ownerParentRect.x + ownerColumnSize.x, ownerParentRect.z());
targetParentRect.z = std::max(targetParentRect.x + targetColumnSize.x, targetParentRect.z());
const Vec2i* ownerColumnSize;
const Vec2i* targetColumnSize;
if (ownerParent != targetParent)
{
ownerColumnSize = &ownerParent->getColumnSize();
targetColumnSize = &targetParent->getColumnSize();
}
else
{
ownerColumnSize = &ownerNonGroupParent->getColumnSize();
targetColumnSize = &targetNonGroupParent->getColumnSize();
}
ownerParentRect.z = std::max(ownerParentRect.x + ownerColumnSize->x, ownerParentRect.z());
targetParentRect.z = std::max(targetParentRect.x + targetColumnSize->x, targetParentRect.z());
if (!m_child)
{
@@ -202,7 +217,7 @@ void QtGraphEdge::updateLine()
}
if (type == Edge::EDGE_INHERITANCE || (type == Edge::EDGE_TEMPLATE_SPECIALIZATION &&
owner == owner->getLastNonGroupParent() && target == target->getLastNonGroupParent()))
owner == ownerNonGroupParent && target == targetNonGroupParent))
{
child->setRoute(QtLineItemBase::ROUTE_VERTICAL);
@@ -212,7 +227,7 @@ void QtGraphEdge::updateLine()
}
}
else if (type != Edge::EDGE_AGGREGATION ||
owner != owner->getLastNonGroupParent() || target != target->getLastNonGroupParent())
owner != ownerNonGroupParent || target != targetNonGroupParent)
{
child->setRoute(QtLineItemBase::ROUTE_HORIZONTAL);
}