Compare commits

...

2 Commits

Author SHA1 Message Date
plc-user 3cadc9275e improve readability 2025-01-30 07:25:30 +01:00
plc-user a459029f0d simplify code even more... 2025-01-30 00:15:09 +01:00
+22 -37
View File
@@ -2354,56 +2354,41 @@ void QETDiagramEditor::generateTerminalBlock()
#endif
bool success = false;
QList<QString> exeList;
QProcess *process = new QProcess(qApp);
#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");
#elif defined(Q_OS_MACOS)
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");
#else
exeList << QStandardPaths::findExecutable("qet_tb_generator")
<< (QETApp::dataDir() + "/binary/qet_tb_generator")
<< (QDir::homePath() + "/.qet/qet_tb_generator")
<< "qet_tb_generator";
#endif
// If launched under control:
//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)
qInfo() << " project to use for qet_tb_generator: "
<< (QETDiagramEditor::currentProjectView()->project()->filePath());
if (openedProjects().count()) {
QList<QString> exeList;
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<QString> 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<QString> exeList;
exeList << QStandardPaths::findExecutable("qet_tb_generator")
<< (QETApp::dataDir() + "/binary/qet_tb_generator")
<< (QDir::homePath() + "/.qet/qet_tb_generator")
<< "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())});
}
}
}
#endif
else {
} else {
qInfo() << "No project loaded - no need to start \"qet_tb_generator\"";
}
process->close();