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

Implemented Ngspice distortion analysis

Browse Source
This commit is contained in:
Vadim Kuznetzov 2015-05-20 12:21:58 +03:00
parent 469fb4779b
commit 3149fac0b8
12 changed files with 159 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
qucs/bitmaps/sp_disto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 602 B

2
qucs/components/CMakeLists.txt
View File

@ -83,6 +83,7 @@ LTL_SPICE.cpp
UDRCTL_SPICE.cpp
sp_customsim.cpp
sp_fourier.cpp
sp_disto.cpp
)
SET(COMPONENTS_HDRS
@ -287,6 +288,7 @@ LTL_SPICE.h
UDRCTL_SPICE.h
sp_customsim.h
sp_fourier.h
sp_disto.h
)

2
qucs/components/component.cpp
View File

@ -198,7 +198,7 @@ void Component::paint(ViewPainter *p)
p->Painter->setFont(newFont);
p->map(cx, cy, x, y);
if (Model==".CUSTOMSIM") p->Painter->setPen(QPen(Qt::cyan,2));
if ((Model==".CUSTOMSIM")||(Model==".DISTO")) p->Painter->setPen(QPen(Qt::cyan,2));
else if (Model==".FOURIER") p->Painter->setPen(QPen(Qt::darkRed,2));
else p->Painter->setPen(QPen(Qt::darkBlue,2));

1
qucs/components/components.h
View File

@ -230,6 +230,7 @@
// Spice simulations
#include "sp_fourier.h"
#include "sp_disto.h"
#include "sp_customsim.h"
#endif

92
qucs/components/sp_disto.cpp Normal file
View File

@ -0,0 +1,92 @@
/***************************************************************************
sp_disto.cpp
------------
begin : Wed May 20 2015
copyright : (C) 2015 by Vadim Kuznetsov
email : ra3xdh@gmail.com
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "sp_disto.h"
#include "main.h"
#include "misc.h"
#include "extsimkernels/spicecompat.h"
SpiceDisto::SpiceDisto()
{
isSimulation = true;
Description = QObject::tr("Distortion simulation");
QString s = Description;
int a = s.indexOf(" ");
if (a != -1) s[a] = '\n';
Texts.append(new Text(0, 0, s.left(a), Qt::darkRed, QucsSettings.largeFontSize));
if (a != -1)
Texts.append(new Text(0, 0, s.mid(a+1), Qt::darkRed, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+104; y2 = y1+59;
tx = 0;
ty = y2+1;
Model = ".DISTO";
Name = "DISTO";
SpiceModel = ".DISTO";
// The index of the first 4 properties must not changed. Used in recreate().
Props.append(new Property("Type", "lin", true,
QObject::tr("sweep type")+" [lin, oct, dec]"));
Props.append(new Property("Start", "1 Hz", true,
QObject::tr("start frequency in Hertz")));
Props.append(new Property("Stop", "10 kHz", true,
QObject::tr("stop frequency in Hertz")));
Props.append(new Property("Points", "100", true,
QObject::tr("number of simulation steps")));
Props.append(new Property("f2overf1","",false,
QObject::tr("Second frequency parameter")));
}
SpiceDisto::~SpiceDisto()
{
}
Component* SpiceDisto::newOne()
{
return new SpiceDisto();
}
Element* SpiceDisto::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Distortion simulation");
BitmapFile = (char *) "sp_disto";
if(getNewOne) return new SpiceDisto();
return 0;
}
QString SpiceDisto::spice_netlist(bool isXyce)
{
QString s;
if (!isXyce) {
QString fstart = spicecompat::normalize_value(Props.at(1)->Value); // Start freq.
QString fstop = spicecompat::normalize_value(Props.at(2)->Value); // Stop freq.
s = QString("DISTO %1 %2 %3 %4").arg(Props.at(0)->Value).arg(Props.at(3)->Value)
.arg(fstart).arg(fstop);
if (Props.at(4)->Value.remove(' ').isEmpty()) s += "\n";
else s += Props.at(4)->Value + "\n";
} else {
s.clear();
}
return s;
}

35
qucs/components/sp_disto.h Normal file
View File

@ -0,0 +1,35 @@
/***************************************************************************
sp_disto.h
----------
begin : Wed May 20 2015
copyright : (C) 2015 by Vadim Kuznetsov
email : ra3xdh@gmail.com
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef SP_DISTO_H
#define SP_DISTO_H
#include "component.h"
class SpiceDisto : public Component {
public:
SpiceDisto();
~SpiceDisto();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
protected:
QString spice_netlist(bool isXyce = false);
};
#endif

6
qucs/components/sp_fourier.cpp
View File

@ -17,6 +17,7 @@
#include "sp_fourier.h"
#include "main.h"
#include "misc.h"
#include "extsimkernels/spicecompat.h"
SpiceFourier::SpiceFourier()
@ -70,11 +71,12 @@ Element* SpiceFourier::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString SpiceFourier::spice_netlist(bool isXyce)
{
QString s;
QString f0 = spicecompat::normalize_value(Props.at(2)->Value);
if (!isXyce) {
s = QString("set nfreqs=%1\n").arg(Props.at(1)->Value);
s += QString("FOURIER %1 %2 > spice4qucs.four\n").arg(Props.at(2)->Value).arg(Props.at(3)->Value);
s += QString("FOURIER %1 %2 > spice4qucs.four\n").arg(f0).arg(Props.at(3)->Value);
} else {
s = QString(".FOUR %1 %2\n").arg(Props.at(2)->Value).arg(Props.at(3)->Value);
s = QString(".FOUR %1 %2\n").arg(f0).arg(Props.at(3)->Value);
}
return s;

5
qucs/components/volt_ac.cpp
View File

@ -76,7 +76,7 @@ Element* Volt_ac::info(QString& Name, char* &BitmapFile, bool getNewOne)
return 0;
}
QString Volt_ac::spice_netlist(bool)
QString Volt_ac::spice_netlist(bool isXyce)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
@ -91,6 +91,7 @@ QString Volt_ac::spice_netlist(bool)
QString theta = Props.at(3)->Value;
theta.remove(' ');
if (theta.isEmpty()) theta="0";
s += QString(" DC 0 SIN(0 %1 %2 0 %3) AC %4\n").arg(volts).arg(freq).arg(theta).arg(volts);
if (isXyce) s += QString(" DC 0 SIN(0 %1 %2 0 %3) AC %4\n").arg(volts).arg(freq).arg(theta).arg(volts);
else s += QString(" DISTOF1 %1 DC 0 SIN(0 %1 %2 0 %3) AC %4\n").arg(volts).arg(freq).arg(theta).arg(volts);
return s;
}

2
qucs/extsimkernels/ngspice.cpp
View File

@ -63,6 +63,7 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
if (sim_typ==".AC") simulations.append("ac");
if (sim_typ==".TR") simulations.append("tran");
if (sim_typ==".CUSTOMSIM") simulations.append("custom");
if (sim_typ==".DISTO") simulations.append("disto");
if ((sim_typ==".SW")&&
(pc->Props.at(0)->Value.startsWith("DC"))) simulations.append("dc");
// stream<<s;
@ -146,6 +147,7 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
QString sim_typ = pc->Model;
QString s = pc->getSpiceNetlist();
if ((sim_typ==".AC")&&(sim=="ac")) stream<<s;
if ((sim_typ==".DISTO")&&(sim=="disto")) stream<<s;
if ((sim_typ==".TR")&&(sim=="tran")) {
stream<<s;
Q3PtrList<Component> comps(Sch->DocComps); // find Fourier tran

27
qucs/extsimkernels/spicecompat.cpp
View File

@ -126,11 +126,13 @@ void spicecompat::splitEqn(QString &eqn, QStringList &tokens)
bool spicecompat::containNodes(QStringList &tokens, QStringList &vars)
{
QRegExp var_pattern("^[\\w]+\\.([IV]t|[iv]|vn|Vb|[IV])$");
QRegExp disto_var("^[Dd][Ii][Ss][Tt][Oo][0-9]\\.[Vv]$");
QStringList system_vars;
system_vars.clear();
system_vars<<"frequency"<<"acfrequency"<<"time"<<"hbfrequncy";
foreach (QString tok,tokens) {
if (var_pattern.exactMatch(tok)) return true;
if (disto_var.exactMatch(tok)) return true;
if (system_vars.contains(tok)) return true;
if (tok.endsWith("#branch")) return true;
if (vars.contains(tok)) return true;
@ -151,6 +153,7 @@ bool spicecompat::containNodes(QStringList &tokens, QStringList &vars)
* \param[in/out] tokens
* \param[out] sim Used simulation.
* "ac" --- AC simulation;
* "disto" --- DISTO simulation;
* "dc" --- DC simulation;
* "tran" --- Transient simulation;
* "all" --- All simulations;
@ -158,23 +161,27 @@ bool spicecompat::containNodes(QStringList &tokens, QStringList &vars)
void spicecompat::convertNodeNames(QStringList &tokens, QString &sim)
{
QRegExp var_pattern("^[\\w]+\\.([IV]t|[iv]|vn|Vb|[IV])$");
QRegExp disto_var("^[Dd][Ii][Ss][Tt][Oo][0-9]\\.[Vv]$");
for (QStringList::iterator it=tokens.begin();it!=tokens.end();it++) {
if ((*it).endsWith("#branch")) sim="all";
if ((*it).toUpper()=="V") {
it++;
if ((*it)=="(") sim="all";
}
if (disto_var.exactMatch(*it)) sim = "disto";
if (var_pattern.exactMatch(*it)) {
if ((it->endsWith(".v"))||(it->endsWith(".i"))) sim = "ac";
if ((it->endsWith(".Vt"))||(it->endsWith(".It"))) sim = "tran";
if ((it->endsWith(".V"))||(it->endsWith(".I"))) sim = "dc";
QString suffix = it->section('.',1,1);
int idx = it->indexOf('.');
int cnt = it->count();
it->chop(cnt-idx);
if (suffix.toUpper().startsWith("I"))
*it = QString("V%1#branch").arg(*it);
else *it = QString("V(%2)").arg(*it);
if (!disto_var.exactMatch(*it)) {
if ((it->endsWith(".v"))||(it->endsWith(".i"))) sim = "ac";
if ((it->endsWith(".Vt"))||(it->endsWith(".It"))) sim = "tran";
if ((it->endsWith(".V"))||(it->endsWith(".I"))) sim = "dc";
QString suffix = it->section('.',1,1);
int idx = it->indexOf('.');
int cnt = it->count();
it->chop(cnt-idx);
if (suffix.toUpper().startsWith("I"))
*it = QString("V%1#branch").arg(*it);
else *it = QString("V(%2)").arg(*it);
}
} else if ((*it=="frequency")||(*it=="acfrequency")) {
sim = "ac";
} else if (*it=="time") {

1
qucs/module.cpp
View File

@ -460,6 +460,7 @@ void Module::registerModules (void) {
// spice simulations
REGISTER_SPICE_SIM_1 (SpiceFourier);
REGISTER_SPICE_SIM_1 (SpiceDisto);
REGISTER_SPICE_SIM_1 (SpiceCustomSim);

1
qucs/qucs.qrc
View File

@ -261,5 +261,6 @@
<file>bitmaps/UDRCTL_SPICE.png</file>
<file>bitmaps/sp_fourier.png</file>
<file>bitmaps/sp_customsim.png</file>
<file>bitmaps/sp_disto.png</file>
</qresource>
</RCC>