#214

Signed-off-by: cneben <benoit@destrat.io>
cneben · Nov 17, 2023 · 2f69b48 · 2f69b48
1 parent 6d2b1e3
commit 2f69b48
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/samples/advanced/CMakeLists.txt b/samples/advanced/CMakeLists.txt
@@ -20,7 +20,11 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 qt_add_resources(source_files ${resources_files})
 
-add_subdirectory(./QuickQanava)
+if(NOT TARGET QuickQanava)
+    #set(QUICK_QANAVA_BUILD_STATIC_QRC ON)
+    add_subdirectory(../../ quickqanava_build)  # Use ../../src as quickqanava_build subdirectory
+    # see https://stackoverflow.com/questions/50408169/cmake-error-add-subdirectory-not-given-a-binary-directory/50408555
+endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(sample_advanced ${source_files} advanced.qrc)

diff --git a/src/qanGraph.cpp b/src/qanGraph.cpp
@@ -892,9 +892,9 @@ bool    Graph::hasEdge(const qan::Edge* edge) const { return hasEdge(edge->get_s
 //-----------------------------------------------------------------------------
 
 /* Graph Group Management *///-------------------------------------------------
-qan::Group* Graph::insertGroup()
+qan::Group* Graph::insertGroup(QQmlComponent* groupComponent)
 {
-    return insertGroup<qan::Group>();
+    return insertGroup<qan::Group>(groupComponent);
 }
 
 qan::Group* Graph::insertTable(int cols, int rows)

diff --git a/src/qanGraph.h b/src/qanGraph.h
@@ -558,7 +558,7 @@ class Graph : public gtpo::graph<QQuickItem, qan::Node, qan::Group, qan::Edge>
     //@{
 public:
     //! Shortcut to gtpo::GenGraph<>::insertGroup().
-    Q_INVOKABLE virtual qan::Group* insertGroup();
+    Q_INVOKABLE virtual qan::Group* insertGroup(QQmlComponent* groupComponent = nullptr);
 
     //! Insert a `qan::TableGroup` table.
     Q_INVOKABLE virtual qan::Group* insertTable(int cols, int rows);
@@ -583,7 +583,7 @@ class Graph : public gtpo::graph<QQuickItem, qan::Node, qan::Group, qan::Edge>
 
     //! Insert a group using its static delegate() and style() factories.
     template <class Group_t>
-    qan::Group*             insertGroup();
+    qan::Group*             insertGroup(QQmlComponent* groupComponent = nullptr);
 
     //! Insert a group using its static delegate() and style() factories.
     template <class TableGroup_t>

diff --git a/src/qanGraph.hpp b/src/qanGraph.hpp
@@ -185,12 +185,13 @@ qan::Edge*  Graph::insertNonVisualEdge(qan::Node& src, qan::Node* dstNode)
 
 /* Graph Group Management *///-------------------------------------------------
 template <class Group_t>
-qan::Group* Graph::insertGroup()
+qan::Group* Graph::insertGroup(QQmlComponent* groupComponent)
 {
-    const auto engine = qmlEngine(this);
-    QQmlComponent* groupComponent = nullptr;
-    if (engine != nullptr)
-        groupComponent = Group_t::delegate(*engine, nullptr);
+    if (groupComponent == nullptr) {
+        const auto engine = qmlEngine(this);
+        if (engine != nullptr)
+            groupComponent = Group_t::delegate(*engine, nullptr);
+    }
     if (groupComponent == nullptr)
         groupComponent = _groupDelegate.get();
     auto group = new Group_t();