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

ui: Fixed derived bundle layouted to wrong bucket

Browse Source
This commit is contained in:
Eberhard Graether
2016-05-31 14:02:30 +02:00
parent dfcb9214f4
commit 2660465b31
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+17 -3
View File
@@ -607,6 +607,17 @@ void GraphController::bundleNodes()
}
}
// Left for debugging
// for (std::shared_ptr<DummyNode> node : m_dummyNodes)
// {
// std::cout << node->bundleInfo.isActive << " ";
// std::cout << node->bundleInfo.isDefined << " ";
// std::cout << node->bundleInfo.layoutVertical << " ";
// std::cout << node->bundleInfo.isReferenced << " ";
// std::cout << node->bundleInfo.isReferencing << " ";
// std::cout << node->name << std::endl;
// }
// bundle
bundleNodesAndEdgesMatching(
[](const DummyNode::BundleInfo& info)
@@ -701,8 +712,11 @@ void GraphController::bundleNodesAndEdgesMatching(
m_dummyNodes.erase(m_dummyNodes.begin() + matchedNodeIndices[i]);
}
bundleNode->tokenId = bundleNode->bundledNodes[0]->data->getId();
bundleNode->bundleInfo.layoutVertical = bundleNode->bundledNodes[0]->bundleInfo.layoutVertical;
DummyNode* firstNode = bundleNode->bundledNodes[0].get();
bundleNode->tokenId = firstNode->data->getId();
bundleNode->bundleInfo.layoutVertical = firstNode->bundleInfo.layoutVertical;
bundleNode->bundleInfo.isReferenced = firstNode->bundleInfo.isReferenced;
bundleNode->bundleInfo.isReferencing = firstNode->bundleInfo.isReferencing;
m_dummyNodes.push_back(bundleNode);
if (m_dummyEdges.size() == 0)
@@ -740,7 +754,7 @@ void GraphController::bundleNodesAndEdgesMatching(
std::shared_ptr<DummyEdge> bundleEdge = std::make_shared<DummyEdge>();
bundleEdge->visible = true;
bundleEdge->ownerId = (owner ? edge->targetId : edge->ownerId);
bundleEdge->targetId = bundleNode->bundledNodes.front()->data->getId();
bundleEdge->targetId = bundleNode->tokenId;
bundleEdges.push_back(bundleEdge);
bundleEdgePtr = bundleEdges.back().get();
}