Skip to content
Permalink
Browse files

ui: Fixed group related issues in graph

* 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
  • Loading branch information
egraether committed Apr 11, 2018
1 parent cbd782d commit 5f56a167d176b413fe7259602d1030c219d2909a
@@ -1846,11 +1846,11 @@ void GraphController::layoutNestingRecursive(DummyNode* node) const
break;

case GroupLayout::BUCKET:
if (node->hasActiveSubNode())
if (node->hasActiveSubNode() || !m_activeNodeIds.size() /* aggregations */)
{
BucketLayouter grid(viewSize);
grid.createBuckets(node->subNodes, m_dummyEdges);
grid.layoutBuckets(true);
grid.layoutBuckets(m_activeNodeIds.size());
node->subNodes = grid.getSortedNodes();
}
else
@@ -55,7 +55,7 @@ const DummyNode::BundledNodesSet& Bucket::getNodes() const
return m_nodes;
}

void Bucket::preLayout(Vec2i viewSize, bool addVerticalOffset)
void Bucket::preLayout(Vec2i viewSize, bool addVerticalSplit, bool forceVerticalSplit)
{
int cols = (viewSize.y > 0 ? (m_height / viewSize.y) : 0) + 1;

@@ -111,7 +111,8 @@ void Bucket::preLayout(Vec2i viewSize, bool addVerticalOffset)
}
}

if (!addVerticalOffset || nodesInCol.size() < 2)
addVerticalSplit &= nodesInCol.size() > 1 || forceVerticalSplit;
if (!addVerticalSplit)
{
return;
}
@@ -296,7 +297,7 @@ void BucketLayouter::createBuckets(
}
}

void BucketLayouter::layoutBuckets(bool addVerticalOffset)
void BucketLayouter::layoutBuckets(bool addVerticalSplit)
{
std::map<int, int> widths;
std::map<int, int> heights;
@@ -307,7 +308,7 @@ void BucketLayouter::layoutBuckets(bool addVerticalOffset)
{
Bucket* bucket = &m_buckets[j][i];

bucket->preLayout(m_viewSize, i != 0);
bucket->preLayout(m_viewSize, i != 0, addVerticalSplit);

std::map<int, int>::iterator wt = widths.find(i);
if (wt == widths.end() || wt->second < bucket->getWidth())
@@ -345,11 +346,6 @@ void BucketLayouter::layoutBuckets(bool addVerticalOffset)
Bucket* midBucket = &m_buckets[0][0];
yOff = (heights[0] - midBucket->getHeight()) / 2 * -j;
}
// move every second bucket in a row slighly lower to avoid edges over nodes
else if (addVerticalOffset && std::abs(i) % 2 == 1)
{
yOff = GraphViewStyle::toGridGap(10);
}
// align buckets left and right of center to be vertically centered next to the active node
else if (j == 0 && i != 0 && verticalOffset != 0)
{
@@ -23,7 +23,7 @@ class Bucket
void addNode(std::shared_ptr<DummyNode> node);
const DummyNode::BundledNodesSet& getNodes() const;

void preLayout(Vec2i viewSize, bool addVerticalOffset);
void preLayout(Vec2i viewSize, bool addVerticalSplit, bool forceVerticalSplit);
void layout(int x, int y, int width, int height);

int i;
@@ -44,7 +44,7 @@ class BucketLayouter
void createBuckets(
std::vector<std::shared_ptr<DummyNode>>& nodes,
const std::vector<std::shared_ptr<DummyEdge>>& edges);
void layoutBuckets(bool addVerticalOffset);
void layoutBuckets(bool addVerticalSplit);

std::vector<std::shared_ptr<DummyNode>> getSortedNodes();

@@ -347,7 +347,7 @@ GraphViewStyle::NodeMargins GraphViewStyle::getMarginsOfGroupNode(GroupType type

margins.spacingA = (hasName ? 14 : 0);

margins.left = margins.right = 20;
margins.left = margins.right = 26;
margins.top = (hasName ? 12 : 20);
margins.bottom = 20;

@@ -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);
}
@@ -12,6 +12,7 @@
#include "qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h"
#include "qt/view/graphElements/QtGraphEdge.h"
#include "utility/messaging/type/MessageGraphNodeHide.h"
#include "utility/messaging/type/MessageGraphNodeMove.h"
#include "utility/ResourcePaths.h"
#include "utility/utilityString.h"

@@ -374,6 +375,11 @@ void QtGraphNode::addSubNode(QtGraphNode* node)
void QtGraphNode::moved(const Vec2i& oldPosition)
{
setPosition(GraphViewStyle::alignOnRaster(getPosition()));

if (isDataNode() || isGroupNode() || isBundleNode())
{
MessageGraphNodeMove(getTokenId(), getPosition() - oldPosition).dispatch();
}
}

void QtGraphNode::onClick()
@@ -4,7 +4,6 @@
#include <QPen>

#include "utility/messaging/type/MessageGraphNodeBundleSplit.h"
#include "utility/messaging/type/MessageGraphNodeMove.h"

#include "component/view/GraphViewStyle.h"
#include "qt/graphics/QtCountCircleItem.h"
@@ -47,13 +46,6 @@ void QtGraphNodeBundle::onClick()
).dispatch();
}

void QtGraphNodeBundle::moved(const Vec2i& oldPosition)
{
QtGraphNode::moved(oldPosition);

MessageGraphNodeMove(m_tokenId, getPosition() - oldPosition).dispatch();
}

void QtGraphNodeBundle::updateStyle()
{
GraphViewStyle::NodeStyle style;
@@ -19,7 +19,6 @@ class QtGraphNodeBundle
virtual Id getTokenId() const;

virtual void onClick();
virtual void moved(const Vec2i& oldPosition);
virtual void updateStyle();

protected:
@@ -5,7 +5,6 @@
#include "utility/messaging/type/MessageDeactivateEdge.h"
#include "utility/messaging/type/MessageFocusIn.h"
#include "utility/messaging/type/MessageFocusOut.h"
#include "utility/messaging/type/MessageGraphNodeMove.h"

#include "data/graph/token_component/TokenComponentFilePath.h"

@@ -58,13 +57,6 @@ void QtGraphNodeData::onClick()
MessageActivateNodes(m_data->getId()).dispatch();
}

void QtGraphNodeData::moved(const Vec2i& oldPosition)
{
QtGraphNode::moved(oldPosition);

MessageGraphNodeMove(m_data->getId(), getPosition() - oldPosition).dispatch();
}

void QtGraphNodeData::updateStyle()
{
GraphViewStyle::NodeStyle style = GraphViewStyle::getStyleForNodeType(
@@ -22,7 +22,6 @@ class QtGraphNodeData
virtual Id getTokenId() const;

virtual void onClick();
virtual void moved(const Vec2i& oldPosition);
virtual void updateStyle();

protected:
@@ -25,8 +25,6 @@ QtGraphNodeGroup::QtGraphNodeGroup(
setAcceptHoverEvents(true);
}

setName(name);

if (type == GroupType::FRAMELESS)
{
m_rect->hide();
@@ -38,6 +36,8 @@ QtGraphNodeGroup::QtGraphNodeGroup(
return;
}

setName(name);

m_background = new QGraphicsPolygonItem(this);
m_background->setZValue(-3.f);

@@ -56,6 +56,7 @@ QtGraphNodeGroup::QtGraphNodeGroup(
path.lineTo(width - radius, height);
path.arcTo(width - 2 * radius, height - 2 * radius, 2 * radius, 2 * radius, 270, 90);
path.closeSubpath();
m_path = path;

m_background->setPolygon(path.toFillPolygon());
}
@@ -104,6 +105,16 @@ void QtGraphNodeGroup::updateStyle()
setStyle(style);
}

QPainterPath QtGraphNodeGroup::shape() const
{
if (m_path.isEmpty())
{
m_path.addRect(boundingRect());
}

return m_path;
}

void QtGraphNodeGroup::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
{
if (m_type == GroupType::FILE || m_type == GroupType::NAMESPACE)
@@ -5,6 +5,7 @@
#include "qt/view/graphElements/QtGraphNode.h"

class QGraphicsPolygonItem;
class QPainterPath;

class QtGraphNodeGroup
: public QtGraphNode
@@ -21,6 +22,8 @@ class QtGraphNodeGroup
virtual void onClick();
virtual void updateStyle();

virtual QPainterPath shape() const;

protected:
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event);
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* event);
@@ -31,6 +34,7 @@ class QtGraphNodeGroup
const bool m_interactive;

QGraphicsPolygonItem* m_background = nullptr;
mutable QPainterPath m_path;
};

#endif // QT_GRAPH_NODE_GROUP_H

0 comments on commit 5f56a16

Please sign in to comment.
You can’t perform that action at this time.