kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-22 09:40:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve readability

Browse Source
This commit is contained in:
plc-user
2025-01-30 07:25:30 +01:00
parent a459029f0d
commit 3cadc9275e
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sources/qetdiagrameditor.cpp
View File

@@ -2354,30 +2354,34 @@ void QETDiagramEditor::generateTerminalBlock()
#endif #endif
bool success = false; bool success = false;
QList<QString> exeList;
QProcess *process = new QProcess(qApp); 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: // If launched under control:
//connect(process, SIGNAL(errorOcurred(int error)), this, SLOT(slot_generateTerminalBlock_error())); //connect(process, SIGNAL(errorOcurred(int error)), this, SLOT(slot_generateTerminalBlock_error()));
//process->start("qet_tb_generator"); //process->start("qet_tb_generator");
qInfo() << " project to use for qet_tb_generator: "
<< (QETDiagramEditor::currentProjectView()->project()->filePath());
if (openedProjects().count()) { if (openedProjects().count()) {
QList<QString> 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");
#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
foreach(QString exe, exeList) { foreach(QString exe, exeList) {
qInfo() << " success so far: " << success << " - now searching for " << exe; qInfo() << " success so far: " << success << " - now searching for " << exe;
if ((success == false) && exe.length() && QFile::exists(exe)) { if ((success == false) && exe.length() && QFile::exists(exe)) {