From 8d72685eaa33e7f7f0f35fd859bc387ed798c3b5 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 19 Jul 2021 18:40:22 -0700 Subject: [PATCH] nodeview: stripped out auto-position function Hopefully this shouldn't be necessary anymore --- app/widget/nodeview/nodeview.cpp | 17 ------------- app/widget/nodeview/nodeview.h | 5 ---- app/widget/nodeview/nodeviewscene.cpp | 35 --------------------------- app/widget/nodeview/nodeviewscene.h | 2 -- 4 files changed, 59 deletions(-) diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp index 01d55d6da..6f5972eb5 100644 --- a/app/widget/nodeview/nodeview.cpp +++ b/app/widget/nodeview/nodeview.cpp @@ -108,7 +108,6 @@ void NodeView::SetGraph(NodeGraph *graph, const QVector &nodes) if (graph_changed) { if (graph_) { // Disconnect from current graph - //disconnect(graph_, &NodeGraph::NodeAdded, this, &NodeView::AddNode); disconnect(graph_, &NodeGraph::NodeRemoved, this, &NodeView::RemoveNode); disconnect(graph_, &NodeGraph::InputConnected, this, &NodeView::AddEdge); disconnect(graph_, &NodeGraph::InputDisconnected, this, &NodeView::RemoveEdge); @@ -120,7 +119,6 @@ void NodeView::SetGraph(NodeGraph *graph, const QVector &nodes) if (graph_) { // Connect to new graph - //connect(graph_, &NodeGraph::NodeAdded, this, &NodeView::AddNode); connect(graph_, &NodeGraph::NodeRemoved, this, &NodeView::RemoveNode); connect(graph_, &NodeGraph::InputConnected, this, &NodeView::AddEdge); connect(graph_, &NodeGraph::InputDisconnected, this, &NodeView::RemoveEdge); @@ -940,12 +938,6 @@ void NodeView::ShowContextMenu(const QPoint &pos) // Color menu MenuShared::instance()->AddColorCodingMenu(&m); - m.addSeparator(); - - // Auto-position action - QAction* autopos = m.addAction(tr("Auto-Position")); - connect(autopos, &QAction::triggered, this, &NodeView::AutoPositionDescendents); - ViewerOutput* viewer = dynamic_cast(selected.first()->GetNode()); if (viewer) { m.addSeparator(); @@ -1030,15 +1022,6 @@ void NodeView::ContextMenuSetDirection(QAction *action) SetFlowDirection(static_cast(action->data().toInt())); } -void NodeView::AutoPositionDescendents() -{ - QVector selected = scene_.GetSelectedNodes(); - - for (Node* n : selected) { - scene_.ReorganizeFrom(n); - } -} - void NodeView::ContextMenuFilterChanged(QAction *action) { FilterMode mode = static_cast(action->data().toInt()); diff --git a/app/widget/nodeview/nodeview.h b/app/widget/nodeview/nodeview.h index 99cbbaa1f..a31f173c6 100644 --- a/app/widget/nodeview/nodeview.h +++ b/app/widget/nodeview/nodeview.h @@ -259,11 +259,6 @@ private slots: */ void ContextMenuSetDirection(QAction* action); - /** - * @brief Receiver for auto-position descendents menu action - */ - void AutoPositionDescendents(); - /** * @brief Receiver for the user changing the filter */ diff --git a/app/widget/nodeview/nodeviewscene.cpp b/app/widget/nodeview/nodeviewscene.cpp index 68b673561..e40db9ebe 100644 --- a/app/widget/nodeview/nodeviewscene.cpp +++ b/app/widget/nodeview/nodeviewscene.cpp @@ -247,41 +247,6 @@ NodeViewCommon::FlowDirection NodeViewScene::GetFlowDirection() const return direction_; } -void NodeViewScene::ReorganizeFrom(Node* n) -{ - /* - QVector immediates = n->GetImmediateDependencies(); - - if (immediates.isEmpty()) { - // Nothing to do - return; - } - - QPointF parent_pos = n->GetPosition(); - - int weight_count = DetermineWeight(n); - - qreal child_x = parent_pos.x() - 1.0; - qreal children_height = weight_count-1; - qreal children_y = parent_pos.y() - children_height * 0.5; - - int weight_counter = 0; - - foreach (Node* i, immediates) { - if (i->GetRoutesTo(n) == 1) { - int weight = DetermineWeight(i); - - i->SetPosition(QPointF(child_x, - children_y + weight_counter + (weight - 1) * 0.5)); - - weight_counter += weight; - - ReorganizeFrom(i); - } - } - */ -} - void NodeViewScene::SetEdgesAreCurved(bool curved) { if (curved_edges_ != curved) { diff --git a/app/widget/nodeview/nodeviewscene.h b/app/widget/nodeview/nodeviewscene.h index 53b74e074..e388af140 100644 --- a/app/widget/nodeview/nodeviewscene.h +++ b/app/widget/nodeview/nodeviewscene.h @@ -79,8 +79,6 @@ public: return curved_edges_; } - void ReorganizeFrom(Node* n); - public slots: /** * @brief Slot when a Node is added to a graph (SetGraph() connects this)