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

2008-02-21 Stefan Jahn <stefan@lkcc.org>

Browse Source 
* rfedd2p.cpp (RFedd2P): Added new 2-port RF-EDD also containing
        H-, G- and A-parameters.


git-svn-id: https://qucs.svn.sourceforge.net/svnroot/qucs/trunk@1474 b5b04e8c-4942-46c9-ab4f-83783d557d1c
This commit is contained in:
ela 2008-02-21 17:59:45 +00:00
parent 6b2cb010dd
commit 1a27bb5b69
27 changed files with 325 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
qucs/bitmaps/spicefile.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 982 B

BIN
qucs/bitmaps/vhdlfile.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 983 B

5
qucs/components/ChangeLog
View File

@ -1,3 +1,8 @@
2008-02-21 Stefan Jahn <stefan@lkcc.org>
* rfedd2p.cpp (RFedd2P): Added new 2-port RF-EDD also containing
H-, G- and A-parameters.
2008-02-17 Stefan Jahn <stefan@lkcc.org>
* rfedd.cpp (RFedd): Added preliminary implementation of an

2
qucs/components/Makefile.am
View File

@ -48,7 +48,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
optimizedialog.cpp tline_4port.cpp twistedpair.cpp bondwire.cpp \
hicumL2p1.cpp HBT_X.cpp verilogfile.cpp vexp.cpp iexp.cpp eqndefined.cpp \
vfile.cpp ifile.cpp mod_amp.cpp hic2_full.cpp thyristor.cpp triac.cpp \
diac.cpp log_amp.cpp hic0_full.cpp potentiometer.cpp rfedd.cpp
diac.cpp log_amp.cpp hic0_full.cpp potentiometer.cpp rfedd.cpp rfedd2p.cpp
nodist_libcomponents_a_SOURCES = $(MOCFILES)

1
qucs/components/component.cpp
View File

@ -1445,6 +1445,7 @@ Component* getComponentFromName(QString& Line)
else if(cstr == "SFF") c = new RS_FlipFlop();
else if(cstr == "elais") c = new Relais();
else if(cstr == "FEDD") c = new RFedd();
else if(cstr == "FEDD2P") c = new RFedd2P();
break;
case 'C' : if(cstr.isEmpty()) c = new Capacitor();
else if(cstr == "CCS") c = new CCCS();

1
qucs/components/components.h
View File

@ -128,6 +128,7 @@
#include "triac.h"
#include "thyristor.h"
#include "rfedd.h"
#include "rfedd2p.h"
#include "hicumL2p1.h"
#include "HBT_X.h"

2
qucs/components/libcomponents.ap
View File

@ -45,7 +45,7 @@ SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
optimizedialog.cpp tline_4port.cpp twistedpair.cpp bondwire.cpp \
hicumL2p1.cpp HBT_X.cpp verilogfile.cpp vexp.cpp iexp.cpp eqndefined.cpp \
vfile.cpp ifile.cpp mod_amp.cpp hic2_full.cpp thyristor.cpp triac.cpp \
diac.cpp log_amp.cpp hic0_full.cpp potentiometer.cpp rfedd.cpp
diac.cpp log_amp.cpp hic0_full.cpp potentiometer.cpp rfedd.cpp rfedd2p.cpp
# List of special Qt files.
MOCHEADERS = componentdialog.h spicedialog.h optimizedialog.h spicefile.h

3
qucs/components/rfedd.cpp
View File

@ -91,8 +91,7 @@ QString RFedd::netlist()
s += " "+p1->Connection->Name; // node names
// output all properties
Property *p2 = Props.at(1);
Property *p2;
p2 = Props.at(0);
s += " "+p2->Name+"=\""+p2->Value+"\"";
p = p2->Value;

150
qucs/components/rfedd2p.cpp Normal file
View File

@ -0,0 +1,150 @@
/***************************************************************************
rfedd2p.cpp
----------------
begin : Sub Feb 17 2008
copyright : (C) 2008 by Stefan Jahn
email : stefan@lkcc.org
***************************************************************************/
/***************************************************************************
* *
* 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 "rfedd2p.h"
#include "main.h"
#include "schematic.h"
#include <qfileinfo.h>
extern QDir QucsWorkDir;
RFedd2P::RFedd2P()
{
Description = QObject::tr("equation defined 2-port RF device");
Model = "RFEDD2P";
Name = "RF";
// first properties !!!
Props.append(new Property("Type", "Y", false,
QObject::tr("type of parameters")+" [Y, Z, S, H, G, A]"));
Props.append(new Property("duringDC", "open", false,
QObject::tr("representation during DC analysis")+
" [open, short, unspecified, zerofrequency]"));
// last properties
Props.append(new Property("P11", "0", false,
QObject::tr("parameter equation") + " 11"));
Props.append(new Property("P12", "0", false,
QObject::tr("parameter equation") + " 12"));
Props.append(new Property("P21", "0", false,
QObject::tr("parameter equation") + " 21"));
Props.append(new Property("P22", "0", false,
QObject::tr("parameter equation") + " 22"));
createSymbol();
}
// -------------------------------------------------------
Component* RFedd2P::newOne()
{
RFedd2P* p = new RFedd2P();
p->Props.at(0)->Value = Props.at(0)->Value;
p->recreate(0);
return p;
}
// -------------------------------------------------------
Element* RFedd2P::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Equation Defined 2-port RF Device");
BitmapFile = (char *) "rfedd";
if(getNewOne) {
RFedd2P* p = new RFedd2P();
p->Props.at(0)->Value = "Y";
p->recreate(0);
return p;
}
return 0;
}
// -------------------------------------------------------
QString RFedd2P::netlist()
{
QString s = "RFEDD:"+Name;
QString e = "\n";
QString n, p;
// output all node names
for(Port *p1 = Ports.first(); p1 != 0; p1 = Ports.next())
s += " "+p1->Connection->Name; // node names
// output all properties
Property *p2;
p2 = Props.at(0);
s += " "+p2->Name+"=\""+p2->Value+"\"";
p = p2->Value;
p2 = Props.at(1);
s += " "+p2->Name+"=\""+p2->Value+"\"";
p2 = Props.at(2);
while(p2) {
n = p2->Name.mid(1);
s += " "+p2->Name+"=\""+Name+"."+p+n+"\"";
e += " Eqn:Eqn"+Name+p2->Name+" "+
Name+"."+p+n+"=\""+p2->Value+"\" Export=\"no\"\n";
p2 = Props.next();
}
return s+e;
}
// -------------------------------------------------------
void RFedd2P::createSymbol()
{
QFontMetrics metrics(QucsSettings.font); // get size of text
int fHeight = metrics.lineSpacing();
int w, i;
QString tmp;
// draw symbol
#define HALFWIDTH 17
int h = 15;
Lines.append(new Line(-HALFWIDTH, -h, HALFWIDTH, -h,QPen(QPen::darkBlue,2)));
Lines.append(new Line( HALFWIDTH, -h, HALFWIDTH, h,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-HALFWIDTH, h, HALFWIDTH, h,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-HALFWIDTH, -h,-HALFWIDTH, h,QPen(QPen::darkBlue,2)));
i = fHeight/2;
tmp = Props.at(0)->Value;
w = metrics.width(tmp);
Texts.append(new Text(w/-2, -i, tmp));
i = 0;
int y = 15-h;
Lines.append(new Line(-30, y,-HALFWIDTH, y,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, y));
tmp = QString::number(i+1);
w = metrics.width(tmp);
Texts.append(new Text(-20-w, y-fHeight-2, tmp));
i++;
Lines.append(new Line(HALFWIDTH, y, 30, y,QPen(QPen::darkBlue,2)));
Ports.append(new Port( 30, y));
tmp = QString::number(i+1);
Texts.append(new Text( 20, y-fHeight-2, tmp));
y += 60;
i++;
x1 = -30; y1 = -h-2;
x2 = 30; y2 = h+2;
tx = x1+4;
ty = y1 - fHeight - 4;
}

36
qucs/components/rfedd2p.h Normal file
View File

@ -0,0 +1,36 @@
/***************************************************************************
rfedd2p.h
--------------
begin : Sub Feb 17 2008
copyright : (C) 2008 by Stefan Jahn
email : stefan@lkcc.org
***************************************************************************/
/***************************************************************************
* *
* 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 RFEDD2P_H
#define RFEDD2P_H
#include "component.h"
class RFedd2P : public MultiViewComponent {
public:
RFedd2P();
~RFedd2P() {};
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
protected:
QString netlist();
void createSymbol();
};
#endif

2
qucs/qucs.cpp
View File

@ -315,7 +315,7 @@ pInfoFunc lumpedComponents[] =
&Amplifier::info, &Isolator::info, &Circulator::info,
&Gyrator::info, &Phaseshifter::info, &Coupler::info, &iProbe::info,
&vProbe::info, &Mutual::info, &Mutual2::info, &Switch::info,
&Relais::info, &RFedd::info};
&Relais::info, &RFedd::info, &RFedd2P::info, 0};
pInfoFunc Sources[] =
{&Volt_dc::info, &Ampere_dc::info, &Volt_ac::info, &Ampere_ac::info,

8
qucs/qucs_ca.ts
View File

@ -5996,6 +5996,14 @@ Use: qucsedit [-r] fitxer
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_cs.ts
View File

@ -6214,6 +6214,14 @@ Použití: qucsedit [-r] soubor
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_de.ts
View File

@ -6254,6 +6254,14 @@ Verwendung: qucsedit [-r] Datei
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_es.ts
View File

@ -5999,6 +5999,14 @@ Use: qucsedit [-r] archivo
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_fr.ts
View File

@ -6024,6 +6024,14 @@ Invocation : qucsedit [-r] fichier
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_he.ts
View File

@ -5871,6 +5871,14 @@ Usage: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_hu.ts
View File

@ -5994,6 +5994,14 @@ Digitális szimuláció</translation>
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_it.ts
View File

@ -6166,6 +6166,14 @@ Usage: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_jp.ts
View File

@ -5949,6 +5949,14 @@ Usage: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_pl.ts
View File

@ -6056,6 +6056,14 @@ Stosowanie: qucsedit [-r] plik
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_pt.ts
View File

@ -5879,6 +5879,14 @@ Usage: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsApp</name>

8
qucs/qucs_ro.ts
View File

@ -5955,6 +5955,14 @@ Folosire: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_ru.ts
View File

@ -6253,6 +6253,14 @@ Usage: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_sv.ts
View File

@ -5832,6 +5832,14 @@ Usage: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_tr.ts
View File

@ -5846,6 +5846,14 @@ Kullanım: qucsedit [-r] kütük
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

8
qucs/qucs_uk.ts
View File

@ -5854,6 +5854,14 @@ Usage: qucsedit [-r] file
<source>RF</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>equation defined 2-port RF device</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Equation Defined 2-port RF Device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsApp</name>