From 732499eead71b23a7ba551fe788b47a4cf45124e Mon Sep 17 00:00:00 2001
From: Aleks Kissinger <aleks0@gmail.com>
Date: Mon, 13 Apr 2020 16:21:39 +0100
Subject: adding and drawing paths works

---
 src/gui/edgeitem.cpp | 87 +++++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 42 deletions(-)

(limited to 'src/gui/edgeitem.cpp')

diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp
index 45ae159..675ddd7 100644
--- a/src/gui/edgeitem.cpp
+++ b/src/gui/edgeitem.cpp
@@ -71,7 +71,8 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge
 	QPen pen = _edge->style()->pen();
 	painter->setPen(pen);
     painter->setBrush(Qt::NoBrush);
-    painter->drawPath(path());
+
+    if (!_edge->path()) painter->drawPath(path());
 
 	QPointF ht = _edge->headTangent();
 	QPointF hLeft(-ht.y(), ht.x());
@@ -83,27 +84,27 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge
 	pen.setStyle(Qt::SolidLine);
 	painter->setPen(pen);
 
-	
-	
-	switch (_edge->style()->arrowHead()) {
-        case Style::Flat:
-		{
-			painter->drawLine(
-				toScreen(_edge->head() + hLeft),
-				toScreen(_edge->head() + hRight));
-			break;
-		}
-        case Style::Pointer:
-		{
-			QPainterPath pth;
-			pth.moveTo(toScreen(_edge->head() + ht + hLeft));
-			pth.lineTo(toScreen(_edge->head()));
-			pth.lineTo(toScreen(_edge->head() + ht + hRight));
-			painter->drawPath(pth);
-			break;
-		}
-    case Style::NoTip:
-        break;
+    if (!_edge->path() || _edge->path()->edges().last() == _edge) {
+        switch (_edge->style()->arrowHead()) {
+            case Style::Flat:
+            {
+                painter->drawLine(
+                    toScreen(_edge->head() + hLeft),
+                    toScreen(_edge->head() + hRight));
+                break;
+            }
+            case Style::Pointer:
+            {
+                QPainterPath pth;
+                pth.moveTo(toScreen(_edge->head() + ht + hLeft));
+                pth.lineTo(toScreen(_edge->head()));
+                pth.lineTo(toScreen(_edge->head() + ht + hRight));
+                painter->drawPath(pth);
+                break;
+            }
+        case Style::NoTip:
+            break;
+        }
     }
 
     //QPen outline = QPen(Qt::red);
@@ -111,26 +112,28 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge
     //painter->drawPath(_expPath);
     //painter->setPen(pen);
 	
-	switch (_edge->style()->arrowTail()) {
-        case Style::Flat:
-		{
-			painter->drawLine(
-				toScreen(_edge->tail() + tLeft),
-				toScreen(_edge->tail() + tRight));
-			break;
-		}
-        case Style::Pointer:
-		{
-			QPainterPath pth;
-			pth.moveTo(toScreen(_edge->tail() + tt + tLeft));
-			pth.lineTo(toScreen(_edge->tail()));
-			pth.lineTo(toScreen(_edge->tail() + tt + tRight));
-			painter->drawPath(pth);
-			break;
-		}
-        case Style::NoTip:
-            break;
-	}
+    if (!_edge->path() || _edge->path()->edges().first() == _edge) {
+        switch (_edge->style()->arrowTail()) {
+            case Style::Flat:
+            {
+                painter->drawLine(
+                    toScreen(_edge->tail() + tLeft),
+                    toScreen(_edge->tail() + tRight));
+                break;
+            }
+            case Style::Pointer:
+            {
+                QPainterPath pth;
+                pth.moveTo(toScreen(_edge->tail() + tt + tLeft));
+                pth.lineTo(toScreen(_edge->tail()));
+                pth.lineTo(toScreen(_edge->tail() + tt + tRight));
+                painter->drawPath(pth);
+                break;
+            }
+            case Style::NoTip:
+                break;
+        }
+    }
 
     if (isSelected()) {
         QColor draw;
-- 
cgit v1.2.3