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

rewrite code for executing “qet_tb_generator” plugin

Browse Source 
Now it's better readable and maintainable up to the moment
we have our own internal Terminal-Manager for productive use.
Additionally added the storage location “dataDir()/binary”,
so that the new structure for the separation of
configuration and data can be properly kept
This commit is contained in:
plc-user
2025-01-29 21:57:38 +01:00
parent bdee8e3e36
commit a450680f6e
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
sources/qetdiagrameditor.cpp
View File

@@ -2353,7 +2353,7 @@ void QETDiagramEditor::generateTerminalBlock()
# pragma message("https://github.com/qelectrotech/qet_tb_generator") # pragma message("https://github.com/qelectrotech/qet_tb_generator")
#endif #endif
bool success; bool success = false;
QProcess *process = new QProcess(qApp); QProcess *process = new QProcess(qApp);
// If launched under control: // If launched under control:
@@ -2362,46 +2362,51 @@ void QETDiagramEditor::generateTerminalBlock()
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
if (openedProjects().count()) { if (openedProjects().count()) {
success = process->startDetached("qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); 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())});
} }
else {
success = process->startDetached("qet_tb_generator", {("")});
} }
if (openedProjects().count()){
success = process->startDetached(QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
} }
else {
success = process->startDetached(QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe", {("")});
}
if (openedProjects().count()){
success = process->startDetached(QDir::homePath() + "/qet_tb_generator.exe", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
}
else {
success = process->startDetached(QDir::homePath() + "/qet_tb_generator.exe", {("")});
}
#elif defined(Q_OS_MACOS) #elif defined(Q_OS_MACOS)
if (openedProjects().count()) { if (openedProjects().count()) {
success = process->startDetached("/Library/Frameworks/Python.framework/Versions/3.11/bin/qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); 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 {
success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator.app", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
} }
#else #else
if (openedProjects().count()) { if (openedProjects().count()) {
success = process->startDetached("qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); 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())});
} }
else {
success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
} }
} else {
process->close();
qInfo() << "Did not find binary of \"qet_tb_generator\"";
}
#endif #endif
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
QString message=QObject::tr( QString message=QObject::tr(
"To install the plugin qet_tb_generator" "To install the plugin qet_tb_generator"