Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build with graphviz 10 #3115

Merged
merged 3 commits into from
Aug 26, 2024
Merged

Fix build with graphviz 10 #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94e1452
Fix build with graphviz 11
traversaro Jun 16, 2024
ddfa696
Update changelog
traversaro Jun 16, 2024
5ec7f5f
Merge branch 'master' into fixgraphviz10
randaz81 Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/release/master.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Fixes
* `yarpbatterygui` now compatible with battery_nwc_yarp.
* Fixed compilation of portmonitor carrier when a custom non-system swig is used
* Fixed compatibility with ffmpeg 7 (https://github.com/robotology/yarp/pull/3109).
* Fixed compilation with graphviz 10 (https://github.com/robotology/yarp/pull/3115).
* Fix sending empty yarp::sig::Vector when building in Debug (https://github.com/robotology/yarp/pull/3123).

New Features
Expand Down
8 changes: 4 additions & 4 deletions extern/qgv/qgv/QGVCore/QGVScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void QGVScene::setEdgeAttribute(const QString &name, const QString &value)

QGVNode *QGVScene::addNode(const QString &label)
{
Agnode_t *node = agnode(_graph->graph(), NULL, TRUE);
Agnode_t *node = agnode(_graph->graph(), NULL, true);
if(node == NULL)
{
qWarning()<<"Invalid node :"<<label;
Expand All @@ -81,7 +81,7 @@ QGVNode *QGVScene::addNode(const QString &label)

QGVEdge *QGVScene::addEdge(QGVNode *source, QGVNode *target, const QString &label)
{
Agedge_t* edge = agedge(_graph->graph(), source->_node->node(), target->_node->node(), NULL, TRUE);
Agedge_t* edge = agedge(_graph->graph(), source->_node->node(), target->_node->node(), NULL, true);
if(edge == NULL)
{
qWarning()<<"Invalid egde :"<<label;
Expand All @@ -99,9 +99,9 @@ QGVSubGraph *QGVScene::addSubGraph(const QString &name, bool cluster)
{
Agraph_t* sgraph;
if(cluster)
sgraph = agsubg(_graph->graph(), ("cluster_" + name).toLocal8Bit().data(), TRUE);
sgraph = agsubg(_graph->graph(), ("cluster_" + name).toLocal8Bit().data(), true);
else
sgraph = agsubg(_graph->graph(), name.toLocal8Bit().data(), TRUE);
sgraph = agsubg(_graph->graph(), name.toLocal8Bit().data(), true);

if(sgraph == NULL)
{
Expand Down
8 changes: 4 additions & 4 deletions extern/qgv/qgv/QGVCore/QGVSubGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ QString QGVSubGraph::name() const

QGVNode *QGVSubGraph::addNode(const QString &label)
{
Agnode_t *node = agnode(_sgraph->graph(), NULL, TRUE);
Agnode_t *node = agnode(_sgraph->graph(), NULL, true);
if(node == NULL)
{
qWarning()<<"Invalid sub node :"<<label;
return 0;
}
agsubnode(_sgraph->graph(), node, TRUE);
agsubnode(_sgraph->graph(), node, true);

QGVNode *item = new QGVNode(new QGVNodePrivate(node, _sgraph->graph()), _scene);
item->setLabel(label);
Expand All @@ -62,9 +62,9 @@ QGVSubGraph *QGVSubGraph::addSubGraph(const QString &name, bool cluster)
{
Agraph_t* sgraph;
if(cluster)
sgraph = agsubg(_sgraph->graph(), ("cluster_" + name).toLocal8Bit().data(), TRUE);
sgraph = agsubg(_sgraph->graph(), ("cluster_" + name).toLocal8Bit().data(), true);
else
sgraph = agsubg(_sgraph->graph(), name.toLocal8Bit().data(), TRUE);
sgraph = agsubg(_sgraph->graph(), name.toLocal8Bit().data(), true);

if(sgraph == NULL)
{
Expand Down
Loading