From 6359b28b155355e0be67961cc21eccdbd2c61cc2 Mon Sep 17 00:00:00 2001
From: Aleks Kissinger <aleks0@gmail.com>
Date: Sat, 6 Oct 2018 15:49:50 +0200
Subject: unified node and edge syles

---
 src/data/edgestyle.cpp | 210 ++++++++++++++++++++++++-------------------------
 1 file changed, 105 insertions(+), 105 deletions(-)

(limited to 'src/data/edgestyle.cpp')

diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp
index 8f3008f..7897c6f 100644
--- a/src/data/edgestyle.cpp
+++ b/src/data/edgestyle.cpp
@@ -21,7 +21,7 @@
 #include <QPainter>
 #include <QPixmap>
 
-EdgeStyle *noneEdgeStyle = new EdgeStyle();
+EdgeStyle *noneEdgeStyle = new EdgeStyle("none", new GraphElementData({GraphElementProperty("-")}));
 
 EdgeStyle::EdgeStyle() : Style()
 {
@@ -31,107 +31,107 @@ EdgeStyle::EdgeStyle(QString name, GraphElementData *data) : Style(name, data)
 {
 }
 
-EdgeStyle::ArrowTipStyle EdgeStyle::arrowHead() const
-{
-    if (_data == 0) return NoTip;
-
-    if (_data->atom("->") || _data->atom("<->") || _data->atom("|->")) return Pointer;
-    if (_data->atom("-|") || _data->atom("<-|") || _data->atom("|-|")) return Flat;
-    return NoTip;
-}
-
-EdgeStyle::ArrowTipStyle EdgeStyle::arrowTail() const
-{
-    if (_data == 0) return NoTip;
-    if (_data->atom("<-") || _data->atom("<->") || _data->atom("<-|")) return Pointer;
-    if (_data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return Flat;
-    return NoTip;
-}
-
-EdgeStyle::DrawStyle EdgeStyle::drawStyle() const
-{
-    if (_data == 0) return Solid;
-    if (_data->atom("dashed")) return Dashed;
-    if (_data->atom("dotted")) return Dotted;
-    return Solid;
-}
-
-QPen EdgeStyle::pen() const
-{
-    QPen p(strokeColor());
-    p.setWidthF((float)strokeThickness() * 2.0f);
-
-    QVector<qreal> pat;
-    switch (drawStyle()) {
-    case Dashed:
-        pat << 3.0 << 3.0;
-        p.setDashPattern(pat);
-        break;
-    case Dotted:
-        pat << 1.0 << 1.0;
-        p.setDashPattern(pat);
-        break;
-    case Solid:
-        break;
-    }
-
-    return p;
-}
-
-QPainterPath EdgeStyle::path() const
-{
-    return QPainterPath();
-}
-
-QPainterPath EdgeStyle::palettePath() const
-{
-    return QPainterPath();
-}
-
-QIcon EdgeStyle::icon() const
-{
-    // draw an icon matching the style
-    QPixmap px(100,100);
-    px.fill(Qt::transparent);
-    QPainter painter(&px);
-
-    if (_data == 0) {
-        QPen pen(Qt::black);
-        pen.setWidth(3);
-    } else {
-        painter.setPen(pen());
-    }
-
-    painter.drawLine(10, 50, 90, 50);
-
-	QPen pn = pen();
-	pn.setStyle(Qt::SolidLine);
-	painter.setPen(pn);
-
-    switch (arrowHead()) {
-    case Pointer:
-        painter.drawLine(90,50,80,40);
-        painter.drawLine(90,50,80,60);
-        break;
-    case Flat:
-        painter.drawLine(90,40,90,60);
-        break;
-    case NoTip:
-        break;
-    }
-
-    switch (arrowTail()) {
-    case Pointer:
-        painter.drawLine(10,50,20,40);
-        painter.drawLine(10,50,20,60);
-        break;
-    case Flat:
-        painter.drawLine(10,40,10,60);
-        break;
-    case NoTip:
-        break;
-    }
-
-
-    return QIcon(px);
-}
+//EdgeStyle::ArrowTipStyle EdgeStyle::arrowHead() const
+//{
+//    if (_data == 0) return NoTip;
+
+//    if (_data->atom("->") || _data->atom("<->") || _data->atom("|->")) return Pointer;
+//    if (_data->atom("-|") || _data->atom("<-|") || _data->atom("|-|")) return Flat;
+//    return NoTip;
+//}
+
+//EdgeStyle::ArrowTipStyle EdgeStyle::arrowTail() const
+//{
+//    if (_data == 0) return NoTip;
+//    if (_data->atom("<-") || _data->atom("<->") || _data->atom("<-|")) return Pointer;
+//    if (_data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return Flat;
+//    return NoTip;
+//}
+
+//EdgeStyle::DrawStyle EdgeStyle::drawStyle() const
+//{
+//    if (_data == 0) return Solid;
+//    if (_data->atom("dashed")) return Dashed;
+//    if (_data->atom("dotted")) return Dotted;
+//    return Solid;
+//}
+
+//QPen EdgeStyle::pen() const
+//{
+//    QPen p(strokeColor());
+//    p.setWidthF((float)strokeThickness() * 2.0f);
+
+//    QVector<qreal> pat;
+//    switch (drawStyle()) {
+//    case Dashed:
+//        pat << 3.0 << 3.0;
+//        p.setDashPattern(pat);
+//        break;
+//    case Dotted:
+//        pat << 1.0 << 1.0;
+//        p.setDashPattern(pat);
+//        break;
+//    case Solid:
+//        break;
+//    }
+
+//    return p;
+//}
+
+//QPainterPath EdgeStyle::path() const
+//{
+//    return QPainterPath();
+//}
+
+//QPainterPath EdgeStyle::palettePath() const
+//{
+//    return QPainterPath();
+//}
+
+//QIcon EdgeStyle::icon() const
+//{
+//    // draw an icon matching the style
+//    QPixmap px(100,100);
+//    px.fill(Qt::transparent);
+//    QPainter painter(&px);
+
+//    if (_data == 0) {
+//        QPen pen(Qt::black);
+//        pen.setWidth(3);
+//    } else {
+//        painter.setPen(pen());
+//    }
+
+//    painter.drawLine(10, 50, 90, 50);
+
+//	QPen pn = pen();
+//	pn.setStyle(Qt::SolidLine);
+//	painter.setPen(pn);
+
+//    switch (arrowHead()) {
+//    case Pointer:
+//        painter.drawLine(90,50,80,40);
+//        painter.drawLine(90,50,80,60);
+//        break;
+//    case Flat:
+//        painter.drawLine(90,40,90,60);
+//        break;
+//    case NoTip:
+//        break;
+//    }
+
+//    switch (arrowTail()) {
+//    case Pointer:
+//        painter.drawLine(10,50,20,40);
+//        painter.drawLine(10,50,20,60);
+//        break;
+//    case Flat:
+//        painter.drawLine(10,40,10,60);
+//        break;
+//    case NoTip:
+//        break;
+//    }
+
+
+//    return QIcon(px);
+//}
-- 
cgit v1.2.3