SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix launchTool method.

Browse Source
This commit is contained in:
Muhammet Şükrü Demir 2024-12-18 00:26:54 +03:00
parent c04edc69cc
commit fe6c33a980
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qucs/main.cpp
View File

@ -806,7 +806,8 @@ int main(int argc, char *argv[])
QucsDir.cdUp();
#endif
QucsSettings.BinDir = QucsApplicationPath.contains("bin") ? QucsApplicationPath : QucsDir.absoluteFilePath("bin");
QucsSettings.BinDir = QucsApplicationPath.contains("bin") ?
(QucsApplicationPath + QDir::separator()) : QucsDir.absoluteFilePath("bin/");
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/";

44
qucs/qucs_actions.cpp
View File

@ -898,32 +898,40 @@ void QucsApp::slotCallSPAR_Viewer()
void QucsApp::launchTool(const QString& prog, const QString& progDesc, const QStringList &args,
bool qucs_tool)
{
QProcess *tool = new QProcess();
QString tooldir = qucs_tool ? QucsSettings.QucsatorDir : QucsSettings.BinDir;
QString tooldir;
if (qucs_tool) tooldir = QucsSettings.QucsatorDir;
else tooldir = QucsSettings.BinDir;
// Create command path based on the platform
QString cmd;
#if defined(_WIN32) || defined(__MINGW32__)
QString cmd = QDir::toNativeSeparators("\""+tooldir + prog + ".exe\"");
cmd = QDir(tooldir).absoluteFilePath(prog + ".exe");
#elif __APPLE__
QString cmd = QDir::toNativeSeparators(tooldir + prog + ".app/Contents/MacOS/" + prog);
cmd = QDir(tooldir).absoluteFilePath(prog + ".app/Contents/MacOS/" + prog);
#else
QString cmd = QDir::toNativeSeparators(tooldir + prog);
cmd = QDir(tooldir).absoluteFilePath(prog);
#endif
tool->setWorkingDirectory(tooldir);
qDebug() << "Command :" << cmd;
tool->start(cmd,args);
// Validate if the file exists before attempting to execute
if (!QFileInfo(cmd).exists()) {
QMessageBox::critical(this, tr("Error"),
tr("Executable %1 not found! \n\n(%2)").arg(progDesc, cmd));
return;
}
if(!tool->waitForStarted(1000) ) {
QMessageBox::critical(this, tr("Error"),
tr("Cannot start %1 program! \n\n(%2)").arg(progDesc, cmd));
delete tool;
return;
}
QProcess *tool = new QProcess();
// to kill the application first before qucs finishes exiting
connect(this, SIGNAL(signalKillEmAll()), tool, SLOT(kill()));
qDebug() << "Command :" << cmd;
tool->setWorkingDirectory(tooldir);
tool->start(cmd,args);
if(!tool->waitForStarted(1000) ) {
QMessageBox::critical(this, tr("Error"),
tr("Cannot start %1 program! \n\n(%2)").arg(progDesc, cmd));
delete tool;
return;
}
// to kill the application first before qucs finishes exiting
connect(this, SIGNAL(signalKillEmAll()), tool, SLOT(kill()));
}