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

Add setting to hold OpenVAF path

Browse Source
This commit is contained in:
Vadim Kuznetsov 2022-12-19 19:38:03 +03:00
parent 0fceced1cc
commit 1bc44a5349
4 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qucs/dialogs/qucssettingsdialog.cpp
View File

@ -362,6 +362,13 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent)
locationsGrid->addWidget(OctaveButt, 4, 2);
connect(OctaveButt, SIGNAL(clicked()), SLOT(slotOctaveDirBrowse()));
locationsGrid->addWidget(new QLabel(tr("OpenVAF Path:"), locationsTab) ,5,0);
OpenVAFEdit = new QLineEdit(locationsTab);
locationsGrid->addWidget(OpenVAFEdit,5,1);
QPushButton *OpenVAFButt = new QPushButton("Browse");
locationsGrid->addWidget(OpenVAFButt, 5, 2);
connect(OpenVAFButt, SIGNAL(clicked()), SLOT(slotOpenVAFDirBrowse()));
// the pathsTableWidget displays the path list
pathsTableWidget = new QTableWidget(locationsTab);
@ -382,20 +389,20 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent)
pathsTableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
connect(pathsTableWidget, SIGNAL(cellClicked(int,int)), SLOT(slotPathTableClicked(int,int)));
connect(pathsTableWidget, SIGNAL(itemSelectionChanged()), SLOT(slotPathSelectionChanged()));
locationsGrid->addWidget(pathsTableWidget,5,0,3,2);
locationsGrid->addWidget(pathsTableWidget,6,0,3,2);
QPushButton *AddPathButt = new QPushButton("Add Path");
locationsGrid->addWidget(AddPathButt, 5, 2);
locationsGrid->addWidget(AddPathButt, 6, 2);
connect(AddPathButt, SIGNAL(clicked()), SLOT(slotAddPath()));
QPushButton *AddPathSubFolButt = new QPushButton("Add Path With SubFolders");
locationsGrid->addWidget(AddPathSubFolButt, 6, 2);
locationsGrid->addWidget(AddPathSubFolButt, 7, 2);
connect(AddPathSubFolButt, SIGNAL(clicked()), SLOT(slotAddPathWithSubFolders()));
RemovePathButt = new QPushButton("Remove Path");
// disable button if no paths in the table are selected
RemovePathButt->setEnabled(false);
locationsGrid->addWidget(RemovePathButt , 7, 2);
locationsGrid->addWidget(RemovePathButt , 8, 2);
connect(RemovePathButt, SIGNAL(clicked()), SLOT(slotRemovePath()));
// create a copy of the current global path list
@ -453,6 +460,7 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent)
admsXmlEdit->setText(QucsSettings.AdmsXmlBinDir.canonicalPath());
ascoEdit->setText(QucsSettings.AscoBinDir.canonicalPath());
octaveEdit->setText(QucsSettings.OctaveExecutable);
OpenVAFEdit->setText(QucsSettings.OpenVAFExecutable);
resize(300, 200);
@ -650,6 +658,7 @@ void QucsSettingsDialog::slotApply()
QucsSettings.AdmsXmlBinDir.setPath(admsXmlEdit->text());
QucsSettings.AscoBinDir.setPath(ascoEdit->text());
QucsSettings.OctaveExecutable = octaveEdit->text();
QucsSettings.OpenVAFExecutable = OpenVAFEdit->text();
if (QucsSettings.IgnoreFutureVersion != checkLoadFromFutureVersions->isChecked())
{
@ -978,6 +987,15 @@ void QucsSettingsDialog::slotOctaveDirBrowse()
octaveEdit->setText(d);
}
void QucsSettingsDialog::slotOpenVAFDirBrowse()
{
QString d = QFileDialog::getOpenFileName(this, tr("Select the OpenVAF executable"),
octaveEdit->text(), "All files (*)");
if(!d.isEmpty())
OpenVAFEdit->setText(d);
}
/*! \brief (seems unused at present)
*/
void QucsSettingsDialog::slotPathTableClicked(int row, int col)

4
qucs/dialogs/qucssettingsdialog.h
View File

@ -68,6 +68,7 @@ private slots:
void slotAdmsXmlDirBrowse();
void slotAscoDirBrowse();
void slotOctaveDirBrowse();
void slotOpenVAFDirBrowse();
void slotAddPath();
void slotAddPathWithSubFolders();
@ -86,7 +87,8 @@ public:
QComboBox *PanelIconsCombo, *CompIconsCombo;
QPushButton *FontButton, *AppFontButton, *BGColorButton;
QLineEdit *LargeFontSizeEdit, *undoNumEdit, *editorEdit, *Input_Suffix,
*Input_Program, *homeEdit, *admsXmlEdit, *ascoEdit, *octaveEdit;
*Input_Program, *homeEdit, *admsXmlEdit, *ascoEdit, *octaveEdit,
*OpenVAFEdit;
QTableWidget *fileTypesTableWidget, *pathsTableWidget;
QStandardItemModel *model;
QPushButton *ColorComment, *ColorString, *ColorInteger,

6
qucs/main.cpp
View File

@ -165,6 +165,11 @@ bool loadSettings()
QDir::separator() + "octave" + QString(executableSuffix);
} else QucsSettings.OctaveExecutable = "octave" + QString(executableSuffix);
}
if(settings.contains("OpenVAFExecutable")) {
QucsSettings.OpenVAFExecutable = settings.value("OpenVAFExecutable").toString();
} else {
QucsSettings.OpenVAFExecutable = "openvaf" + QString(executableSuffix);
}
if(settings.contains("QucsHomeDir"))
if(settings.value("QucsHomeDir").toString() != "")
QucsSettings.QucsHomeDir.setPath(settings.value("QucsHomeDir").toString());
@ -257,6 +262,7 @@ bool saveApplSettings()
settings.setValue("SimParameters",QucsSettings.SimParameters);
// settings.setValue("OctaveBinDir", QucsSettings.OctaveBinDir.canonicalPath());
settings.setValue("OctaveExecutable",QucsSettings.OctaveExecutable);
settings.setValue("OpenVAFExecutable",QucsSettings.OpenVAFExecutable);
settings.setValue("QucsHomeDir", QucsSettings.QucsHomeDir.canonicalPath());
settings.setValue("IgnoreVersion", QucsSettings.IgnoreFutureVersion);
settings.setValue("GraphAntiAliasing", QucsSettings.GraphAntiAliasing);

1
qucs/main.h
View File

@ -80,6 +80,7 @@ struct tQucsSettings {
QDir projsDir; // current user projects subdirectory
QDir AdmsXmlBinDir; // dir of admsXml executable
QDir AscoBinDir; // dir of asco executable
QString OpenVAFExecutable;
QString NgspiceExecutable; // Executables of external simulators
QString XyceExecutable;
QString XyceParExecutable;