oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodeview: further improved auto-positioning system

Browse Source
This commit is contained in:
itsmattkc
2020-05-08 19:20:24 +10:00
parent 12672aae7c
commit 1efd4e9f99
4 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeview/nodeview.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ NodeView::NodeView(QWidget *parent) :
drop_edge_(nullptr)
{
setScene(&scene_);
setDragMode(RubberBandDrag);
SetDefaultDragMode(RubberBandDrag);
setContextMenuPolicy(Qt::CustomContextMenu);
setMouseTracking(true);
setRenderHint(QPainter::Antialiasing);
app/widget/nodeview/nodeviewscene.cpp
+11 -6
View File
@@ -229,7 +229,9 @@ int NodeViewScene::DetermineWeight(Node *n)
int weight = 0;
foreach (Node* i, inputs) {
weight += DetermineWeight(i);
if (i->GetRoutesTo(n) == 1) {
weight += DetermineWeight(i);
}
}
return qMax(1, weight);
@@ -257,6 +259,7 @@ void NodeViewScene::ReorganizeFrom(Node* n)
QPointF parent_pos = n->GetPosition();
int weight_count = DetermineWeight(n);
qDebug() << "Weight" << n->id() << "is" << weight_count;
qreal child_x = parent_pos.x() - 1.0;
qreal children_height = weight_count-1;
@@ -265,14 +268,16 @@ void NodeViewScene::ReorganizeFrom(Node* n)
int weight_counter = 0;
foreach (Node* i, immediates) {
int weight = DetermineWeight(i);
if (i->GetRoutesTo(n) == 1) {
int weight = DetermineWeight(i);
i->SetPosition(QPointF(child_x,
children_y + weight_counter + (weight - 1) * 0.5));
i->SetPosition(QPointF(child_x,
children_y + weight_counter + (weight - 1) * 0.5));
weight_counter += weight;
weight_counter += weight;
ReorganizeFrom(i);
ReorganizeFrom(i);
}
}
}