kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: try calling graphviz binaries from PATH by default [fix #15224]

Browse Source
This commit is contained in:
Adrian Insaurralde Avalos
2024-10-08 17:01:48 -03:00
committed by Yorik van Havre
parent c8a5bdc59d
commit 28c2f2b805
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Gui/GraphvizView.cpp
View File

@@ -282,20 +282,16 @@ void GraphvizView::updateSvgItem(const App::Document &doc)
QStringList args, flatArgs;
args << QLatin1String("-Tsvg");
flatArgs << QLatin1String("-c2 -l2");
#ifdef FC_OS_LINUX
QString path = QString::fromUtf8(hGrp->GetASCII("Graphviz", "/usr/bin").c_str());
#else
QString path = QString::fromUtf8(hGrp->GetASCII("Graphviz").c_str());
#endif
auto dot = QString::fromLatin1("dot");
auto unflatten = QString::fromLatin1("unflatten");
auto path = QString::fromUtf8(hGrp->GetASCII("Graphviz").c_str());
bool pathChanged = false;
#ifdef FC_OS_WIN32
QString dot = QString::fromLatin1("\"%1/dot\"").arg(path);
QString unflatten = QString::fromLatin1("\"%1/unflatten\"").arg(path);
#else
QString dot = QString::fromLatin1("%1/dot").arg(path);
QString unflatten = QString::fromLatin1("%1/unflatten").arg(path);
#endif
QDir dir;
if (!path.isEmpty()) {
dir = QDir(path);
dot = dir.filePath(QString::fromLatin1("dot"));
unflatten = dir.filePath(QString::fromLatin1("unflatten"));
}
dotProc->setEnvironment(QProcess::systemEnvironment());
flatProc->setEnvironment(QProcess::systemEnvironment());
do {
@@ -323,14 +319,12 @@ void GraphvizView::updateSvgItem(const App::Document &doc)
disconnectSignals();
return;
}
pathChanged = true;
#ifdef FC_OS_WIN32
dot = QString::fromLatin1("\"%1/dot\"").arg(path);
unflatten = QString::fromLatin1("\"%1/unflatten\"").arg(path);
#else
dot = QString::fromLatin1("%1/dot").arg(path);
unflatten = QString::fromLatin1("%1/unflatten").arg(path);
#endif
else {
dir = QDir(path);
dot = dir.filePath(QString::fromLatin1("dot"));
unflatten = dir.filePath(QString::fromLatin1("unflatten"));
pathChanged = true;
}
}
else {
if (pathChanged)