Collapse group edge bug now reproductible in 'advanced' sample.

Signed-off-by: cneben <[email protected]>

samples/advanced/AdvancedGroup.qml

@@ -0,0 +1,79 @@
+/*
+ Copyright (c) 2008-2022, Benoit AUTHEMAN All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the author or Destrat.io nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+//-----------------------------------------------------------------------------
+// This file is a part of the QuickQanava software library. Copyright 2015 Benoit AUTHEMAN.
+//
+// \file	AdvancedNode.qml
+// \author	[email protected]
+// \date	2023 11 17
+//-----------------------------------------------------------------------------
+
+import QtQuick              2.8
+import QtQuick.Controls     2.1
+import QtQuick.Layouts      1.3
+
+import QuickQanava          2.0 as Qan
+import "qrc:/QuickQanava"   as Qan
+
+Qan.Group {
+    id: advancedGroup
+    //width: 110; height: 60
+
+    anchors.fil: parent
+    RowLayout {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: parent.top
+        anchors.bottomMargin: 4
+
+        ToolButton {
+            Layout.preferredWidth: 32
+            Layout.preferredHeight: 32
+            icon.source: 'qrc:/collapse-parents.png'
+            visible: advancedGroup.node && advancedGroup.node.inNodes.length > 0
+            property bool collapsed: false
+            checked: collapsed
+            checkable: true
+            onClicked: {
+                advancedGroup.collapseAncestors(collapsed)
+                collapsed = !collapsed
+            }
+        }
+        ToolButton {
+            Layout.preferredWidth: 32
+            Layout.preferredHeight: 32
+            icon.source: 'qrc:/collapse-childs.png'
+            visible: advancedGroup.node && advancedGroup.node.outNodes.length > 0
+            property bool collapsed: false
+            checked: collapsed
+            checkable: true
+            onClicked: {
+                advancedGroup.collapseChilds(collapsed)
+                collapsed = !collapsed
+            }
+        }
+    }
+}

samples/advanced/advanced.qml

@@ -62,11 +62,12 @@ ApplicationWindow {
             objectName: "graph"
             anchors.fill: parent
             property var advancedNodeDelegate: Qt.createComponent("qrc:/AdvancedNode.qml")
+            property var advancedGroupDelegate: Qt.createComponent("qrc:/AdvancedGroup.qml")
             Component.onCompleted: {
-                const g1 = topology.insertGroup();
+                const g1 = topology.insertGroup(advancedGroupDelegate);
                 g1.label = "GROUP";
                 g1.item.x = 300; g1.item.y = 80;
-                g1.item.width = 450; g1.item.height = 150;
+                g1.item.width = 450; g1.item.height = 220;
 
                 const n1 = topology.insertNode(advancedNodeDelegate);
                 topology.groupNode(g1, n1);
@@ -78,12 +79,19 @@ ApplicationWindow {
 
                 topology.insertEdge(n1, n2);
 
-                const n3 = topology.insertNode(advancedNodeDelegate);
-                n3.item.x = 850; n3.item.y = 80 + 50;
-                topology.insertEdge(n2, n3);
+                const n11 = topology.insertNode(advancedNodeDelegate);
+                topology.groupNode(g1, n11);
+                n11.item.x = 10; n11.item.y = 145;
+
+                const n22 = topology.insertNode(advancedNodeDelegate);
+                topology.groupNode(g1, n22);
+                n22.item.x = 180; n22.item.y = 145;
 
-                // Create a "collapse" test for a node with ancestors inside a group
+                topology.insertEdge(n11, n22);
 
+                const n3 = topology.insertNode(advancedNodeDelegate);
+                n3.item.x = 850; n3.item.y = 150;
+                topology.insertEdge(n2, n3);
             }
         } // Qan.Graph: graph
 

samples/advanced/advanced.qrc

@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>advanced.qml</file>
         <file>AdvancedNode.qml</file>
+        <file>AdvancedGroup.qml</file>
         <file>qtquickcontrols2.conf</file>
         <file>collapse-childs.png</file>
         <file>collapse-parents.png</file>