QGV Library adapted for Graphviz Lib version 14

Author: joern274

plugins/dot_viewer/deps/QGVCore/CMakeLists.txt

@@ -4,6 +4,14 @@ SET(qgvlib_TS)
 
 SET(qgvlib_UI)
 
+check_c_source_compiles("
+#include <graphviz/cgraph.h>
+int main() {
+    Agdisc_t d;
+    d.mem = 0;
+    return 0;
+}" HAS_AGDISC_MEM)
+
 SET(TARGET_VERSION_MAJOR 0 )
 SET(TARGET_VERSION_MINOR 1 )
 

plugins/dot_viewer/deps/QGVCore/QGVNode.cpp

@@ -68,7 +68,25 @@ void QGVNode::paint(QPainter * painter, const QStyleOptionGraphicsItem *, QWidge
     const QRectF rect = boundingRect().adjusted(2,2,-2,-2); //Margin
     if(_icon.isNull())
     {
-        painter->drawText(rect, Qt::AlignCenter , QGVNode::label());
+        QFontMetrics fm(painter->font());
+        qreal fw = fm.horizontalAdvance(label());
+        if (fw > rect.width())
+        {
+            qreal scl = rect.width()/fw;
+            qreal tx = rect.center().x();
+            qreal ty = rect.center().y();
+            painter->save();
+            painter->translate(tx,ty);
+            painter->scale(scl, scl);
+            painter->translate(-tx/scl, -ty);
+            painter->drawText(rect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextDontClip | Qt::TextSingleLine, label());
+            painter->setPen( QPen(Qt::red,1) );
+            painter->setBrush ( Qt::NoBrush );
+            painter->drawRect(rect);
+            painter->restore();
+        }
+        else
+            painter->drawText(rect, Qt::AlignCenter , QGVNode::label());
     }
     else
     {

plugins/dot_viewer/deps/QGVCore/QGVScene.cpp

@@ -29,7 +29,6 @@ License along with this library.
 #include <QGVNodePrivate.h>
 #include <QGraphicsView>
 #include <iostream>
-#include "hal_core/utilities/log.h"
 
 int QGVScene::sCount = 0;
 
@@ -71,7 +70,9 @@ void QGVInteraction::disableHandler()
 QGVScene::QGVScene(QObject *parent)
     : QGraphicsScene(parent), _drawGrid(true)
 {
+#ifdef HAS_AGDISK_MEM
     aaglex_destroy();
+#endif
     _context = new QGVGvcPrivate(gvContext());
     QString name = QString("DotViewer%1").arg(++sCount);
     _graph = new QGVGraphPrivate(agopen(name.toLocal8Bit().data(), Agdirected, NULL));
@@ -208,14 +209,14 @@ void QGVScene::loadLayout(const QString &text, QGVInteraction *interact)
     if (!_graph->graph())
     {
         const char* err = aglasterr();
-        hal::log_warning("dot_viewer", "Error parsing file input '{}'.", (err ? err : "") );
+        qWarning() << "Error parsing file input <" << (err ? err : "") << ">" ;
         return;
     }
 
     if(gvLayout(_context->context(), _graph->graph(), "dot") != 0)
     {
         const char* err = aglasterr();
-        hal::log_warning("dot_viewer", "Layout render error {} '{}'.",  agerrors(), (err ? err : "") );
+        qWarning() << "Layout render error <" <<  (err ? err : "") << ">";
         return;
     }
 

plugins/dot_viewer/deps/QGVCore/private/QGVCore.h

@@ -30,6 +30,10 @@ License along with this library.
 
 const qreal DotDefaultDPI = 72.0;
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+
 /**
  * @brief GraphViz to GraphicsScene conversions
  *
@@ -81,6 +85,7 @@ class QGVCore
 
     static Agraph_t *agmemread2(const char *cp)
     {
+#ifdef HAS_AGDISK_MEM
         Agraph_t* g;
         rdr_t rdr;
         Agdisc_t disc;
@@ -98,6 +103,9 @@ class QGVCore
         disc.io = &memIoDisc;
         g = agread (&rdr, &disc);
         return g;
+#else
+        return agmemread(cp);
+#endif
     }
 
 private:

plugins/dot_viewer/include/dot_viewer/interaction/clock_tree_extractor_interaction.h

@@ -35,7 +35,6 @@ namespace hal {
         Q_OBJECT
     public:
         ClockTreeExtractorInteraction(QGVScene* parent);
-        ~ClockTreeExtractorInteraction();
 
         void registerNode(QGVNode* node) override;
         void registerEdge(QGVEdge* scene) override;

plugins/dot_viewer/include/dot_viewer/interaction/dataflow_interaction.h

@@ -35,7 +35,6 @@ namespace hal {
         Q_OBJECT
     public:
         DataflowInteraction(QGVScene* parent);
-        ~DataflowInteraction();
 
         void registerNode(QGVNode* node) override;
         void registerEdge(QGVEdge* scene) override;

plugins/dot_viewer/include/dot_viewer/interaction/solve_fsm_interaction.h

@@ -37,7 +37,6 @@ namespace hal {
         Q_OBJECT
     public:
         SolveFsmInteraction(QGVScene* parent);
-        ~SolveFsmInteraction();
 
         void registerNode(QGVNode* node) override;
         void registerEdge(QGVEdge* edge) override;

plugins/dot_viewer/src/interaction/clock_tree_extractor_interaction.cpp

@@ -27,11 +27,6 @@ namespace hal {
         connect(parent, &QGraphicsScene::selectionChanged, this, &ClockTreeExtractorInteraction::handleQGVSelectionChanged);
     }
 
-    ClockTreeExtractorInteraction::~ClockTreeExtractorInteraction()
-    {
-        disconnect(gSelectionRelay, &SelectionRelay::selectionChanged, this, &ClockTreeExtractorInteraction::handleHALSelectionChanged);
-    }
-
     void ClockTreeExtractorInteraction::registerEdge(QGVEdge* edge)
     {
         Q_UNUSED(edge);

plugins/dot_viewer/src/interaction/dataflow_interaction.cpp

@@ -28,11 +28,6 @@ namespace hal {
         connect(parent, &QGraphicsScene::selectionChanged, this, &DataflowInteraction::handleQGVSelectionChanged);
     }
 
-    DataflowInteraction::~DataflowInteraction()
-    {
-        disconnect(gSelectionRelay, &SelectionRelay::selectionChanged, this, &DataflowInteraction::handleHALSelectionChanged);
-    }
-
     void DataflowInteraction::registerEdge(QGVEdge* edge)
     {
         Q_UNUSED(edge);

plugins/dot_viewer/src/interaction/solve_fsm_interaction.cpp

@@ -32,11 +32,6 @@ namespace hal {
         connect(parent, &QGraphicsScene::changed, this, &SolveFsmInteraction::handleSceneChanged);
     }
 
-    SolveFsmInteraction::~SolveFsmInteraction()
-    {
-        disconnect(gSelectionRelay, &SelectionRelay::selectionChanged, this, &SolveFsmInteraction::handleHALSelectionChanged);
-    }
-
     void SolveFsmInteraction::handleSceneChanged(const QList<QRectF>& changedArea)
     {
         Q_UNUSED(changedArea);