Descend into inner nodes

Author: rprospero

src/gui/models/nodeGraph/graphModel.cpp

@@ -43,14 +43,18 @@ QAbstractListModel *GraphModel::nodes() { return &nodes_; }
 
 int GraphModel::count() { return nodes_.rowCount(); }
 
-QString GraphModel::location() const {
-  if (!graph_)
-    return "";
-  return QString::fromStdString(graph_->location());
+QString GraphModel::location() const
+{
+    if (!graph_)
+        return "";
+    return QString::fromStdString(graph_->location());
 };
 
-bool GraphModel::atRoot() const {
-  return !graph_;
+bool GraphModel::atRoot() const
+{
+    if (!graph_)
+        return true;
+    return !graph_->parentGraph();
 }
 
 // Provide relative coordinates for an input on a node
@@ -71,14 +75,24 @@ void GraphModel::addOutput(int nodeIndex, QString paramName, double x, double y)
     node.outputPos.insert({paramName.toStdString(), {x, y}});
 }
 
-
 // Switch to parent graph
-void GraphModel::upLevel() {
-  if (!graph_);
-    return;
+void GraphModel::upLevel()
+{
+    if (!graph_)
+        return;
     setGraph(graph_->parentGraph());
 }
 
+// Move into an inner graph
+void GraphModel::descend(int index)
+{
+    auto &node = wrapped_[index];
+    if (node.hasInner())
+    {
+        setGraph(static_cast<Graph *>(&node.rawValue()));
+    }
+}
+
 void GraphModel::emplace_back(int x, int y, QVariant type, QVariant name)
 {
     if (!graph_)

src/gui/models/nodeGraph/graphModel.h

@@ -23,8 +23,8 @@ class GraphModel : public QObject
     Q_PROPERTY(QAbstractListModel *nodes READ nodes NOTIFY graphChanged);
     Q_PROPERTY(int nodeCount READ count NOTIFY graphChanged);
     Q_PROPERTY(int edgeCount READ nEdges NOTIFY graphChanged);
-    Q_PROPERTY(QString location READ location);
-    Q_PROPERTY(bool atRoot READ atRoot);
+    Q_PROPERTY(QString location READ location NOTIFY graphChanged);
+    Q_PROPERTY(bool atRoot READ atRoot NOTIFY graphChanged);
 
     friend GraphNodeModel;
     friend GraphEdgeModel;
@@ -94,4 +94,6 @@ class GraphModel : public QObject
 
     // Switch to parent graph
     void upLevel();
+    // Move into an inner graph
+    void descend(int index);
 };

src/gui/models/nodeGraph/graphNodeModel.cpp

@@ -18,6 +18,7 @@ enum Role
     INPUTS,
     OUTPUTS,
     OPTIONS,
+    INNER_GRAPH,
 };
 
 GraphNodeModel &GraphNodeModel::operator=(const GraphNodeModel &other)
@@ -54,6 +55,7 @@ QHash<int, QByteArray> GraphNodeModel::roleNames() const
     roles[Qt::UserRole + (int)INPUTS] = "inputs";
     roles[Qt::UserRole + (int)OUTPUTS] = "outputs";
     roles[Qt::UserRole + (int)OPTIONS] = "options";
+    roles[Qt::UserRole + (int)INNER_GRAPH] = "inner_graph";
     return roles;
 }
 
@@ -79,6 +81,8 @@ QVariant GraphNodeModel::data(const QModelIndex &index, int role) const
             return QVariant::fromValue(item.outputs.get());
         case OPTIONS:
             return QVariant::fromValue(item.options.get());
+        case INNER_GRAPH:
+            return item.hasInner();
     }
     return {};
 }

src/gui/models/nodeGraph/nodeWrapper.h

@@ -31,6 +31,9 @@ class NodeWrapper
     Node &rawValue() { return *value_; }
     const Node &rawValue() const { return *value_; }
 
+    // Does this node contain other nodes?
+    bool hasInner() { return dynamic_cast<Graph *>(value_) != nullptr; }
+
     private:
     // The actual value of the node
     Node *value_;

src/gui/qml/nodeGraph/GraphDelegate.qml

@@ -12,6 +12,7 @@ NodeBox {
     property variant rootModel
     property double startX: x + width
     signal edgeCreated(srcNode: string, srcOutput: string, tgtNode: string, tgtInput: string)
+    signal descended(idx: int)
 
     image: icon
     nodeType: name
@@ -167,6 +168,15 @@ NodeBox {
             height: options.rowCount() > 0 ? 2 : 0
             width: parent.width
         }
+        Button {
+            Layout.fillWidth: true
+            text: "Inner Graph"
+            visible: inner_graph
+
+            onClicked: {
+                descended(index);
+            }
+        }
         GridLayout {
             columns: 3
             width: parent.width

src/gui/qml/nodeGraph/GraphView.qml

@@ -109,6 +109,11 @@ Pane {
 
                     onClicked: graphRoot.rootModel.emplace_back(Math.round(ctxMenuCatcher.mouseX), Math.round(ctxMenuCatcher.mouseY), "Configuration", "New Node")
                 }
+                MenuItem {
+                    text: "Graph"
+
+                    onClicked: graphRoot.rootModel.emplace_back(Math.round(ctxMenuCatcher.mouseX), Math.round(ctxMenuCatcher.mouseY), "Graph", "New Graph")
+                }
             }
         }
     }