From a459029f0d4daa39aef7a1e9ad99f52f4a5bd9ed Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Thu, 30 Jan 2025 00:15:09 +0100 Subject: [PATCH] simplify code even more... --- sources/qetdiagrameditor.cpp | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 7c0a2b00b..abea81b43 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -2360,50 +2360,31 @@ void QETDiagramEditor::generateTerminalBlock() //connect(process, SIGNAL(errorOcurred(int error)), this, SLOT(slot_generateTerminalBlock_error())); //process->start("qet_tb_generator"); -#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) if (openedProjects().count()) { QList exeList; +#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) exeList << QStandardPaths::findExecutable("qet_tb_generator.exe") << "qet_tb_generator" << (QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe") << (QETApp::dataDir() + "/binary/qet_tb_generator.exe"); - foreach(QString exe, exeList) { - qInfo() << " success so far: " << success << " - now searching for " << exe; - if ((success == false) && exe.length() && QFile::exists(exe)) { - success = process->startDetached(exe, {(QETDiagramEditor::currentProjectView()->project()->filePath())}); - } - } - } #elif defined(Q_OS_MACOS) - if (openedProjects().count()) { - QList exeList; exeList << QStandardPaths::findExecutable("qet_tb_generator") << "/Library/Frameworks/Python.framework/Versions/3.11/bin/qet_tb_generator" << (QDir::homePath() + "/.qet/qet_tb_generator.app") << (QETApp::dataDir() + "/binary/qet_tb_generator"); - foreach(QString exe, exeList) { - qInfo() << " success so far: " << success << " - now searching for " << exe; - if ((success == false) && exe.length() && QFile::exists(exe)) { - success = process->startDetached(exe, {(QETDiagramEditor::currentProjectView()->project()->filePath())}); - } - } - } #else - if (openedProjects().count()) { - QList exeList; exeList << QStandardPaths::findExecutable("qet_tb_generator") << (QETApp::dataDir() + "/binary/qet_tb_generator") << (QDir::homePath() + "/.qet/qet_tb_generator") << "qet_tb_generator"; +#endif foreach(QString exe, exeList) { qInfo() << " success so far: " << success << " - now searching for " << exe; if ((success == false) && exe.length() && QFile::exists(exe)) { success = process->startDetached(exe, {(QETDiagramEditor::currentProjectView()->project()->filePath())}); } } - } -#endif - else { + } else { qInfo() << "No project loaded - no need to start \"qet_tb_generator\""; } process->close();