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

simplify code even more...

Browse Source
This commit is contained in:
plc-user
2025-01-30 00:15:09 +01:00
parent 9dda9f890f
commit a459029f0d
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sources/qetdiagrameditor.cpp
View File

@@ -2360,50 +2360,31 @@ void QETDiagramEditor::generateTerminalBlock()
//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");
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
if (openedProjects().count()) { if (openedProjects().count()) {
QList<QString> exeList; QList<QString> exeList;
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
exeList << QStandardPaths::findExecutable("qet_tb_generator.exe") exeList << QStandardPaths::findExecutable("qet_tb_generator.exe")
<< "qet_tb_generator" << "qet_tb_generator"
<< (QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe") << (QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe")
<< (QETApp::dataDir() + "/binary/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) #elif defined(Q_OS_MACOS)
if (openedProjects().count()) {
QList<QString> exeList;
exeList << QStandardPaths::findExecutable("qet_tb_generator") exeList << QStandardPaths::findExecutable("qet_tb_generator")
<< "/Library/Frameworks/Python.framework/Versions/3.11/bin/qet_tb_generator" << "/Library/Frameworks/Python.framework/Versions/3.11/bin/qet_tb_generator"
<< (QDir::homePath() + "/.qet/qet_tb_generator.app") << (QDir::homePath() + "/.qet/qet_tb_generator.app")
<< (QETApp::dataDir() + "/binary/qet_tb_generator"); << (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 #else
if (openedProjects().count()) {
QList<QString> exeList;
exeList << QStandardPaths::findExecutable("qet_tb_generator") exeList << QStandardPaths::findExecutable("qet_tb_generator")
<< (QETApp::dataDir() + "/binary/qet_tb_generator") << (QETApp::dataDir() + "/binary/qet_tb_generator")
<< (QDir::homePath() + "/.qet/qet_tb_generator") << (QDir::homePath() + "/.qet/qet_tb_generator")
<< "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)) {
success = process->startDetached(exe, {(QETDiagramEditor::currentProjectView()->project()->filePath())}); success = process->startDetached(exe, {(QETDiagramEditor::currentProjectView()->project()->filePath())});
} }
} }
} } else {
#endif
else {
qInfo() << "No project loaded - no need to start \"qet_tb_generator\""; qInfo() << "No project loaded - no need to start \"qet_tb_generator\"";
} }
process->close(); process->close();