feat:Inner graphs (#2226)

Author: rprospero

.github/workflows/build/osx/action.yml

@@ -29,6 +29,11 @@ runs:
   # Setup / Install Dependencies
   #
 
+  - name: Choose XCode version
+    shell: bash
+    run: |
+      sudo xcode-select -s /Applications/Xcode_16.2.app
+
   - name: Manage Homebrew Dependencies
     shell: bash
     run: |

flake.lock

@@ -223,6 +223,16 @@ ApplicationWindow {
                     Label {
                         text: "Edges: " + graphModel.edgeCount
                     }
+                    ToolButton {
+                        enabled: !graphModel.atRoot
+                        icon.color: graphModel.atRoot ? "grey" : "transparent"
+                        icon.source: "qrc:/IconsModule/arrowUp.svg"
+
+                        onClicked: graphModel.upLevel()
+                    }
+                    Label {
+                        text: "Location: " + graphModel.location
+                    }
                 }
             }
             GraphView {
@@ -240,6 +250,9 @@ ApplicationWindow {
                     GraphDelegate {
                         rootModel: graphModel
 
+                        onDescended: function (idx) {
+                            graphModel.descend(idx);
+                        }
                         onEdgeCreated: function (srcNode, srcOutput, tgtNode, tgtInput) {
                             graphModel.addEdge(srcNode, srcOutput, tgtNode, tgtInput);
                         }

src/gui-qml/qml/DissolveMain.qml

@@ -43,6 +43,20 @@ QAbstractListModel *GraphModel::nodes() { return &nodes_; }
 
 int GraphModel::count() { return nodes_.rowCount(); }
 
+QString GraphModel::location() const
+{
+    if (!graph_)
+        return "";
+    return QString::fromStdString(graph_->location());
+};
+
+bool GraphModel::atRoot() const
+{
+    if (!graph_)
+        return true;
+    return !graph_->parentGraph();
+}
+
 // Provide relative coordinates for an input on a node
 void GraphModel::addInput(int nodeIndex, QString paramName, double x, double y)
 {
@@ -61,6 +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;
+    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.cpp

@@ -23,6 +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 NOTIFY graphChanged);
+    Q_PROPERTY(bool atRoot READ atRoot NOTIFY graphChanged);
 
     friend GraphNodeModel;
     friend GraphEdgeModel;
@@ -31,26 +33,30 @@ class GraphModel : public QObject
     GraphModel();
 
     public:
-    // Access the acutal nodes in the model
+    // Access the actual nodes in the model
     Graph *graph();
 
     void setGraph(Graph *graph);
 
     // The model for the edges in the graph
     GraphEdgeModel *edges();
-    // The modelfor the nodes in the graph
+    // The model for the nodes in the graph
     QAbstractListModel *nodes();
     // The total number of nodes in the graph
     int count();
     // The total number of edges in the graph
     int nEdges();
+    // The path to the current graph
+    QString location() const;
+    // Whether the current graph has a parent
+    bool atRoot() const;
 
     protected:
     // The abstract data model for the nodes
     GraphNodeModel nodes_;
     // The abstract data model for the edges between nodes
     GraphEdgeModel edges_;
-    // The graph being modeled
+    // The graph being modelled
     Graph *graph_;
     // Graph nodes wrapped in the wrappers
     std::vector<NodeWrapper> wrapped_;
@@ -85,4 +91,9 @@ class GraphModel : public QObject
 
     // Add a new node at a specific position
     void emplace_back(int x, int y, QVariant type, QVariant name);
+
+    // Switch to parent graph
+    void upLevel();
+    // Move into an inner graph
+    void descend(int index);
 };

src/gui/models/nodeGraph/graphModel.h

@@ -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/graphNodeModel.cpp

@@ -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_;