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

wip - move combobox to toolbar

Browse Source
This commit is contained in:
Krasilnikov Sergey 2023-06-07 01:45:39 +03:00
parent ea517237a2
commit 2f05522b13
10 changed files with 151 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/ngspice/B-sources_updated.sch
View File

@ -1,4 +1,4 @@
<Qucs Schematic 0.0.21>
<Qucs Schematic 1.0.3>
<Properties>
<View=0,-10,1131,775,1.125,0,0>
<Grid=10,10,1>
@ -49,14 +49,14 @@
<360 340 360 340 "Imul" 390 310 0 "">
</Wires>
<Diagrams>
<Rect 500 290 256 161 3 #c0c0c0 1 00 1 -1 0.5 1 1 -1 1 1 1 -1 1 1 315 0 225 "" "" "">
<Rect 500 290 256 161 3 #c0c0c0 1 00 1 -1 0.5 1 1 -1 1 1 1 -1 1 1 315 0 225 0 0 0 "" "" "">
<"ngspice/tran.v(vmul)" #ff0000 0 3 0 0 0>
</Rect>
<Rect 500 510 256 161 3 #c0c0c0 1 00 1 -1 0.5 1 1 -1 1 1 1 -1 1 1 315 0 225 "" "" "">
<Rect 500 510 256 161 3 #c0c0c0 1 00 1 -1 0.5 1 1 -1 1 1 1 -1 1 1 315 0 225 0 0 0 "" "" "">
<"ngspice/tran.v(imul)" #ff0000 0 3 0 0 0>
</Rect>
<Rect 830 294 254 164 3 #c0c0c0 1 00 1 -1 0.5 1 1 -1 1 1 1 -1 1 1 315 0 225 "" "" "">
<"xyce/tran.V(MUL)" #0000ff 0 3 0 0 0>
<Rect 830 294 254 164 3 #c0c0c0 1 00 1 -1 0.5 1 1 -1 1 1 1 -1 1 1 315 0 225 0 0 0 "" "" "">
<"xyce/tran.V(IMUL)" #0000ff 0 3 0 0 0>
</Rect>
</Diagrams>
<Paintings>

104
qucs/extsimkernels/simsettingsdialog.cpp
View File

@ -26,35 +26,39 @@
SimSettingsDialog::SimSettingsDialog(QWidget *parent) :
QDialog(parent)
{
lblSimulator = new QLabel(tr("Default simulator"));
//lblSimulator = new QLabel(tr("Default simulator"));
lblNgspice = new QLabel(tr("Ngspice executable location"));
lblXyce = new QLabel(tr("Xyce executable location"));
lblXycePar = new QLabel(tr("Xyce Parallel executable location (openMPI installed required)"));
//lblXycePar = new QLabel(tr("Xyce Parallel executable location (openMPI installed required)"));
lblSpiceOpus = new QLabel(tr("SpiceOpus executable location"));
lblQucsator = new QLabel(tr("Qucsator executable location"));
lblNprocs = new QLabel(tr("Number of processors in a system:"));
//lblNprocs = new QLabel(tr("Number of processors in a system:"));
lblWorkdir = new QLabel(tr("Directory to store netlist and simulator output"));
lblSimParam = new QLabel(tr("Extra simulator parameters"));
cbxSimulator = new QComboBox(this);
QStringList items;
items<<"Ngspice"<<"Xyce (Serial)"<<"Xyce (Parallel)"<<"SpiceOpus"<<"Qucsator";
cbxSimulator->addItems(items);
// cbxSimulator = new QComboBox(this);
// cbxSimulator->addItem("Ngspice", 1);
// cbxSimulator->addItem("Xyce", 2);
// cbxSimulator->addItem("SpiceOpus", 4);
// cbxSimulator->addItem("Qucsator", 8);
//QStringList items;
//items<<"Ngspice"<<"Xyce (Serial)"<<"Xyce (Parallel)"<<"SpiceOpus"<<"Qucsator";
//cbxSimulator->addItems(items);
qDebug()<<QucsSettings.DefaultSimulator;
cbxSimulator->setCurrentIndex(QucsSettings.DefaultSimulator);
if (QucsSettings.DefaultSimulator==spicecompat::simNotSpecified)
cbxSimulator->setCurrentIndex(spicecompat::simNgspice);
// cbxSimulator->setCurrentIndex(QucsSettings.DefaultSimulator);
// if (QucsSettings.DefaultSimulator==spicecompat::simNotSpecified)
// cbxSimulator->setCurrentIndex(spicecompat::simNgspice);
edtNgspice = new QLineEdit(QucsSettings.NgspiceExecutable);
edtXyce = new QLineEdit(QucsSettings.XyceExecutable);
edtXycePar = new QLineEdit(QucsSettings.XyceParExecutable);
//edtXycePar = new QLineEdit(QucsSettings.XyceParExecutable);
edtSpiceOpus = new QLineEdit(QucsSettings.SpiceOpusExecutable);
edtQucsator = new QLineEdit(QucsSettings.Qucsator);
spbNprocs = new QSpinBox(this);
spbNprocs->setMinimum(1);
spbNprocs->setMaximum(256);
spbNprocs->setValue(1);
spbNprocs->setValue(QucsSettings.NProcs);
// spbNprocs = new QSpinBox(this);
// spbNprocs->setMinimum(1);
// spbNprocs->setMaximum(256);
// spbNprocs->setValue(1);
// spbNprocs->setValue(QucsSettings.NProcs);
edtWorkdir = new QLineEdit(QucsSettings.S4Qworkdir);
edtSimParam = new QLineEdit(QucsSettings.SimParameters);
@ -67,8 +71,8 @@ SimSettingsDialog::SimSettingsDialog(QWidget *parent) :
connect(btnSetNgspice,SIGNAL(clicked()),this,SLOT(slotSetNgspice()));
btnSetXyce = new QPushButton(tr("Select ..."));
connect(btnSetXyce,SIGNAL(clicked()),this,SLOT(slotSetXyce()));
btnSetXycePar = new QPushButton(tr("Select ..."));
connect(btnSetXycePar,SIGNAL(clicked()),this,SLOT(slotSetXycePar()));
//btnSetXycePar = new QPushButton(tr("Select ..."));
//connect(btnSetXycePar,SIGNAL(clicked()),this,SLOT(slotSetXycePar()));
btnSetSpOpus = new QPushButton(tr("Select ..."));
connect(btnSetSpOpus,SIGNAL(clicked()),this,SLOT(slotSetSpiceOpus()));
btnSetQucsator = new QPushButton(tr("Select ..."));
@ -78,10 +82,10 @@ SimSettingsDialog::SimSettingsDialog(QWidget *parent) :
QVBoxLayout *top = new QVBoxLayout;
QHBoxLayout *h8 = new QHBoxLayout;
h8->addWidget(lblSimulator,1);
h8->addWidget(cbxSimulator,3);
top->addLayout(h8);
// QHBoxLayout *h8 = new QHBoxLayout;
// h8->addWidget(lblSimulator,1);
// h8->addWidget(cbxSimulator,3);
// top->addLayout(h8);
QGroupBox *gbp1 = new QGroupBox(this);
gbp1->setTitle(tr("SPICE settings"));
@ -98,16 +102,16 @@ SimSettingsDialog::SimSettingsDialog(QWidget *parent) :
h2->addWidget(btnSetXyce,1);
top2->addLayout(h2);
top2->addWidget(lblXycePar);
QHBoxLayout *h4 = new QHBoxLayout;
h4->addWidget(edtXycePar,3);
h4->addWidget(btnSetXycePar,1);
top2->addLayout(h4);
QHBoxLayout *h5 = new QHBoxLayout;
h5->addWidget(lblNprocs);
h5->addWidget(spbNprocs);
top2->addLayout(h5);
// top2->addWidget(lblXycePar);
// QHBoxLayout *h4 = new QHBoxLayout;
// h4->addWidget(edtXycePar,3);
// h4->addWidget(btnSetXycePar,1);
// top2->addLayout(h4);
//
// QHBoxLayout *h5 = new QHBoxLayout;
// h5->addWidget(lblNprocs);
// h5->addWidget(spbNprocs);
// top2->addLayout(h5);
top2->addWidget(lblSpiceOpus);
QHBoxLayout *h7 = new QHBoxLayout;
@ -154,10 +158,10 @@ SimSettingsDialog::SimSettingsDialog(QWidget *parent) :
#ifndef Q_OS_UNIX
// Only Unix supports Xyce-parallel
edtXycePar->setDisabled(true);
lblXycePar->setDisabled(true);
lblNprocs->setDisabled(true);
spbNprocs->setDisabled(true);
// edtXycePar->setDisabled(true);
// lblXycePar->setDisabled(true);
// lblNprocs->setDisabled(true);
// spbNprocs->setDisabled(true);
#endif
}
@ -167,18 +171,18 @@ void SimSettingsDialog::slotApply()
{
QucsSettings.NgspiceExecutable = edtNgspice->text();
QucsSettings.XyceExecutable = edtXyce->text();
QucsSettings.XyceParExecutable = edtXycePar->text();
//QucsSettings.XyceParExecutable = edtXycePar->text();
QucsSettings.SpiceOpusExecutable = edtSpiceOpus->text();
QucsSettings.Qucsator = edtQucsator->text();
QucsSettings.NProcs = spbNprocs->value();
//QucsSettings.NProcs = spbNprocs->value();
QucsSettings.S4Qworkdir = edtWorkdir->text();
QucsSettings.SimParameters = edtSimParam->text();
if ((QucsSettings.DefaultSimulator != cbxSimulator->currentIndex())&&
(QucsSettings.DefaultSimulator != spicecompat::simNotSpecified)) {
QMessageBox::warning(this,tr("Simulator settings"),tr("Default simulator engine was changed!\n"
"Please restart Qucs to affect changes!"));
}
QucsSettings.DefaultSimulator = cbxSimulator->currentIndex();
// if ((QucsSettings.DefaultSimulator != cbxSimulator->currentIndex())&&
// (QucsSettings.DefaultSimulator != spicecompat::simNotSpecified)) {
// QMessageBox::warning(this,tr("Simulator settings"),tr("Default simulator engine was changed!\n"
// "Please restart Qucs to affect changes!"));
// }
// QucsSettings.DefaultSimulator = cbxSimulator->currentIndex();
accept();
saveApplSettings();
}
@ -206,13 +210,13 @@ void SimSettingsDialog::slotSetXyce()
}
}
void SimSettingsDialog::slotSetXycePar()
void SimSettingsDialog::slotSetXycePar() // TODO ZERGUD
{
QString s = QFileDialog::getOpenFileName(this,tr("Select Xyce Parallel executable location"),edtXycePar->text(),"All files (*)");
if (!s.isEmpty()) {
if (s.endsWith("xmpirun")) s += " -np %p";
edtXycePar->setText(s);
}
// QString s = QFileDialog::getOpenFileName(this,tr("Select Xyce Parallel executable location"),edtXycePar->text(),"All files (*)");
// if (!s.isEmpty()) {
// if (s.endsWith("xmpirun")) s += " -np %p";
// edtXycePar->setText(s);
// }
}
void SimSettingsDialog::slotSetSpiceOpus()

14
qucs/extsimkernels/simsettingsdialog.h
View File

@ -30,21 +30,21 @@ private:
QLabel *lblXyce;
QLabel *lblNgspice;
QLabel *lblSpiceOpus;
QLabel *lblXycePar;
QLabel *lblNprocs;
//QLabel *lblXycePar;
//QLabel *lblNprocs;
QLabel *lblQucsator;
QLabel *lblWorkdir;
QLabel *lblSimulator;
//QLabel *lblSimulator;
QLabel *lblSimParam;
QComboBox *cbxSimulator;
//QComboBox *cbxSimulator;
QLineEdit *edtNgspice;
QLineEdit *edtSpiceOpus;
QLineEdit *edtXyce;
QLineEdit *edtXycePar;
//QLineEdit *edtXycePar;
QLineEdit *edtQucsator;
QSpinBox *spbNprocs;
//QSpinBox *spbNprocs;
QLineEdit *edtWorkdir;
QLineEdit *edtSimParam;
@ -54,7 +54,7 @@ private:
QPushButton *btnSetNgspice;
QPushButton *btnSetSpOpus;
QPushButton *btnSetXyce;
QPushButton *btnSetXycePar;
//QPushButton *btnSetXycePar;
QPushButton *btnSetQucsator;
QPushButton *btnSetWorkdir;

3
qucs/extsimkernels/spicecompat.cpp
View File

@ -358,6 +358,9 @@ QString spicecompat::getDefaultSimulatorName(int simulator)
{
QString result;
switch (simulator) {
case spicecompat::simNotSpecified:
result = QObject::tr("Not Specified");
break;
case spicecompat::simQucsator:
result = QObject::tr("Qucsator");
break;

11
qucs/main.cpp
View File

@ -189,10 +189,11 @@ bool loadSettings()
if (settings.contains("fullTraceName")) QucsSettings.fullTraceName = settings.value("fullTraceName").toBool();
else QucsSettings.fullTraceName = false;
QucsSettings.FileToolbar = settings.contains("FileToolbar") ? settings.value("FileToolbar").toBool() : true;
QucsSettings.EditToolbar = settings.contains("EditToolbar") ? settings.value("EditToolbar").toBool() : true;
QucsSettings.ViewToolbar = settings.contains("ViewToolbar") ? settings.value("ViewToolbar").toBool() : true;
QucsSettings.WorkToolbar = settings.contains("WorkToolbar") ? settings.value("WorkToolbar").toBool() : true;
QucsSettings.FileToolbar = !settings.contains("FileToolbar") || settings.value("FileToolbar").toBool();
QucsSettings.EditToolbar = !settings.contains("EditToolbar") || settings.value("EditToolbar").toBool();
QucsSettings.ViewToolbar = !settings.contains("ViewToolbar") || settings.value("ViewToolbar").toBool();
QucsSettings.WorkToolbar = !settings.contains("WorkToolbar") || settings.value("WorkToolbar").toBool();
QucsSettings.SimulateToolbar = !settings.contains("SimulateToolbar") || settings.value("SimulateToolbar").toBool();
QucsSettings.RecentDocs = settings.value("RecentDocs").toString().split("*",qucs::SkipEmptyParts);
QucsSettings.numRecentDocs = QucsSettings.RecentDocs.count();
@ -279,6 +280,7 @@ bool saveApplSettings()
settings.setValue("EditToolbar", QucsSettings.EditToolbar);
settings.setValue("ViewToolbar", QucsSettings.ViewToolbar);
settings.setValue("WorkToolbar", QucsSettings.WorkToolbar);
settings.setValue("SimulateToolbar", QucsSettings.SimulateToolbar);
// Copy the list of directory paths in which Qucs should
// search for subcircuit schematics from qucsPathList
@ -843,6 +845,7 @@ int main(int argc, char *argv[])
// load existing settings (if any)
loadSettings();
// continue to set up overrides or default settings (some are saved on exit)
// check for relocation env variable

1
qucs/main.h
View File

@ -111,6 +111,7 @@ struct tQucsSettings {
bool EditToolbar;
bool ViewToolbar;
bool WorkToolbar;
bool SimulateToolbar;
};
extern tQucsSettings QucsSettings; // extern because nearly everywhere used

62
qucs/qucs.cpp
View File

@ -166,6 +166,7 @@ QucsApp::QucsApp()
initView();
initActions();
initMenuBar();
fillSimulatorsComboBox();
initToolBar();
initStatusBar();
viewToolBar->setChecked(true);
@ -180,6 +181,7 @@ QucsApp::QucsApp()
editToolbar->setVisible(QucsSettings.EditToolbar);
viewToolbar->setVisible(QucsSettings.ViewToolbar);
workToolbar->setVisible(QucsSettings.WorkToolbar);
simulateToolbar->setVisible(QucsSettings.SimulateToolbar);
// instance of small text search dialog
SearchDia = new SearchDialog(this);
@ -344,6 +346,9 @@ void QucsApp::initView()
QVBoxLayout *CompGroupLayout = new QVBoxLayout();
QHBoxLayout *CompSearchLayout = new QHBoxLayout();
simulatorsCombobox = new QComboBox(this);
connect(simulatorsCombobox, SIGNAL(activated(int)), SLOT(slotChangeSimulator(int)));
CompChoose = new QComboBox(this);
CompComps = new QListWidget(this);
CompComps->setViewMode(QListView::IconMode);
@ -722,6 +727,60 @@ void QucsApp::fillComboBox (bool setAll)
}
}
void QucsApp::fillSimulatorsComboBox() {
simulatorsCombobox->clear();
simulatorsCombobox->addItem(spicecompat::getDefaultSimulatorName(spicecompat::simNotSpecified), 0);
if (QFile::exists(QucsSettings.NgspiceExecutable)) {
simulatorsCombobox->addItem(spicecompat::getDefaultSimulatorName(spicecompat::simNgspice), 1);
}
if (QFile::exists(QucsSettings.XyceExecutable)) {
simulatorsCombobox->addItem(spicecompat::getDefaultSimulatorName(spicecompat::simXyce), 2);
}
if (QFile::exists(QucsSettings.SpiceOpusExecutable)) {
simulatorsCombobox->addItem(spicecompat::getDefaultSimulatorName(spicecompat::simSpiceOpus), 4);
}
if (QFile::exists(QucsSettings.Qucsator)) {
simulatorsCombobox->addItem(spicecompat::getDefaultSimulatorName(spicecompat::simQucsator), 8);
}
QString current = spicecompat::getDefaultSimulatorName(QucsSettings.DefaultSimulator);
int idx = simulatorsCombobox->findText(current);
simulatorsCombobox->setCurrentIndex(idx < 0 ? 0 : idx);
simulate->setEnabled(simulatorsCombobox->currentIndex() != 0);
}
void QucsApp::slotChangeSimulator(int index) {
int simu = spicecompat::simNotSpecified;
int idx = simulatorsCombobox->itemData(index).toInt();
switch (idx) {
case 1:
simu = spicecompat::simNgspice;
break;
case 2:
simu = spicecompat::simXyce;
break;
case 3:
simu = spicecompat::simSpiceOpus;
break;
case 5:
simu = spicecompat::simQucsator;
break;
default:
simu = spicecompat::simNotSpecified;
break;
}
QucsSettings.DefaultSimulator = simu;
saveApplSettings();
simulate->setEnabled(simulatorsCombobox->currentIndex() != 0);
SimulatorLabel->setText(spicecompat::getDefaultSimulatorName(QucsSettings.DefaultSimulator));
}
// ----------------------------------------------------------
// Whenever the Component Library ComboBox is changed, this slot fills the
// Component IconView with the appropriate components.
@ -2105,6 +2164,7 @@ void QucsApp::saveSettings()
QucsSettings.EditToolbar = editToolbar->isVisible();
QucsSettings.ViewToolbar = viewToolbar->isVisible();
QucsSettings.WorkToolbar = workToolbar->isVisible();
QucsSettings.SimulateToolbar = simulateToolbar->isVisible();
saveApplSettings();
}
@ -3060,7 +3120,7 @@ void QucsApp::slotSimSettings()
SimSettingsDialog *SetDlg = new SimSettingsDialog(this);
SetDlg->exec();
delete SetDlg;
SimulatorLabel->setText(spicecompat::getDefaultSimulatorName(QucsSettings.DefaultSimulator));
fillSimulatorsComboBox();
}
void QucsApp::slotSimulateWithSpice()

5
qucs/qucs.h
View File

@ -168,6 +168,7 @@ private slots:
void slotSelectLibComponent(QTreeWidgetItem*);
void slotOpenContent(const QModelIndex &);
void slotSetCompView(int);
void slotChangeSimulator(int);
void slotButtonProjNew();
void slotButtonProjOpen();
void slotButtonProjDel();
@ -255,6 +256,7 @@ private:
bool deleteProject(const QString &);
void updatePortNumber(QucsDoc*, int);
void fillComboBox(bool);
void fillSimulatorsComboBox();
void switchSchematicDoc(bool);
void switchEditMode(bool);
void changeSchematicSymbolMode(Schematic*);
@ -314,7 +316,8 @@ private:
// submenus for the PDF documents
QMenu *helpTechnical, *helpReport, *helpTutorial;
QToolBar *fileToolbar, *editToolbar, *viewToolbar, *workToolbar;
QComboBox *simulatorsCombobox;
QToolBar *fileToolbar, *editToolbar, *viewToolbar, *workToolbar, *simulateToolbar;
// Shortcuts for scrolling schematic / TextEdit
// This is rather cumbersome -> Make this with a QScrollView instead??

2
qucs/qucs_actions.cpp
View File

@ -667,7 +667,7 @@ extern QString lastDirOpenSave; // to remember last directory and file
// component edit dialog.
void QucsApp::editFile(const QString& File)
{
if ((QucsSettings.Editor.toLower() == "qucs") | QucsSettings.Editor.isEmpty())
if ((QucsSettings.Editor.toLower() == "qucs") || QucsSettings.Editor.isEmpty())
{
// The Editor is 'qucs' or empty, open a net document tab
if (File.isEmpty()) {

12
qucs/qucs_init.cpp
View File

@ -915,11 +915,14 @@ void QucsApp::initToolBar()
workToolbar->addAction(insEquation);
workToolbar->addAction(insGround);
workToolbar->addAction(insPort);
workToolbar->addAction(simulate);
workToolbar->addAction(dpl_sch);
workToolbar->addAction(setMarker);
workToolbar->addSeparator(); // <<<=======================
//workToolbar->addSeparator(); // <<<=======================
simulateToolbar = new QToolBar(tr("Simulate"));
this->addToolBar(simulateToolbar);
simulateToolbar->addWidget(reinterpret_cast<QWidget *>(simulatorsCombobox));
simulateToolbar->addAction(simulate);
simulateToolbar->addAction(dpl_sch);
simulateToolbar->addAction(setMarker);
}
// ----------------------------------------------------------
@ -1004,6 +1007,7 @@ void QucsApp::slotViewToolBar(bool toggle)
editToolbar->setVisible(toggle);
viewToolbar->setVisible(toggle);
workToolbar->setVisible(toggle);
simulateToolbar->setVisible(toggle);
}
// ----------------------------------------------------------