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

New feature CDL netlist export

Browse Source 
-Introduced new parameter for cdl-type netlist export to Component::getExpression() and
 derivatives. It is used for CDL type specific netlist parameter export.

Signed-off-by: ThomasZecha <zecha@ihp-microelectronics.com>
This commit is contained in:
ThomasZecha 2024-12-17 11:00:45 +01:00
parent 62fe9727a6
commit 718d9c37ca
20 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs/components/component.cpp
View File

@ -828,7 +828,7 @@ QString Component::getVerilogACode() {
}
}
QString Component::getExpression(bool) {
QString Component::getExpression(bool, bool) {
return QString();
}

2
qucs/components/component.h
View File

@ -44,7 +44,7 @@ public:
QString getNetlist();
QString getSpiceNetlist(bool isXyce = false, bool isCdl = false);
QString getVerilogACode();
virtual QString getExpression(bool isXyce = false);
virtual QString getExpression(bool isXyce = false, bool isCdl = false);
virtual QString getEquations(QString sim, QStringList &dep_vars);
virtual QStringList getExtraVariables();
virtual QString getProbeVariable(bool isXyce = false);

9
qucs/components/equation.cpp
View File

@ -39,7 +39,7 @@ Equation::Equation()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkBlue,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkBlue,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr("Equation"),
QColor(0,0,0), QFontInfo(f).pixelSize()));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;
@ -51,7 +51,7 @@ Equation::Equation()
Props.append(new Property("y", "1", true));
Props.append(new Property("Export", "yes", false,
QObject::tr("put result into dataset")+" [yes, no]"));
QObject::tr("put result into dataset")+" [yes, no]"));
}
Equation::~Equation()
@ -120,10 +120,13 @@ QString Equation::getVAExpressions()
* \brief Equation::getExpression Extract equations that don't contain simulation variables
* (voltages/cureents) in .PARAM section of spice netlist
* \param isXyce True if Xyce is used.
* \param isCdl True if CDL is used.
* \return .PARAM section of spice netlist as a single string.
*/
QString Equation::getExpression(bool isXyce)
QString Equation::getExpression(bool isXyce, bool isCdl /* = false */)
{
Q_UNUSED(isCdl);
if (isActive != COMP_IS_ACTIVE) return QString();
QStringList ng_vars,ngsims;

2
qucs/components/equation.h
View File

@ -28,7 +28,7 @@ public:
~Equation();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
QString getEquations(QString sim, QStringList &dep_vars);
QString getVAvariables();
QString getVAExpressions();

5
qucs/components/iprobe.h
View File

@ -27,10 +27,11 @@ public:
~iProbe();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString getExpression(bool) { return "";}
QString getExpression(bool, bool) { return "";}
QString getProbeVariable(bool isXyce = false);
protected:
QString spice_netlist(bool isXyce, bool isCdl = false);
QString spice_netlist(bool isXyce = false, bool isCdl = false);
};
#endif

6
qucs/components/mosfet_sub.cpp
View File

@ -150,7 +150,7 @@ Component* MOSFET_sub::newOne()
return p;
}
QString MOSFET_sub::spice_netlist(bool isXyce, bool netlistModel /* = true */)
QString MOSFET_sub::spice_netlist(bool isXyce, bool isCdl /* = false */)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
QList<int> pin_seq;
@ -209,7 +209,7 @@ QString MOSFET_sub::spice_netlist(bool isXyce, bool netlistModel /* = true */)
.arg(Name).arg(l).arg(w).arg(ad).arg(as).arg(pd).arg(ps).arg(getProperty("Temp")->Value);
}
if (netlistModel)
if (!isCdl)
{
s += QStringLiteral(".MODEL MMOD_%1 %2MOS (%3)\n").arg(Name).arg(mosfet_type).arg(par_str);
}
@ -219,7 +219,7 @@ QString MOSFET_sub::spice_netlist(bool isXyce, bool netlistModel /* = true */)
QString MOSFET_sub::cdl_netlist()
{
return spice_netlist(false, false);
return spice_netlist(false, true);
}
// -------------------------------------------------------

4
qucs/spicecomponents/incl_script.cpp
View File

@ -77,9 +77,9 @@ Element* InclScript::info(QString& Name, char* &BitmapFile, bool getNewOne)
return 0;
}
QString InclScript::getExpression(bool)
QString InclScript::getExpression(bool, bool isCdl /* = false */)
{
if (isActive != COMP_IS_ACTIVE)
if (isActive != COMP_IS_ACTIVE || isCdl)
return QString();
return Props.at(0)->Value+"\n";
}

2
qucs/spicecomponents/incl_script.h
View File

@ -27,7 +27,7 @@ public:
~InclScript();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
protected:
QString vhdlCode(int) { return QString(); }

4
qucs/spicecomponents/sp_func.cpp
View File

@ -70,9 +70,9 @@ Element* SpiceFunc::info(QString& Name, char* &BitmapFile, bool getNewOne)
return 0;
}
QString SpiceFunc::getExpression(bool)
QString SpiceFunc::getExpression(bool, bool isCdl /* = false */)
{
if (isActive != COMP_IS_ACTIVE) return QString();
if (isActive != COMP_IS_ACTIVE || isCdl) return QString();
QString s;
s.clear();

2
qucs/spicecomponents/sp_func.h
View File

@ -28,7 +28,7 @@ public:
~SpiceFunc();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
protected:
QString vhdlCode(int) { return QString(); }

4
qucs/spicecomponents/sp_globalpar.cpp
View File

@ -70,14 +70,14 @@ Element* SpiceGlobalParam::info(QString& Name, char* &BitmapFile, bool getNewOne
}
QString SpiceGlobalParam::getExpression(bool)
QString SpiceGlobalParam::getExpression(bool, bool isCdl /* = false */)
{
if (isActive != COMP_IS_ACTIVE) return QString();
QString s;
s.clear();
for (Property *pp : Props) {
s += QStringLiteral(".GLOBAL_PARAM %1 = %2\n").arg(pp->Name).arg(pp->Value);
s += QStringLiteral(".%1PARAM %2 = %3\n").arg(isCdl ? "" : "GLOBAL_").arg(pp->Name).arg(pp->Value);
}
return s;
}

2
qucs/spicecomponents/sp_globalpar.h
View File

@ -29,7 +29,7 @@ public:
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
static void splitEqn(QString &eqn, QStringList &tokens);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
protected:
QString vhdlCode(int) { return QString(); }

4
qucs/spicecomponents/sp_ic.cpp
View File

@ -69,9 +69,9 @@ Element* SpiceIC::info(QString& Name, char* &BitmapFile, bool getNewOne)
return 0;
}
QString SpiceIC::getExpression(bool)
QString SpiceIC::getExpression(bool, bool isCdl /* = false */)
{
if (isActive != COMP_IS_ACTIVE) return QString();
if (isActive != COMP_IS_ACTIVE || isCdl) return QString();
QString s;
s.clear();

2
qucs/spicecomponents/sp_ic.h
View File

@ -28,7 +28,7 @@ public:
~SpiceIC();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
protected:
QString vhdlCode(int) { return QString(); }

4
qucs/spicecomponents/sp_nodeset.cpp
View File

@ -69,9 +69,9 @@ Element* SpiceNodeset::info(QString& Name, char* &BitmapFile, bool getNewOne)
return 0;
}
QString SpiceNodeset::getExpression(bool)
QString SpiceNodeset::getExpression(bool, bool isCdl /* = false */)
{
if (isActive != COMP_IS_ACTIVE) return QString();
if (isActive != COMP_IS_ACTIVE || isCdl) return QString();
QString s;
s.clear();

2
qucs/spicecomponents/sp_nodeset.h
View File

@ -28,7 +28,7 @@ public:
~SpiceNodeset();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
protected:
QString vhdlCode(int) { return QString(); }

4
qucs/spicecomponents/sp_options.cpp
View File

@ -71,9 +71,9 @@ Element* SpiceOptions::info(QString& Name, char* &BitmapFile, bool getNewOne)
return 0;
}
QString SpiceOptions::getExpression(bool isXyce)
QString SpiceOptions::getExpression(bool isXyce, bool isCdl /* = false */)
{
if (isActive != COMP_IS_ACTIVE) return QString();
if (isActive != COMP_IS_ACTIVE || isCdl) return QString();
QString s;
s.clear();

2
qucs/spicecomponents/sp_options.h
View File

@ -29,7 +29,7 @@ public:
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
static void splitEqn(QString &eqn, QStringList &tokens);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
protected:
QString vhdlCode(int) { return QString(); }

11
qucs/spicecomponents/sp_parameter.cpp
View File

@ -69,14 +69,21 @@ Element* SpiceParam::info(QString& Name, char* &BitmapFile, bool getNewOne)
return 0;
}
QString SpiceParam::getExpression(bool)
QString SpiceParam::getExpression(bool, bool isCdl /* = false */)
{
if (isActive != COMP_IS_ACTIVE) return QString();
QString s;
s.clear();
for (Property *pp : Props) {
s += QStringLiteral(".PARAM %1 = %2\n").arg(pp->Name).arg(pp->Value);
if (isCdl)
{
s += QStringLiteral(".PARAM %1=%2\n").arg(pp->Name).arg(pp->Value);
}
else
{
s += QStringLiteral(".PARAM %1 = %2\n").arg(pp->Name).arg(pp->Value);
}
}
return s;
}

2
qucs/spicecomponents/sp_parameter.h
View File

@ -29,7 +29,7 @@ public:
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
static void splitEqn(QString &eqn, QStringList &tokens);
QString getExpression(bool isXyce);
QString getExpression(bool isXyce, bool isCdl = false);
protected:
QString vhdlCode(int) { return QString(); }