WIP. Add src/dst shape configuration in curved.qml test.

TODO: Add full binding from EdgeStyle to EdgeItem for both shapeLength and srcShape/dstShape... #65 Signed-off-by: cneben <[email protected]>
cneben · Sep 18, 2018 · ee6529e · ee6529e
1 parent 4cf8b9c
commit ee6529e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/samples/edges/curved.qml b/samples/edges/curved.qml
@@ -246,6 +246,33 @@ Item {
                     }
                 }
             } // RowLayout: edgeType
+            RowLayout {
+                Layout.margins: 2
+                Label { text:"Src Shape:" }
+                Item { Layout.fillWidth: true }
+                ComboBox {
+                    model: ["None", "Arrow", "Open Arrow", "Rect", "Open Rect", "Circle", "Open Circle"]
+                    currentIndex: defaultEdgeStyle.lineType === Qan.EdgeStyle.Straight ? 0 : 1
+                    onActivated: {
+                        var shape = [Qan.EdgeItem.None, Qan.EdgeItem.Arrow, Qan.EdgeItem.ArrowOpen, Qan.EdgeItem.Circle, Qan.EdgeItem.CircleOpen, Qan.EdgeItem.Rect, Qan.EdgeItem.RectOpen]
+                        console.warn("shape=" + shape[index])
+                        defaultEdgeStyle.srcShape = shape[index]
+                    }
+                }
+            } // RowLayout: srcShape
+            RowLayout {
+                Layout.margins: 2
+                Label { text:"Dst shape:" }
+                Item { Layout.fillWidth: true }
+                ComboBox {
+                    model: ["None", "Arrow", "Open Arrow", "Rect", "Open Rect", "Circle", "Open Circle"]
+                    currentIndex: 1
+                    onActivated: {
+                        var shape = [Qan.EdgeItem.None, Qan.EdgeItem.Arrow, Qan.EdgeItem.ArrowOpen, Qan.EdgeItem.Circle, Qan.EdgeItem.CircleOpen, Qan.EdgeItem.Rect, Qan.EdgeItem.RectOpen]
+                        defaultEdgeStyle.dstShape = shape[index]
+                    }
+                }
+            } // RowLayout: dstShape
             RowLayout {
                 Layout.margins: 2
                 Label { text:"Line color:" }

diff --git a/src/EdgeTemplate.qml b/src/EdgeTemplate.qml
@@ -53,7 +53,7 @@ Item {
                  && edgeItem.visible && !edgeItem.hidden
         ShapePath {
             strokeColor: edgeTemplate.color
-            fillColor: edgeItem.dstShape === Qan.EdgeItem.ArrowOpen ? "transparent" : edgeTemplate.color
+            fillColor: edgeItem.dstShape === Qan.EdgeItem.ArrowOpen ? Qt.rgba(0.,0.,0.,0.) : edgeTemplate.color
             strokeWidth: 2
             startX: edgeItem.dstA1.x;   startY: edgeItem.dstA1.y
             PathLine { x: edgeItem.dstA3.x; y: edgeItem.dstA3.y }
@@ -70,7 +70,7 @@ Item {
                  && edgeItem.visible && !edgeItem.hidden
         ShapePath {
             strokeColor: edgeTemplate.color
-            fillColor: edgeItem.dstShape === Qan.EdgeItem.CircleOpen ? "transparent" : edgeTemplate.color
+            fillColor: edgeItem.dstShape === Qan.EdgeItem.CircleOpen ? Qt.rgba(0.,0.,0.,0.) : edgeTemplate.color
             strokeWidth: 2
             startX: 0;   startY: 0
             PathArc {
@@ -92,7 +92,7 @@ Item {
                  && edgeItem.visible && !edgeItem.hidden
         ShapePath {
             strokeColor: edgeTemplate.color
-            fillColor: edgeItem.dstShape === Qan.EdgeItem.RectOpen ? "transparent" : edgeTemplate.color
+            fillColor: edgeItem.dstShape === Qan.EdgeItem.RectOpen ? Qt.rgba(0.,0.,0.,0.) : edgeTemplate.color
             strokeWidth: 2
             startX: edgeItem.dstA1.x;   startY: edgeItem.dstA1.y
             PathLine { x: 0.;               y: 0.               }
@@ -110,7 +110,7 @@ Item {
                  && edgeItem.visible && !edgeItem.hidden
         ShapePath {
             strokeColor: edgeTemplate.color
-            fillColor: edgeItem.srcShape === Qan.EdgeItem.ArrowOpen ? "transparent" : edgeTemplate.color
+            fillColor: edgeItem.srcShape === Qan.EdgeItem.ArrowOpen ? Qt.rgba(0.,0.,0.,0.) : edgeTemplate.color
             strokeWidth: 2
             startX: edgeItem.srcA1.x;   startY: edgeItem.srcA1.y
             PathLine { x: edgeItem.srcA3.x; y: edgeItem.srcA3.y }
@@ -127,7 +127,7 @@ Item {
                  && edgeItem.visible && !edgeItem.hidden
         ShapePath {
             strokeColor: edgeTemplate.color
-            fillColor: edgeItem.srcShape === Qan.EdgeItem.CircleOpen ? "transparent" : edgeTemplate.color
+            fillColor: edgeItem.srcShape === Qan.EdgeItem.CircleOpen ? Qt.rgba(0.,0.,0.,0.) : edgeTemplate.color
             strokeWidth: 2
             startX: 0;   startY: 0
             PathArc {
@@ -149,7 +149,7 @@ Item {
                  && edgeItem.visible && !edgeItem.hidden
         ShapePath {
             strokeColor: edgeTemplate.color
-            fillColor: edgeItem.srcShape === Qan.EdgeItem.RectOpen ? "transparent" : edgeTemplate.color
+            fillColor: edgeItem.srcShape === Qan.EdgeItem.RectOpen ? Qt.rgba(0.,0.,0.,0.) : edgeTemplate.color
             strokeWidth: 2
             startX: edgeItem.srcA1.x;   startY: edgeItem.srcA1.y
             PathLine { x: 0.;               y: 0.               }

diff --git a/src/qanEdgeItem.cpp b/src/qanEdgeItem.cpp
@@ -193,6 +193,7 @@ auto    EdgeItem::setSrcShape(ArrowShape srcShape) noexcept -> void
     if ( _srcShape != srcShape ) {
         _srcShape = srcShape;
         emit srcShapeChanged();
+        updateItem();
     }
 }
 
@@ -201,6 +202,7 @@ auto    EdgeItem::setDstShape(ArrowShape dstShape) noexcept -> void
     if ( _dstShape != dstShape ) {
         _dstShape = dstShape;
         emit dstShapeChanged();
+        updateItem();
     }
 }