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

ui: Improvements and fixes in graph layouting

Browse Source 
* put nodes with bidirectional aggregations on the left
* layout aggregations either horizontal or vertical based on buckets
* exceed bucket height if only one element and vertical split
* fixed hiding nodes in sublayout showed empty spot
This commit is contained in:
Eberhard Graether
2018-04-19 18:54:34 +02:00
parent 1ee4f829a4
commit 5edaedfd37
7 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp
+10 -8
View File
@@ -30,6 +30,7 @@ QtGraphEdge::QtGraphEdge(
const Edge* data,
size_t weight,
bool isActive,
bool horizontal,
TokenComponentAggregation::Direction direction
)
: m_data(data)
@@ -38,10 +39,10 @@ QtGraphEdge::QtGraphEdge(
, m_child(nullptr)
, m_isActive(isActive)
, m_isFocused(false)
, m_isHorizontal(horizontal)
, m_weight(weight)
, m_direction(direction)
, m_isTrailEdge(false)
, m_isHorizontalTrail(false)
, m_useBezier(false)
, m_mousePos(0.0f, 0.0f)
, m_mouseMoved(false)
@@ -117,6 +118,8 @@ void QtGraphEdge::updateLine()
targetParentRect = targetParent->getBoundingRect();
}
QtLineItemBase::Route route = m_isHorizontal ? QtLineItemBase::ROUTE_HORIZONTAL : QtLineItemBase::ROUTE_VERTICAL;
if (m_useBezier)
{
for (QGraphicsItem* item : childItems())
@@ -128,9 +131,6 @@ void QtGraphEdge::updateLine()
style.originOffset.y() = 0;
style.targetOffset.y() = 0;
QtLineItemBase::Route route =
m_isHorizontalTrail ? QtLineItemBase::ROUTE_HORIZONTAL : QtLineItemBase::ROUTE_VERTICAL;
for (const Vec4i& rect : m_path)
{
QtLineItemBezier* bezier = new QtLineItemBezier(this);
@@ -219,7 +219,7 @@ void QtGraphEdge::updateLine()
if (type == Edge::EDGE_INHERITANCE || (type == Edge::EDGE_TEMPLATE_SPECIALIZATION &&
owner == ownerNonGroupParent && target == targetNonGroupParent))
{
child->setRoute(QtLineItemBase::ROUTE_VERTICAL);
route = QtLineItemBase::ROUTE_VERTICAL;
if (target->hasActiveChild())
{
@@ -229,9 +229,11 @@ void QtGraphEdge::updateLine()
else if (type != Edge::EDGE_AGGREGATION ||
owner != ownerNonGroupParent || target != targetNonGroupParent)
{
child->setRoute(QtLineItemBase::ROUTE_HORIZONTAL);
route = QtLineItemBase::ROUTE_HORIZONTAL;
}
child->setRoute(route);
bool showArrow = true;
if (type == Edge::EDGE_AGGREGATION)
{
@@ -471,11 +473,11 @@ void QtGraphEdge::setIsTrailEdge(std::vector<Vec4i> path, bool horizontal)
m_path = path;
m_isTrailEdge = true;
m_useBezier = true;
m_isHorizontalTrail = horizontal;
m_isHorizontal = horizontal;
}
void QtGraphEdge::setUseBezier(bool useBezier)
{
m_useBezier = useBezier;
m_isHorizontalTrail = true;
m_isHorizontal = true;
}