mirror of
https://github.com/ra3xdh/qucs_s
synced 2025-03-28 21:13:26 +00:00
*** empty log message ***
git-svn-id: https://qucs.svn.sourceforge.net/svnroot/qucs/trunk@1043 b5b04e8c-4942-46c9-ab4f-83783d557d1c
This commit is contained in:
margraf
parent
64c16b3989
commit
37378bdac9
@ -1,3 +1,9 @@
|
||||
2006-12-22 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
|
||||
|
||||
* new components: twisted-pair transmission line, bond wire
|
||||
* new symbol for 4-port transmission line
|
||||
* fixed bug on subcircuit parameters without description
|
||||
|
||||
2006-12-06 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
|
||||
|
||||
* fixed small bug on creating paintings
|
||||
|
||||
@ -42,7 +42,8 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \
|
||||
noise_iv.png or.png nor.png and.png nand.png xor.png xnor.png digi.png \
|
||||
inverter.png digi_source.png timing.png truth.png rsflipflop.png \
|
||||
dflipflop.png jkflipflop.png coupler.png coaxial.png am_mod.png pm_mod.png \
|
||||
vhdlfile.png subcircuit.png optimize.png tline_4port.png
|
||||
vhdlfile.png subcircuit.png optimize.png tline_4port.png twistedpair.png \
|
||||
bondwire.png
|
||||
|
||||
# toolbar pictures
|
||||
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \
|
||||
|
||||
BIN
qucs/bitmaps/bondwire.png
Normal file
BIN
qucs/bitmaps/bondwire.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 227 B |
Binary file not shown.
|
Before Width: | Height: | Size: 251 B After Width: | Height: | Size: 240 B |
BIN
qucs/bitmaps/twistedpair.png
Normal file
BIN
qucs/bitmaps/twistedpair.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 251 B |
@ -45,7 +45,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
|
||||
logical_xnor.cpp logical_inv.cpp digi_sim.cpp digi_source.cpp coupler.cpp \
|
||||
rs_flipflop.cpp d_flipflop.cpp jk_flipflop.cpp coaxialline.cpp vprobe.cpp \
|
||||
switch.cpp relais.cpp am_modulator.cpp pm_modulator.cpp opt_sim.cpp \
|
||||
optimizedialog.cpp tline_4port.cpp \
|
||||
optimizedialog.cpp tline_4port.cpp twistedpair.cpp bondwire.cpp \
|
||||
hicumL2p1.cpp HBT_X.cpp
|
||||
|
||||
nodist_libcomponents_a_SOURCES = $(MOCFILES)
|
||||
@ -65,7 +65,7 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
|
||||
logical_xor.h logical_xnor.h logical_inv.h digi_sim.h digi_source.h \
|
||||
coupler.h rs_flipflop.h d_flipflop.h jk_flipflop.h coaxialline.h vprobe.h \
|
||||
switch.h relais.h am_modulator.h pm_modulator.h opt_sim.h tline_4port.h \
|
||||
hicumL2p1.h HBT_X.h
|
||||
twistedpair.h bondwire.h hicumL2p1.h HBT_X.h
|
||||
|
||||
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs
|
||||
|
||||
|
||||
73
qucs/components/bondwire.cpp
Normal file
73
qucs/components/bondwire.cpp
Normal file
@ -0,0 +1,73 @@
|
||||
/***************************************************************************
|
||||
bondwire.cpp
|
||||
--------------
|
||||
begin : Dec 22 2006
|
||||
copyright : (C) 2006 by Michael Margraf
|
||||
email : michael.margraf@alumni.tu-berlin.de
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* *
|
||||
* 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 "bondwire.h"
|
||||
|
||||
|
||||
BondWire::BondWire()
|
||||
{
|
||||
Description = QObject::tr("bond wire");
|
||||
|
||||
Lines.append(new Line(-30, 0,-8, 0,QPen(QPen::darkBlue,3)));
|
||||
Lines.append(new Line( 30, 0, 8, 0,QPen(QPen::darkBlue,3)));
|
||||
|
||||
Arcs.append(new Arc(-11,-10, 22, 26, 16*30,16*120,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-19,-13, 10, 13,16*205,16*130,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( 9,-13, 10, 13,16*205,16*130,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Ports.append(new Port(-30, 0));
|
||||
Ports.append(new Port( 30, 0));
|
||||
|
||||
x1 = -30; y1 =-13;
|
||||
x2 = 30; y2 = 5;
|
||||
|
||||
tx = x1+4;
|
||||
ty = y2+4;
|
||||
Model = "Bond";
|
||||
Name = "Line";
|
||||
|
||||
Props.append(new Property("L", "3 mm", true,
|
||||
QObject::tr("length of the wire")));
|
||||
Props.append(new Property("D", "50 um", true,
|
||||
QObject::tr("diameter of the wire")));
|
||||
Props.append(new Property("H", "2 mm", true,
|
||||
QObject::tr("height above ground plane")));
|
||||
Props.append(new Property("rho", "0.022e-6", false,
|
||||
QObject::tr("specific resistance of the metal")));
|
||||
Props.append(new Property("mur", "1", false,
|
||||
QObject::tr("relative permeability of the metal")));
|
||||
Props.append(new Property("Model", "FREESPACE", false,
|
||||
QObject::tr("bond wire model")+" [Freespace, Mirror, Descharles]"));
|
||||
Props.append(new Property("Subst", "Subst1", true,
|
||||
QObject::tr("substrate")));
|
||||
Props.append(new Property("Temp", "26.85", false,
|
||||
QObject::tr("simulation temperature in degree Celsius")));
|
||||
}
|
||||
|
||||
Component* BondWire::newOne()
|
||||
{
|
||||
return new BondWire();
|
||||
}
|
||||
|
||||
Element* BondWire::info(QString& Name, char* &BitmapFile, bool getNewOne)
|
||||
{
|
||||
Name = QObject::tr("Bond Wire");
|
||||
BitmapFile = "bondwire";
|
||||
|
||||
if(getNewOne) return new BondWire();
|
||||
return 0;
|
||||
}
|
||||
32
qucs/components/bondwire.h
Normal file
32
qucs/components/bondwire.h
Normal file
@ -0,0 +1,32 @@
|
||||
/***************************************************************************
|
||||
bondwire.h
|
||||
------------
|
||||
begin : Dec 22 2006
|
||||
copyright : (C) 2006 by Michael Margraf
|
||||
email : michael.margraf@alumni.tu-berlin.de
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* *
|
||||
* 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 BONDWIRE_H
|
||||
#define BONDWIRE_H
|
||||
|
||||
#include "component.h"
|
||||
|
||||
|
||||
class BondWire : public Component {
|
||||
public:
|
||||
BondWire();
|
||||
~BondWire() {};
|
||||
Component* newOne();
|
||||
static Element* info(QString&, char* &, bool getNewOne=false);
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -730,9 +730,9 @@ bool Component::load(const QString& _s)
|
||||
|
||||
unsigned int z=0, counts = s.contains('"');
|
||||
if(Model == "Sub")
|
||||
tmp = 1;
|
||||
tmp = 2; // first property (File) already exists
|
||||
else if(Model == "Lib")
|
||||
tmp = 2;
|
||||
tmp = 3;
|
||||
else tmp = counts + 1; // "+1" because "counts" could be zero
|
||||
|
||||
for(; tmp<=(int)counts/2; tmp++)
|
||||
@ -854,6 +854,8 @@ int Component::analyseLine(const QString& Row, int numProps)
|
||||
|
||||
pp->Name = s.section('=', 1,1);
|
||||
pp->Description = s.section('=', 3,3);
|
||||
if(pp->Description.isEmpty())
|
||||
pp->Description = " ";
|
||||
|
||||
i1 += 2;
|
||||
}
|
||||
@ -1365,6 +1367,7 @@ Component* getComponentFromName(QString& Line)
|
||||
case 'T' : if(cstr == "r") c = new Transformer();
|
||||
else if(cstr == "LIN") c = new TLine();
|
||||
else if(cstr == "LIN4P") c = new TLine_4Port();
|
||||
else if(cstr == "WIST") c = new TwistedPair();
|
||||
break;
|
||||
case 's' : if(cstr == "Tr") c = new symTrafo();
|
||||
break;
|
||||
@ -1390,6 +1393,7 @@ Component* getComponentFromName(QString& Line)
|
||||
break;
|
||||
case 'B' : if(cstr == "iasT") c = new BiasT();
|
||||
else if(cstr == "JT") c = new BJTsub();
|
||||
else if(cstr == "ond") c = new BondWire();
|
||||
break;
|
||||
case 'A' : if(cstr == "ttenuator") c = new Attenuator();
|
||||
else if(cstr == "mp") c = new Amplifier();
|
||||
|
||||
@ -53,6 +53,7 @@
|
||||
#include "ccvs.h"
|
||||
#include "tline.h"
|
||||
#include "tline_4port.h"
|
||||
#include "twistedpair.h"
|
||||
#include "coaxialline.h"
|
||||
#include "substrate.h"
|
||||
#include "msline.h"
|
||||
@ -70,6 +71,7 @@
|
||||
#include "cpwshort.h"
|
||||
#include "cpwgap.h"
|
||||
#include "cpwstep.h"
|
||||
#include "bondwire.h"
|
||||
#include "diode.h"
|
||||
#include "bjt.h"
|
||||
#include "bjtsub.h"
|
||||
|
||||
@ -22,25 +22,19 @@ TLine_4Port::TLine_4Port()
|
||||
{
|
||||
Description = QObject::tr("ideal 4-port transmission line");
|
||||
|
||||
Arcs.append(new Arc(-25,-36, 18, 38,16*230, 16*68,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-25, -2, 18, 38, 16*62, 16*68,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-28,-40, 18, 38,16*232, 16*33,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-28, 2, 18, 38, 16*95, 16*33,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc(-17,-36, 18, 38,16*242, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-17, -2, 18, 38, 16*62, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Lines.append(new Line(-20,-2, 20,-2,QPen(QPen::darkBlue,2)));
|
||||
Lines.append(new Line(-20, 2, 20, 2,QPen(QPen::darkBlue,2)));
|
||||
|
||||
Arcs.append(new Arc( -9,-36, 18, 38,16*242, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( -9, -2, 18, 38, 16*62, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( 10,-40, 18, 38,16*270, 16*40,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( 10, 2, 18, 38, 16*50, 16*40,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc( -1,-36, 18, 38,16*242, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( -1, -2, 18, 38, 16*62, 16*56,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc( 7,-36, 18, 38,16*242, 16*68,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( 7, -2, 18, 38, 16*50, 16*68,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc(-40,-10, 20, 33, 16*32, 16*58,QPen(QPen::darkBlue,2)));
|
||||
Arcs.append(new Arc(-40,-23, 20, 33,16*270, 16*58,QPen(QPen::darkBlue,2)));
|
||||
Arcs.append(new Arc( 20,-10, 20, 33, 16*90, 16*58,QPen(QPen::darkBlue,2)));
|
||||
Arcs.append(new Arc( 20,-23, 20, 33,16*212, 16*58,QPen(QPen::darkBlue,2)));
|
||||
Arcs.append(new Arc(-38,-10, 16, 28, 16*45, 16*45,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-38,-18, 16, 28,16*270, 16*45,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( 22,-10, 16, 28, 16*90, 16*45,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( 22,-18, 16, 28,16*225, 16*45,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Ports.append(new Port(-30,-10));
|
||||
Ports.append(new Port( 30,-10));
|
||||
|
||||
84
qucs/components/twistedpair.cpp
Normal file
84
qucs/components/twistedpair.cpp
Normal file
@ -0,0 +1,84 @@
|
||||
/***************************************************************************
|
||||
twistedpair.cpp
|
||||
-----------------
|
||||
begin : Dec 19 2006
|
||||
copyright : (C) 2006 by Michael Margraf
|
||||
email : michael.margraf@alumni.tu-berlin.de
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* *
|
||||
* 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 "twistedpair.h"
|
||||
|
||||
|
||||
TwistedPair::TwistedPair()
|
||||
{
|
||||
Description = QObject::tr("twisted pair transmission line");
|
||||
|
||||
Arcs.append(new Arc(-25,-36, 18, 38,16*230, 16*68,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-25, -2, 18, 38, 16*62, 16*68,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc(-17,-36, 18, 38,16*242, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc(-17, -2, 18, 38, 16*62, 16*56,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc( -9,-36, 18, 38,16*242, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( -9, -2, 18, 38, 16*62, 16*56,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc( -1,-36, 18, 38,16*242, 16*56,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( -1, -2, 18, 38, 16*62, 16*56,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc( 7,-36, 18, 38,16*242, 16*68,QPen(QPen::darkBlue,1)));
|
||||
Arcs.append(new Arc( 7, -2, 18, 38, 16*50, 16*68,QPen(QPen::darkBlue,1)));
|
||||
|
||||
Arcs.append(new Arc(-40,-10, 20, 33, 16*32, 16*58,QPen(QPen::darkBlue,2)));
|
||||
Arcs.append(new Arc(-40,-23, 20, 33,16*270, 16*58,QPen(QPen::darkBlue,2)));
|
||||
Arcs.append(new Arc( 20,-10, 20, 33, 16*90, 16*58,QPen(QPen::darkBlue,2)));
|
||||
Arcs.append(new Arc( 20,-23, 20, 33,16*212, 16*58,QPen(QPen::darkBlue,2)));
|
||||
|
||||
Ports.append(new Port(-30,-10));
|
||||
Ports.append(new Port( 30,-10));
|
||||
Ports.append(new Port( 30, 10));
|
||||
Ports.append(new Port(-30, 10));
|
||||
|
||||
x1 = -30; y1 =-12;
|
||||
x2 = 30; y2 = 12;
|
||||
|
||||
tx = x1+4;
|
||||
ty = y2+4;
|
||||
Model = "TWIST";
|
||||
Name = "Line";
|
||||
|
||||
Props.append(new Property("d", "0.5 mm", true,
|
||||
QObject::tr("diameter of conductor")));
|
||||
Props.append(new Property("D", "0.8 mm", true,
|
||||
QObject::tr("diameter of wire (conductor and insulator)")));
|
||||
Props.append(new Property("er", "4", false,
|
||||
QObject::tr("dielectric constant of insulator")));
|
||||
Props.append(new Property("T", "100", false,
|
||||
QObject::tr("twists per length in 1/m")));
|
||||
}
|
||||
|
||||
TwistedPair::~TwistedPair()
|
||||
{
|
||||
}
|
||||
|
||||
Component* TwistedPair::newOne()
|
||||
{
|
||||
return new TwistedPair();
|
||||
}
|
||||
|
||||
Element* TwistedPair::info(QString& Name, char* &BitmapFile, bool getNewOne)
|
||||
{
|
||||
Name = QObject::tr("Twisted-Pair");
|
||||
BitmapFile = "twistedpair";
|
||||
|
||||
if(getNewOne) return new TwistedPair();
|
||||
return 0;
|
||||
}
|
||||
32
qucs/components/twistedpair.h
Normal file
32
qucs/components/twistedpair.h
Normal file
@ -0,0 +1,32 @@
|
||||
/***************************************************************************
|
||||
twistedpair.h
|
||||
---------------
|
||||
begin : Dec 19 2006
|
||||
copyright : (C) 2006 by Michael Margraf
|
||||
email : michael.margraf@alumni.tu-berlin.de
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* *
|
||||
* 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 TWISTEDPAIR_H
|
||||
#define TWISTEDPAIR_H
|
||||
|
||||
#include "component.h"
|
||||
|
||||
|
||||
class TwistedPair : public Component {
|
||||
public:
|
||||
TwistedPair();
|
||||
~TwistedPair();
|
||||
Component* newOne();
|
||||
static Element* info(QString&, char* &, bool getNewOne=false);
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -316,11 +316,11 @@ pInfoFunc Sources[] =
|
||||
&Noise_iv::info, &AM_Modulator::info, &PM_Modulator::info, 0};
|
||||
|
||||
pInfoFunc TransmissionLines[] =
|
||||
{&TLine::info, &TLine_4Port::info, &CoaxialLine::info, &Substrate::info,
|
||||
&MSline::info, &MScoupled::info, &MScorner::info, &MSmbend::info,
|
||||
&MSstep::info, &MStee::info, &MScross::info, &MSopen::info, &MSgap::info,
|
||||
&MSvia::info, &Coplanar::info, &CPWopen::info, &CPWshort::info,
|
||||
&CPWgap::info, &CPWstep::info, 0};
|
||||
{&TLine::info, &TLine_4Port::info, &TwistedPair::info, &CoaxialLine::info,
|
||||
&Substrate::info, &MSline::info, &MScoupled::info, &MScorner::info,
|
||||
&MSmbend::info, &MSstep::info, &MStee::info, &MScross::info, &MSopen::info,
|
||||
&MSgap::info, &MSvia::info, &Coplanar::info, &CPWopen::info,
|
||||
&CPWshort::info, &CPWgap::info, &CPWstep::info, &BondWire::info, 0};
|
||||
|
||||
pInfoFunc nonlinearComps[] =
|
||||
{&Diode::info, &BJT::info, &BJT::info_pnp, &BJTsub::info,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user