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

nodeview: improved code structures

Browse Source
This commit is contained in:
itsmattkc
2020-03-02 16:07:24 +11:00
parent c44c73e376
commit f6d602d8e0
7 changed files with 361 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeview/nodeview.h
+2 -80
View File
@@ -25,8 +25,7 @@
#include <QTimer>
#include "node/graph.h"
#include "widget/nodeview/nodeviewedge.h"
#include "widget/nodeview/nodeviewitem.h"
#include "nodeviewscene.h"
/**
* @brief A widget for viewing and editing node graphs
@@ -47,36 +46,6 @@ public:
*/
void SetGraph(NodeGraph* graph);
/**
* @brief Retrieve the graphical widget corresponding to a specific Node
*
* In situations where you know what Node you're working with but need the UI object (e.g. for positioning), this
* static function will retrieve the NodeViewItem (Node UI representation) connected to this Node in a certain
* QGraphicsScene. This can be called from any other UI object, since it'll have a reference to the QGraphicsScene
* through QGraphicsItem::scene().
*
* If the scene does not contain a widget for this node (usually meaning the node's graph is not the active graph
* in this view/scene), this function returns nullptr.
*/
static NodeViewItem* NodeToUIObject(QGraphicsScene* scene, Node* n);
/**
* @brief Retrieve the graphical widget corresponding to a specific NodeEdge
*
* Same as NodeToUIObject() but returns a NodeViewEdge corresponding to a NodeEdgePtr instead.
*/
static NodeViewEdge* EdgeToUIObject(QGraphicsScene* scene, NodeEdgePtr n);
/**
* @brief Overloaded NodeToUIObject(QGraphicsScene* scene, Node* n) if you have direct access to a NodeView instance
*/
NodeViewItem* NodeToUIObject(Node* n);
/**
* @brief Overloaded EdgeToUIObject(QGraphicsScene* scene, NodeEdgePtr n) if you have direct access to a NodeView instance
*/
NodeViewEdge* EdgeToUIObject(NodeEdgePtr n);
/**
* @brief Delete selected nodes from graph (user-friendly/undoable)
*/
@@ -102,16 +71,8 @@ protected:
virtual void mouseMoveEvent(QMouseEvent *event) override;
private:
QList<Node*> GetNodeDirectDescendants(Node* n, const QList<Node*> connected_nodes, QList<Node*>& processed_nodes);
void PlaceNode(NodeViewItem* n, const QPointF& pos);
int FindWeightsInternal(Node* node, QHash<Node*, int>& weights, QList<Node*>& weighted_nodes);
void ReorganizeInternal(NodeViewItem *src_item, QHash<Node*, int>& weights, QList<Node *> &positioned_nodes);
void QueueReorganize();
void AttachItemToCursor(NodeViewItem* item);
void DetachItemFromCursor();
@@ -123,43 +84,9 @@ private:
NodeViewEdge* drop_edge_;
NodeInput* drop_compatible_input_;
QGraphicsScene scene_;
QTimer reorganize_timer_;
NodeViewScene scene_;
private slots:
/**
* @brief Slot when a Node is added to a graph (SetGraph() connects this)
*
* This should NEVER be called directly, only connected to a NodeGraph. To add a Node to the NodeGraph
* use NodeGraph::AddNode().
*/
void AddNode(Node* node);
/**
* @brief Slot when a Node is removed from a graph (SetGraph() connects this)
*
* This should NEVER be called directly, only connected to a NodeGraph. To remove a Node from the NodeGraph
* use NodeGraph::RemoveNode().
*/
void RemoveNode(Node* node);
/**
* @brief Slot when an edge is added to a graph (SetGraph() connects this)
*
* This should NEVER be called directly, only connected to a NodeGraph. To add an edge (i.e. connect two node
* parameters together), use NodeParam::ConnectEdge().
*/
void AddEdge(NodeEdgePtr edge);
/**
* @brief Slot when an edge is removed from a graph (SetGraph() connects this)
*
* This should NEVER be called directly, only connected to a NodeGraph. To remove an edge (i.e. disconnect two node
* parameters), use NodeParam::DisconnectEdge().
*/
void RemoveEdge(NodeEdgePtr edge);
/**
* @brief Internal function triggered when any change is signalled from the QGraphicsScene
*
@@ -182,11 +109,6 @@ private slots:
*/
void CreateNodeSlot(QAction* action);
/**
* @brief Automatically reposition the nodes based on their connections
*/
void Reorganize();
};
#endif // NODEVIEW_H