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

Added independent current source I + a number of overall improvements to SPICE models.

Browse Source
This commit is contained in:
MikeBrinson 2015-09-14 11:20:50 +01:00 committed by Vadim Kuznetzov
parent cfcfd24d54
commit f953b13c3b
11 changed files with 158 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1003 B

2
qucs/components/CMakeLists.txt
View File

@ -106,6 +106,7 @@ sp_noise.cpp
S4Q_V_DC.cpp
S4Q_V.cpp
S4Q_Ieqndef.cpp
S4Q_I.cpp
)
@ -333,6 +334,7 @@ sp_noise.h
S4Q_V_DC.h
S4Q_V.h
S4Q_Ieqndef.h
S4Q_I.h
)

14
qucs/components/DIODE_SPICE.cpp
View File

@ -26,13 +26,13 @@
DIODE_SPICE::DIODE_SPICE()
{
Description = QObject::tr("Diode SPICE format");
Description = QObject::tr("SPICE D:\nMultiple line ngspice or Xyce D model specifications allowed using \"+\" continuation lines.\nLeave continuation lines blank when NOT in use.");
Lines.append(new Line(-30, 0, -20, 0,QPen(Qt::darkBlue,3)));
Lines.append(new Line( -20, 0, -6, 0,QPen(Qt::darkRed,3)));
Lines.append(new Line( 6, 0, 20, 0,QPen(Qt::darkRed,3)));
Lines.append(new Line( 20, 0, 30, 0,QPen(Qt::darkBlue,3)));
Lines.append(new Line( 20, 0, 30, 0,QPen(Qt::darkBlue,3)));
Lines.append(new Line( -6, -9, -6, 9,QPen(Qt::darkRed,3)));
@ -53,11 +53,11 @@ DIODE_SPICE::DIODE_SPICE()
SpiceModel = "D";
Name = "D";
Props.append(new Property("D", "", true,"Expression"));
Props.append(new Property("D_Line 2", "", false,"Expression"));
Props.append(new Property("D_Line 3", "", false,"Expression"));
Props.append(new Property("D _Line 4", "", false,"Expression"));
Props.append(new Property("D _Line 5", "", false,"Expression"));
Props.append(new Property("D", "", true,"Diode model specification"));
Props.append(new Property("D_Line 2", "", false,"+ continuation line 1"));
Props.append(new Property("D_Line 3", "", false,"+ continuation line 2"));
Props.append(new Property("D_Line 4", "", false,"+ continuation line 3"));
Props.append(new Property("D_Line 5", "", false,"+ continuation line 4"));
}

104
qucs/components/S4Q_I.cpp Normal file
View File

@ -0,0 +1,104 @@
/***************************************************************************
S4Q_I.cpp
-------------
begin : Thu May 21 2015
copyright : (C) 2015 by Vadim Kuznetsov
email : ra3xdh@gmail.com
SPICE Version : Friday Sept 11 2015
copyright : (C) 2015 Mike Brinson
email : mbrin72043@yahoo.co.uk
***************************************************************************/
/***************************************************************************
* *
* 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 "S4Q_I.h"
#include "node.h"
#include "misc.h"
#include "extsimkernels/spicecompat.h"
S4Q_I::S4Q_I()
{
Description = QObject::tr("SPICE I:\nMultiple line ngspice or Xyce I specifications allowed using \"+\" continuation lines.\nLeave continuation lines blank when NOT in use. ");
Arcs.append(new Arc(-14,-14, 28, 28, 0, 16*360,QPen(Qt::darkRed,3)));
Lines.append(new Line(-30, 0,-14, 0,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 30, 0, 14, 0,QPen(Qt::darkBlue,2)));
Lines.append(new Line( 18, 5, 18, 11,QPen(Qt::darkRed,1)));
Lines.append(new Line( 21, 8, 15, 8,QPen(Qt::darkRed,1)));
Lines.append(new Line(-18, 5,-18, 11,QPen(Qt::black,1)));
Lines.append(new Line( -8, 0, 8, 0,QPen(Qt::darkRed,2)));
Lines.append(new Line( -8, 0, -4, -4,QPen(Qt::darkRed,2)));
Lines.append(new Line( -8, 0, -4, 4,QPen(Qt::darkRed,2)));
Ports.append(new Port( 30, 0));
Ports.append(new Port(-30, 0));
x1 = -30; y1 = -14;
x2 = 30; y2 = 14;
tx = x1+4;
ty = y2+4;
Model = "S4Q_I";
SpiceModel = "I";
Name = "I";
Props.append(new Property("I", "", true,"Specification expression"));
Props.append(new Property("I_Line 2", "", false,"+ continuation line 1"));
Props.append(new Property("I_Line 3", "", false,"+ continuation line 2"));
Props.append(new Property("I_Line 4", "", false,"+ continuation line 3"));
Props.append(new Property("I_Line 5", "", false,"+ continuation line 4"));
rotate(); // fix historical flaw
}
S4Q_I::~S4Q_I()
{
}
Component* S4Q_I::newOne()
{
return new S4Q_I();
}
Element* S4Q_I::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("I Source");
BitmapFile = (char *) "S4Q_I";
if(getNewOne) return new S4Q_I();
return 0;
}
QString S4Q_I::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names
}
QString l0= Props.at(0)->Value;
QString l1= Props.at(1)->Value;
QString l2= Props.at(2)->Value;
QString l3= Props.at(3)->Value;
QString l4= Props.at(4)->Value;
if(l0.length()> 0) s += QString("%1\n").arg(l0);
if(l1.length()> 0) s += QString("%1\n").arg(l1);
if(l2.length()> 0) s += QString("%1\n").arg(l2);
if(l3.length()> 0) s += QString("%1\n").arg(l3);
if(l4.length()> 0) s += QString("%1\n").arg(l4);
return s;
}

38
qucs/components/S4Q_I.h Normal file
View File

@ -0,0 +1,38 @@
/***************************************************************************
S4Q_I.h
-------------
begin : Thu May 21 2015
copyright : (C) 2015 by Vadim Kuznetsov
email : ra3xdh@gmail.com
SPICE Version : Friday Sept 11 2015
copyright : (C) 2015 Mike Brinson
email : mbrin72043@yahoo.co.uk
***************************************************************************/
/***************************************************************************
* *
* 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 S4Q_I_H
#define S4Q_I_H
#include "component.h"
class S4Q_I : public Component {
public:
S4Q_I();
~S4Q_I();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
protected:
QString spice_netlist(bool isXyce = false);
};
#endif

2
qucs/components/S4Q_Ieqndef.cpp
View File

@ -23,7 +23,7 @@
S4Q_Ieqndef::S4Q_Ieqndef()
{
Description = QObject::tr("SPICE B:\nMultiple line ngspice or Xyce specifications are allowed using SPICE \"+\" continuaton lines.");
Description = QObject::tr("SPICE B (I type):\nMultiple line ngspice or Xyce B specifications allowed using \"+\" continuation lines.\nLeave continuation lines blank when NOT in use. ");
Arcs.append(new Arc(-14,-14, 28, 28, 0, 16*360,QPen(Qt::darkRed,3)));

4
qucs/components/S4Q_V.cpp
View File

@ -22,7 +22,7 @@
#include "S4Q_V.h"
#include "node.h"
#include "misc.h"
#include "extsimkernels/spicecompat.h"
#include "extsimkernels/spicecompat.h"
S4Q_V::S4Q_V()
@ -50,7 +50,7 @@ S4Q_V::S4Q_V()
SpiceModel = "V";
Name = "V";
Props.append(new Property("V", "", true,"Specification xpression"));
Props.append(new Property("V", "", true,"Specification expression"));
Props.append(new Property("V_Line 2", "", false,"+ continuation line 1"));
Props.append(new Property("V_Line 3", "", false,"+ continuation line 2"));
Props.append(new Property("V_Line 4", "", false,"+ continuation line 3"));

1
qucs/components/components.h
View File

@ -205,6 +205,7 @@
#include "S4Q_V_DC.h"
#include "S4Q_V.h"
#include "S4Q_Ieqndef.h"
#include "S4Q_I.h"
//
//
#include "src_eqndef.h"

2
qucs/components/src_eqndef.cpp
View File

@ -6,7 +6,7 @@
Src_eqndef::Src_eqndef()
{
Description = QObject::tr("SPICE B:\nMultiple line ngspice or Xyce specifications are allowed using SPICE \"+\" continuaton lines.");
Description = QObject::tr("SPICE B (V type):\nMultiple line ngspice or Xyce B specifications allowed using \"+\" continuation lines.\nLeave continuation lines blank when NOT in use. ");
Arcs.append(new Arc(-14,-14, 28, 28, 0, 16*360,QPen(Qt::darkRed,3)));
Texts.append(new Text(10,-12,"Eqn",Qt::darkRed,10.0,0.0,-1.0));

1
qucs/module.cpp
View File

@ -441,6 +441,7 @@ void Module::registerModules (void) {
REGISTER_SPICE_1 (K_SPICE);
REGISTER_SPICE_1 (S4Q_V_DC);
REGISTER_SPICE_1 (S4Q_V);
REGISTER_SPICE_1 (S4Q_I);
REGISTER_SPICE_1 (Src_eqndef);
REGISTER_SPICE_1 (S4Q_Ieqndef);
REGISTER_SPICE_1 (DIODE_SPICE);

1
qucs/qucs.qrc
View File

@ -237,6 +237,7 @@
<file>bitmaps/hicolor/128x128/apps/qucs.png</file>
<file>bitmaps/S4Q_V_DC.png</file>
<file>bitmaps/S4Q_V.png</file>
<file>bitmaps/S4Q_I.png</file>
<file>bitmaps/S4Q_Ieqndef.png</file>
<file>bitmaps/src_eqndef.png</file>
<file>bitmaps/src_eqndef.png</file>