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

Introduce optional netlisting to console

Browse Source 
-Implemented conditional netlisting to console for CDL
-forced using trailing a_ for class attributes instead ms-style m_ for
 class QucsApp
-removed unused attribute m_projModel from class QucsApp

Signed-off-by: ThomasZecha <zecha@ihp-microelectronics.com>
This commit is contained in:
ThomasZecha 2025-01-09 17:59:32 +01:00
parent b4d985d268
commit e6f35a35ff
3 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs/main.cpp
View File

@ -1099,7 +1099,7 @@ int main(int argc, char *argv[])
} }
} }
QucsMain = new QucsApp(); QucsMain = new QucsApp(netlist2Console);
//1a.setMainWidget(QucsMain); //1a.setMainWidget(QucsMain);
QucsMain->show(); QucsMain->show();

38
qucs/qucs.cpp
View File

@ -88,9 +88,9 @@
//#include "extsimkernels/codemodelgen.h" //#include "extsimkernels/codemodelgen.h"
#include "symbolwidget.h" #include "symbolwidget.h"
QucsApp::QucsApp() QucsApp::QucsApp(bool netlist2Console) :
a_netlist2Console(netlist2Console)
{ {
windowTitle = misc::getWindowTitle(); windowTitle = misc::getWindowTitle();
setWindowTitle(windowTitle); setWindowTitle(windowTitle);
@ -575,11 +575,11 @@ void QucsApp::initView()
messageDock = new MessageDock(this); messageDock = new MessageDock(this);
// initial projects directory model // initial projects directory model
m_homeDirModel = new QucsFileSystemModel(this); a_homeDirModel = new QucsFileSystemModel(this);
m_proxyModel = new QucsSortFilterProxyModel(); a_proxyModel = new QucsSortFilterProxyModel();
//m_proxyModel->setDynamicSortFilter(true); //a_proxyModel->setDynamicSortFilter(true);
// show all directories (project and non-project) // show all directories (project and non-project)
m_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs); a_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs);
// ............................................ // ............................................
QString path = QucsSettings.qucsWorkspaceDir.absolutePath(); QString path = QucsSettings.qucsWorkspaceDir.absolutePath();
@ -1386,21 +1386,21 @@ void QucsApp::readProjects()
if (path == homepath) { if (path == homepath) {
// in Qucs Home, disallow further up in the dirs tree // in Qucs Home, disallow further up in the dirs tree
m_homeDirModel->setFilter(QDir::NoDotAndDotDot | QDir::AllDirs); a_homeDirModel->setFilter(QDir::NoDotAndDotDot | QDir::AllDirs);
} else { } else {
m_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs); a_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs);
} }
// set the root path // set the root path
QModelIndex rootModelIndex = m_homeDirModel->setRootPath(path); QModelIndex rootModelIndex = a_homeDirModel->setRootPath(path);
// assign the model to the proxy and the proxy to the view // assign the model to the proxy and the proxy to the view
m_proxyModel->setSourceModel(m_homeDirModel); a_proxyModel->setSourceModel(a_homeDirModel);
m_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); a_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
// sort by first column (file name, only column show in the QListView) // sort by first column (file name, only column show in the QListView)
m_proxyModel->sort(0); a_proxyModel->sort(0);
Projects->setModel(m_proxyModel); Projects->setModel(a_proxyModel);
// fix the listview on the root path of the model // fix the listview on the root path of the model
Projects->setRootIndex(m_proxyModel->mapFromSource(rootModelIndex)); Projects->setRootIndex(a_proxyModel->mapFromSource(rootModelIndex));
} }
// ---------------------------------------------------------- // ----------------------------------------------------------
@ -3524,7 +3524,8 @@ void QucsApp::slotSaveCdlNetlist()
Schematic* schematic = dynamic_cast<Schematic*>(DocumentTab->currentWidget()); Schematic* schematic = dynamic_cast<Schematic*>(DocumentTab->currentWidget());
Q_ASSERT(schematic != nullptr); Q_ASSERT(schematic != nullptr);
#ifdef NETLIST_CDL_TO_CONSOLE // for fast testing purposes if (a_netlist2Console)
{
QString netlistString; QString netlistString;
{ {
QTextStream netlistStream(&netlistString); QTextStream netlistStream(&netlistString);
@ -3540,7 +3541,9 @@ void QucsApp::slotSaveCdlNetlist()
printf("\nCDL netlist:\n%s\n", netlistString.toUtf8().constData()); printf("\nCDL netlist:\n%s\n", netlistString.toUtf8().constData());
Content->refresh(); Content->refresh();
} }
#else }
else
{
QFileInfo inf(schematic->getDocName()); QFileInfo inf(schematic->getDocName());
QString filename = QFileDialog::getSaveFileName( QString filename = QFileDialog::getSaveFileName(
this, this,
@ -3569,8 +3572,7 @@ void QucsApp::slotSaveCdlNetlist()
netlistFile.close(); netlistFile.close();
Content->refresh(); Content->refresh();
} }
#endif }
} }
} }

8
qucs/qucs.h
View File

@ -88,7 +88,7 @@ protected:
class QucsApp : public QMainWindow { class QucsApp : public QMainWindow {
Q_OBJECT Q_OBJECT
public: public:
QucsApp(); QucsApp(bool netlist2Console);
~QucsApp(); ~QucsApp();
bool closeAllFiles(); bool closeAllFiles();
bool gotoPage(const QString&); // to load a document bool gotoPage(const QString&); // to load a document
@ -251,10 +251,10 @@ private:
// ********** Properties ************************************************ // ********** Properties ************************************************
QStack<QString> HierarchyHistory; // keeps track of "go into subcircuit" QStack<QString> HierarchyHistory; // keeps track of "go into subcircuit"
QString QucsFileFilter; QString QucsFileFilter;
QFileSystemModel *m_homeDirModel; QFileSystemModel *a_homeDirModel;
QucsSortFilterProxyModel *m_proxyModel; QucsSortFilterProxyModel *a_proxyModel;
QFileSystemModel *m_projModel;
int ccCurIdx; // CompChooser current index (used during search) int ccCurIdx; // CompChooser current index (used during search)
bool a_netlist2Console;
// ********** Methods *************************************************** // ********** Methods ***************************************************
void initView(); void initView();