ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-21 14:16:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make graph layout more failure resistant. (#1427)

Browse Source
This commit is contained in:
karliss 2019-04-05 09:28:11 +03:00 committed by Itay Cohen
parent 158ed7a656
commit df65f250e5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/GraphGridLayout.cpp
View File

@ -123,6 +123,10 @@ void GraphGridLayout::CalculateLayout(std::unordered_map<ut64, GraphBlock> &bloc
auto block_order = topoSort(layoutState, entry); auto block_order = topoSort(layoutState, entry);
computeBlockPlacement(entry, layoutState); computeBlockPlacement(entry, layoutState);
for (auto &blockIt : blocks) {
layoutState.edge[blockIt.first].resize(blockIt.second.edges.size());
}
// Prepare edge routing // Prepare edge routing
auto &entryb = layoutState.grid_blocks[entry]; auto &entryb = layoutState.grid_blocks[entry];
EdgesVector horiz_edges, vert_edges; EdgesVector horiz_edges, vert_edges;
@ -145,9 +149,10 @@ void GraphGridLayout::CalculateLayout(std::unordered_map<ut64, GraphBlock> &bloc
for (ut64 blockId : block_order) { for (ut64 blockId : block_order) {
GraphBlock &block = blocks[blockId]; GraphBlock &block = blocks[blockId];
GridBlock &start = layoutState.grid_blocks[blockId]; GridBlock &start = layoutState.grid_blocks[blockId];
size_t i = 0;
for (const auto &edge : block.edges) { for (const auto &edge : block.edges) {
GridBlock &end = layoutState.grid_blocks[edge.target]; GridBlock &end = layoutState.grid_blocks[edge.target];
layoutState.edge[blockId].push_back(routeEdge(horiz_edges, vert_edges, edge_valid, start, end)); layoutState.edge[blockId][i++] = routeEdge(horiz_edges, vert_edges, edge_valid, start, end);
} }
} }
@ -237,6 +242,10 @@ void GraphGridLayout::CalculateLayout(std::unordered_map<ut64, GraphBlock> &bloc
size_t index = 0; size_t index = 0;
assert(block.edges.size() == layoutState.edge[block.entry].size()); assert(block.edges.size() == layoutState.edge[block.entry].size());
for (GridEdge &edge : layoutState.edge[block.entry]) { for (GridEdge &edge : layoutState.edge[block.entry]) {
if (edge.points.empty()) {
qDebug() << "Warning, unrouted edge.";
continue;
}
auto start = edge.points[0]; auto start = edge.points[0];
auto start_col = start.col; auto start_col = start.col;
auto last_index = edge.start_index; auto last_index = edge.start_index;

3
src/widgets/GraphView.cpp
View File

@ -158,6 +158,9 @@ void GraphView::paintEvent(QPaintEvent *event)
// TODO: Only draw edges if they are actually visible ... // TODO: Only draw edges if they are actually visible ...
// Draw edges // Draw edges
for (GraphEdge &edge : block.edges) { for (GraphEdge &edge : block.edges) {
if (edge.polyline.empty()) {
continue;
}
QPolygonF polyline = recalculatePolygon(edge.polyline); QPolygonF polyline = recalculatePolygon(edge.polyline);
EdgeConfiguration ec = edgeConfiguration(block, &blocks[edge.target]); EdgeConfiguration ec = edgeConfiguration(block, &blocks[edge.target]);
QPen pen(ec.color); QPen pen(ec.color);