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

Take qucsattenuator, qucsedit, qucsrescodes, and qucsatrans from QucsatorDir

Browse Source
This commit is contained in:
Vadim Kuznetzov 2016-06-26 11:14:54 +03:00
parent b0529a82e6
commit bd1ee38afe
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs/main.cpp
View File

@ -102,7 +102,7 @@ bool loadSettings()
if(settings.contains("Qucsator")) {
QucsSettings.Qucsator = settings.value("Qucsator").toString();
QFileInfo inf(QucsSettings.Qucsator);
QucsSettings.QucsatorDir = inf.canonicalPath();
QucsSettings.QucsatorDir = inf.canonicalPath() + QDir::separator();
if (QucsSettings.Qucsconv.isEmpty())
QucsSettings.Qucsconv = QucsSettings.QucsatorDir + QDir::separator() + "qucsconv" + executableSuffix;
} else {

2
qucs/qucs.h
View File

@ -376,7 +376,7 @@ private slots:
private:
void showHTML(const QString&);
bool performToggleAction(bool, QAction*, pToggleFunc, pMouseFunc, pMouseFunc2);
void launchTool(const QString&, const QString&, const QString& = ""); // tool, description and args
void launchTool(const QString&, const QString&, const QString& = "",bool qucs_tool = false); // tool, description and args
friend class SaveDialog;
QString lastExportFilename;
};

25
qucs/qucs_actions.cpp
View File

@ -695,10 +695,10 @@ void QucsApp::editFile(const QString& File)
#elif __APPLE__
prog = "qucsedit.app/Contents/MacOS/qucsedit";
#else
prog = QUCS_NAME "edit";
prog = "qucsedit";
#endif
QFileInfo editor(QucsSettings.BinDir + prog);
QFileInfo editor(QucsSettings.QucsatorDir + prog);
prog = QDir::toNativeSeparators(editor.canonicalFilePath());
}
else { // user defined editor
@ -768,7 +768,7 @@ void QucsApp::slotCallActiveFilter()
// Is called to start the transmission line calculation program.
void QucsApp::slotCallLine()
{
launchTool(QUCS_NAME "trans", "line calculation");
launchTool("qucstrans", "line calculation","",true);
}
// ------------------------------------------------------------------------
@ -790,14 +790,14 @@ void QucsApp::slotCallMatch()
// Is called to start the attenuator calculation program.
void QucsApp::slotCallAtt()
{
launchTool(QUCS_NAME "attenuator", "attenuator calculation");
launchTool("qucsattenuator", "attenuator calculation","",true);
}
// ------------------------------------------------------------------------
// Is called to start the resistor color code calculation program.
void QucsApp::slotCallRes()
{
launchTool(QUCS_NAME "rescodes", "resistor color code calculation");
launchTool("qucsrescodes", "resistor color code calculation","",true);
}
/*!
@ -807,18 +807,23 @@ void QucsApp::slotCallRes()
* \param progDesc program description string (used for error messages)
* \param args arguments to pass to the executable
*/
void QucsApp::launchTool(const QString& prog, const QString& progDesc, const QString& args) {
void QucsApp::launchTool(const QString& prog, const QString& progDesc, const QString& args,
bool qucs_tool)
{
QProcess *tool = new QProcess();
QString tooldir;
if (qucs_tool) tooldir = QucsSettings.QucsatorDir;
else tooldir = QucsSettings.BinDir;
#ifdef __MINGW32__
QString cmd = QDir::toNativeSeparators("\""+QucsSettings.BinDir + prog + ".exe\"") + " " + args;
QString cmd = QDir::toNativeSeparators("\""+tooldir + prog + ".exe\"") + " " + args;
#elif __APPLE__
QString cmd = QDir::toNativeSeparators(QucsSettings.BinDir + prog + ".app/Contents/MacOS/" + prog) + " " + args;
QString cmd = QDir::toNativeSeparators(tooldir + prog + ".app/Contents/MacOS/" + prog) + " " + args;
#else
QString cmd = QDir::toNativeSeparators(QucsSettings.BinDir + prog) + " " + args;
QString cmd = QDir::toNativeSeparators(tooldir + prog) + " " + args;
#endif
tool->setWorkingDirectory(QucsSettings.BinDir);
tool->setWorkingDirectory(tooldir);
qDebug() << "Command :" << cmd;
tool->start(cmd);