ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-19 03:16:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start placing edges from centre. (#1460)

Browse Source
This commit is contained in:
karliss 2019-04-16 09:58:52 +03:00 committed by Itay Cohen
parent 436c2ee89c
commit 2cc6479faa
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widgets/GraphGridLayout.cpp
View File

@ -228,6 +228,9 @@ void GraphGridLayout::CalculateLayout(std::unordered_map<ut64, GraphBlock> &bloc
} }
// Compute coordinates for edges // Compute coordinates for edges
auto position_from_middle = [](int index, int spacing, int column_count) {
return spacing * (((index & 1) ? 1 : -1) * ((index + 1) / 2) + (column_count - 1) / 2);
};
for (auto &blockIt : blocks) { for (auto &blockIt : blocks) {
GraphBlock &block = blockIt.second; GraphBlock &block = blockIt.second;
@ -242,7 +245,8 @@ void GraphGridLayout::CalculateLayout(std::unordered_map<ut64, GraphBlock> &bloc
auto start_col = start.col; auto start_col = start.col;
auto last_index = edge.start_index; auto last_index = edge.start_index;
// This is the start point of the edge. // This is the start point of the edge.
auto first_pt = QPoint(col_edge_x[start_col] + (layoutConfig.block_horizontal_margin * last_index) + auto first_pt = QPoint(col_edge_x[start_col] +
position_from_middle(last_index, layoutConfig.block_horizontal_margin, col_edge_count[start_col]) +
(layoutConfig.block_horizontal_margin / 2), (layoutConfig.block_horizontal_margin / 2),
block.y + block.height); block.y + block.height);
auto last_pt = first_pt; auto last_pt = first_pt;
@ -257,11 +261,12 @@ void GraphGridLayout::CalculateLayout(std::unordered_map<ut64, GraphBlock> &bloc
QPoint new_pt; QPoint new_pt;
// block_vertical_margin/2 gives the margin from block to the horizontal lines // block_vertical_margin/2 gives the margin from block to the horizontal lines
if (start_col == end_col) if (start_col == end_col)
new_pt = QPoint(last_pt.x(), row_edge_y[end_row] + (layoutConfig.block_vertical_margin * last_index) new_pt = QPoint(last_pt.x(), row_edge_y[end_row] +
+ position_from_middle(last_index, layoutConfig.block_vertical_margin, row_edge_count[end_row]) +
(layoutConfig.block_vertical_margin / 2)); (layoutConfig.block_vertical_margin / 2));
else else
new_pt = QPoint(col_edge_x[end_col] + (layoutConfig.block_horizontal_margin * last_index) + new_pt = QPoint(col_edge_x[end_col] +
position_from_middle(last_index, layoutConfig.block_horizontal_margin, col_edge_count[end_col]) +
(layoutConfig.block_horizontal_margin / 2), last_pt.y()); (layoutConfig.block_horizontal_margin / 2), last_pt.y());
pts.push_back(new_pt); pts.push_back(new_pt);
last_pt = new_pt; last_pt = new_pt;