From 2261b6caf2f7c9aa4e03b6cc26a6fdd8a8cb470a Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Sun, 19 Jan 2025 14:29:45 +0300 Subject: [PATCH] Remove remains of XSPICE CM builder --- qucs/components/libcomp.cpp | 28 ------------ qucs/components/libcomp.h | 2 - qucs/mouseactions.cpp | 11 ----- qucs/qucs.cpp | 88 ------------------------------------- 4 files changed, 129 deletions(-) diff --git a/qucs/components/libcomp.cpp b/qucs/components/libcomp.cpp index 955036cc..4e493156 100644 --- a/qucs/components/libcomp.cpp +++ b/qucs/components/libcomp.cpp @@ -385,34 +385,6 @@ QString LibComp::cdl_netlist() return spice_netlist(spicecompat::CDL); } -QStringList LibComp::getAttachedIFS() -{ - QString content; - QStringList includes,attach,ifs_lst; - ifs_lst.clear(); - - int r = loadSection("Spice",content,&includes,&attach); - if (r<0) return ifs_lst; - for (const QString& file : attach) { - if (file.endsWith(".ifs")) ifs_lst.append(getSubcircuitFile()+'/'+file); - } - return ifs_lst; -} - -QStringList LibComp::getAttachedMOD() -{ - QString content; - QStringList includes,attach,mod_lst; - mod_lst.clear(); - - int r = loadSection("Spice",content,&includes,&attach); - if (r<0) return mod_lst; - for (const QString& file : attach) { - if (file.endsWith(".mod")) mod_lst.append(getSubcircuitFile()+'/'+file); - } - return mod_lst; -} - QString LibComp::getSpiceLibrary() { QStringList files; diff --git a/qucs/components/libcomp.h b/qucs/components/libcomp.h index db4f4a3c..024de77c 100644 --- a/qucs/components/libcomp.h +++ b/qucs/components/libcomp.h @@ -32,8 +32,6 @@ public: bool createSubNetlist(QTextStream *, QStringList&, int type=1); QString getSubcircuitFile(); - QStringList getAttachedMOD(); // LibComp can reference cfunc.mod and ifspec.ifs - QStringList getAttachedIFS(); // These should be compiled before SPICE simulation QString getSpiceLibrary(); protected: diff --git a/qucs/mouseactions.cpp b/qucs/mouseactions.cpp index 57441383..f0ecea6b 100644 --- a/qucs/mouseactions.cpp +++ b/qucs/mouseactions.cpp @@ -918,17 +918,6 @@ void MouseActions::rightPressMenu(Schematic *Doc, QMouseEvent *Event, float fX, SLOT(slotSaveDiagramToGraphicsFile())); ComponentMenu->addAction(actExport); } - /*if (focusElement->Type & isComponent) { - Component *pc = (Component *)focusElement; - if (pc->Model == "EDD") { - QAction *actEDDtoIFS = new QAction(QObject::tr("Create XSPICE IFS"), QucsMain); - QObject::connect(actEDDtoIFS,SIGNAL(triggered(bool)),QucsMain,SLOT(slotEDDtoIFS())); - ComponentMenu->addAction(actEDDtoIFS); - QAction *actEDDtoMOD = new QAction(QObject::tr("Create XSPICE MOD"), QucsMain); - QObject::connect(actEDDtoMOD,SIGNAL(triggered(bool)),QucsMain,SLOT(slotEDDtoMOD())); - ComponentMenu->addAction(actEDDtoMOD); - } - }*/ } break; } diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp index 3056274e..23289803 100644 --- a/qucs/qucs.cpp +++ b/qucs/qucs.cpp @@ -3645,94 +3645,6 @@ void QucsApp::slotBuildVAModule() } - -/*void QucsApp::slotBuildXSPICEIfs(int mode) -{ - if (!isTextDocument(DocumentTab->currentWidget())) { - Schematic *Sch = (Schematic*)DocumentTab->currentWidget(); - - QFileInfo inf(Sch->getDocName()); - - QString msg,ext; - switch(mode) { - case spicecompat::cmgenSUBifs: - case spicecompat::cmgenEDDifs: msg = inf.path()+QDir::separator()+inf.baseName()+".ifs"; - ext = "XSPICE IFS (*.ifs)"; - break; - case spicecompat::cmgenSUBmod: - case spicecompat::cmgenEDDmod: msg = inf.path()+QDir::separator()+inf.baseName()+".mod"; - ext = "XSPICE MOD (*.mod)"; - break; - default: break; - } - - QString filename = QFileDialog::getSaveFileName(this,tr("Save XSPICE source"),msg,ext); - if (filename.isEmpty()) return; - - QFile f(filename); - if (f.open(QIODevice::WriteOnly)) { - QTextStream stream(&f); - CodeModelGen *cmgen = new CodeModelGen; - bool r = false; - switch(mode) { - case spicecompat::cmgenSUBifs: r = cmgen->createIFS(stream,Sch); - case spicecompat::cmgenEDDifs: { - for(Component *pc = Sch->a_DocComps.first(); pc != 0; pc = Sch->a_DocComps.next()) { - if (pc->isSelected) { - r = cmgen->createIFSfromEDD(stream,Sch,pc); - break; - } - } - } - break; - case spicecompat::cmgenEDDmod : { - for(Component *pc = Sch->a_DocComps.first(); pc != 0; pc = Sch->a_DocComps.next()) { - if (pc->isSelected) { - r = cmgen->createMODfromEDD(stream,Sch,pc); - break; - } - } - } - break; - default: r = false; - break; - } - QString errs; - if (!r) errs = tr("Create XSPICE CodeModel" - "Create CodeModel source file failed!" - "Schematic is not subciruit!"); - - messageDock->reset(); - messageDock->msgDock->setWindowTitle(tr("Debug messages dock")); - messageDock->builderTabs->setTabIcon(0,QPixmap()); - messageDock->builderTabs->setTabText(0,tr("XSPICE")); - messageDock->builderTabs->setTabIcon(1,QPixmap()); - messageDock->admsOutput-> - insertPlainText(QStringLiteral("Creating XSPICE source file: %1\n").arg(filename)); - errs += cmgen->getLog(); - if (errs.isEmpty()) { - messageDock->admsOutput->insertPlainText(tr("Success!\n")); - } else { - messageDock->admsOutput->insertPlainText(errs); - } - messageDock->msgDock->show(); - delete cmgen; - f.close(); - } - } -} - - -void QucsApp::slotEDDtoIFS() -{ - slotBuildXSPICEIfs(spicecompat::cmgenEDDifs); -} - -void QucsApp::slotEDDtoMOD() -{ - slotBuildXSPICEIfs(spicecompat::cmgenEDDmod); -}*/ - void QucsApp::slotShowModel() { DisplayDialog *dlg = new DisplayDialog(this,Symbol->ModelString,