*** empty log message ***

This commit is contained in:
margraf 2004-06-16 17:41:33 +00:00
parent 59d7e9d0ee
commit db10da140d
192 changed files with 2169 additions and 2223 deletions

3
NEWS
View File

@ -26,6 +26,9 @@ files.
Version 0.0.3
-------------
* some new components (e.g. transistors)
* undo function
Version 0.0.2
-------------

View File

@ -1,3 +1,23 @@
2004-06-14 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* resize function for paintings
* replaced filledrect, filledellipse and linedialog with
other classes
* fixed bug, that moved labels not correctly
* limit of scale factor: 0.01 ... 10
* markers can show complex numbers in different ways
* tabdiagram: in dialog one can change precision and number
mode
* fixed bug that doesn't load diagrams after undo
* all transistors can now be loaded
* put Resistor and Resistorus together to one component
2004-06-10 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* for "move" action: only set "changed" if position really
changed
* implemented "undo" function
2004-06-06 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* added components: BJT, JFET, MOSFET

View File

@ -34,7 +34,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
ac_sim.cpp volt_dc.cpp volt_ac.cpp subcircuit.cpp sparamfile.cpp \
source_ac.cpp isolator.cpp equation.cpp circulator.cpp attenuator.cpp \
ampere_dc.cpp transformer.cpp symtrafo.cpp subcirport.cpp ground.cpp \
dcfeed.cpp dcblock.cpp biast.cpp inductor.cpp capacitor.cpp resistorus.cpp \
dcfeed.cpp dcblock.cpp biast.cpp inductor.cpp capacitor.cpp \
component.cpp resistor.cpp iprobe.cpp volt_noise.cpp ampere_noise.cpp \
msmbend.cpp msopen.cpp ampere_ac.cpp bjt.cpp jfet.cpp mosfet.cpp \
mosfet_depl.cpp
@ -47,7 +47,7 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
source_ac.h sparamfile.h subcircuit.h volt_ac.h volt_dc.h ac_sim.h cccs.h \
ccvs.h coplanar.h dc_sim.h diode.h hb_sim.h mscorner.h mscoupled.h \
mscross.h msline.h msstep.h mstee.h param_sweep.h sp_sim.h substrate.h \
tline.h tr_sim.h component.h vcvs.h gyrator.h phaseshifter.h resistorus.h \
tline.h tr_sim.h component.h vcvs.h gyrator.h phaseshifter.h \
iprobe.h volt_noise.h ampere_noise.h msmbend.h msopen.h ampere_ac.h bjt.h \
jfet.h mosfet.h mosfet_depl.h

View File

@ -44,7 +44,6 @@ AC_Sim::AC_Sim()
tx = x1+4;
ty = y2+4;
Sign = ".AC";
Model = ".AC";
Name = "AC";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sun May 23 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -39,7 +39,6 @@ Ampere_ac::Ampere_ac()
tx = x1+4;
ty = y2+4;
Sign = "Iac";
Model = "Iac";
Name = "I";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sun May 23 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -37,7 +37,6 @@ Ampere_dc::Ampere_dc()
tx = x1+4;
ty = y2+4;
Sign = "Idc";
Model = "Idc";
Name = "I";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -44,7 +44,6 @@ Ampere_noise::Ampere_noise()
tx = x1+4;
ty = y2+4;
Sign = "Inoise";
Model = "Inoise";
Name = "I";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -45,7 +45,6 @@ Attenuator::Attenuator()
tx = x1+4;
ty = y2+4;
Sign = "Attenuator";
Model = "Attenuator";
Name = "X";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -49,7 +49,6 @@ BiasT::BiasT()
tx = x1+4;
ty = y2+4;
Sign = "BiasT";
Model = "BiasT";
Name = "X";
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -41,10 +41,10 @@ BJT::BJT()
tx = x2+4;
ty = y1+4;
Sign = "BJT";
Model = "BJT";
Name = "T";
// this must be the first property in the list !!!
Props.append(new Property("Type", "npn", true,
QObject::tr("polarity (npn,pnp)")));
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -35,7 +35,6 @@ Capacitor::Capacitor()
tx = x1+4;
ty = y2+4;
Sign = "C";
Model = "C";
Name = "C";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -54,7 +54,6 @@ CCCS::CCCS()
tx = x1+4;
ty = y2+4;
Sign = "CCCS";
Model = "CCCS";
Name = "SRC";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -55,7 +55,6 @@ CCVS::CCVS()
tx = x1+4;
ty = y2+4;
Sign = "CCVS";
Model = "CCVS";
Name = "SRC";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -43,7 +43,6 @@ Circulator::Circulator()
tx = x1+4;
ty = y1-QucsSettings.font.pointSize()-4;
Sign = "Circulator";
Model = "Circulator";
Name = "X";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -130,7 +130,7 @@ void Component::paint(QPainter *p)
}
QFont f = p->font(); // restore current font
if(Sign.at(0) == '.') { // is simulation component (dc, ac, ...)
if(Model.at(0) == '.') { // is simulation component (dc, ac, ...)
p->setFont(QucsSettings.largeFont);
p->drawText(cx+x1+8, cy+y1+8, x2-x1, y2-y1, Qt::WordBreak, Description);
}
@ -343,10 +343,11 @@ void Component::mirrorY()
// -------------------------------------------------------
QString Component::NetList()
{
if(Model.isEmpty()) return QString(""); // dummy elements (e.g. ground)
if(!isActive) return QString(""); // should it be simulated ?
QString s = Model+":"+Name;
if(Name.isEmpty()) return QString(""); // dummy elements (e.g. ground)
if(!isActive) return QString(""); // should it be simulated ?
if(Model == "Port") return QString(""); // do not mention subcircuit ports
QString s = Model+":"+Name;
for(Port *p1 = Ports.first(); p1 != 0; p1 = Ports.next())
s += " "+p1->Connection->Name; // node names
@ -360,7 +361,7 @@ QString Component::NetList()
// -------------------------------------------------------
QString Component::save()
{
QString s = " <"+Sign;
QString s = " <"+Model;
if(Name.isEmpty()) s += " *";
else s += " "+Name;
@ -396,7 +397,7 @@ bool Component::load(const QString& _s)
s = s.mid(1, s.length()-2); // cut off start and end character
QString n;
Sign = s.section(' ',0,0); // Sign
Model = s.section(' ',0,0); // Model
Name = s.section(' ',1,1); // Name
if(Name == "*") Name = "";
@ -431,7 +432,7 @@ bool Component::load(const QString& _s)
if(!ok) return false;
for(int z=0; z<tmp; z++) rotate(); // rotate component
tx = ttx; ty = tty; // restore text position (was change by rotate/mirror)
tx = ttx; ty = tty; // restore text position (was changed by rotate/mirror)
int z=0;
// load all properties
@ -492,7 +493,7 @@ Component* getComponentFromName(QString& Line)
// letter of their name
switch(first) {
case 'R' : if(cstr.isEmpty()) c = new Resistor();
else if(cstr == "us") c = new ResistorUS();
else if(cstr == "us") c = new Resistor(false);
break;
case 'C' : if(cstr.isEmpty()) c = new Capacitor();
else if(cstr == "CCS") c = new CCCS();
@ -534,21 +535,24 @@ Component* getComponentFromName(QString& Line)
else if(cstr == "UBST") c = new Substrate();
break;
case 'D' : if(cstr == "CBlock") c = new dcBlock();
else if(cstr == "CFeed") c = new dcFeed();
else if(cstr == "iode") c = new Diode();
break;
else if(cstr == "MOSFET") c = new MOSFET_depl();
else if(cstr == "CFeed") c = new dcFeed();
else if(cstr == "iode") c = new Diode();
break;
case 'B' : if(cstr == "iasT") c = new BiasT();
break;
else if(cstr == "JT") c = new BJT();
break;
case 'A' : if(cstr == "ttenuator") c = new Attenuator();
break;
case 'M' : if(cstr == "LIN") c = new MSline();
else if(cstr == "STEP") c = new MSstep();
else if(cstr == "CORN") c = new MScorner();
else if(cstr == "TEE") c = new MStee();
else if(cstr == "CROSS") c = new MScross();
else if(cstr == "MBEND") c = new MSmbend();
else if(cstr == "OPEN") c = new MSopen();
break;
else if(cstr == "OSFET") c = new MOSFET();
else if(cstr == "STEP") c = new MSstep();
else if(cstr == "CORN") c = new MScorner();
else if(cstr == "TEE") c = new MStee();
else if(cstr == "CROSS") c = new MScross();
else if(cstr == "MBEND") c = new MSmbend();
else if(cstr == "OPEN") c = new MSopen();
break;
case 'E' : if(cstr == "qn") c = new Equation();
break;
case '.' : if(cstr == "DC") c = new DC_Sim();
@ -561,16 +565,17 @@ Component* getComponentFromName(QString& Line)
}
if(!c) {
QMessageBox::critical(0, QObject::tr("Error"),
QObject::tr("Format Error:\nUnknown component!"));
QObject::tr("Format Error:\nUnknown component!"));
return 0;
}
if(!c->load(Line)) {
QMessageBox::critical(0, QObject::tr("Error"),
QObject::tr("Format Error:\nWrong 'component' line format!"));
QObject::tr("Format Error:\nWrong 'component' line format!"));
delete c;
return 0;
}
c->recreate();
return c;
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -68,7 +68,7 @@ public:
bool isActive; // should it be used in simulation or not ?
int tx, ty; // upper left corner of text (position)
QString Description;
QString Sign, Model, Name;
QString Model, Name;
};

View File

@ -3,7 +3,7 @@
-------------------
begin : Tue Sep 9 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -49,11 +49,6 @@ ComponentDialog::ComponentDialog(Component *c,
prop = new QListView(this);
prop->setMinimumSize(200, 150);
// prop->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
// QSizePolicy::MinimumExpanding));
// prop->setSizePolicy(QSizePolicy(QSizePolicy::Preferred,
// QSizePolicy::Preferred));
// prop->setMaximumSize(250, 500);
prop->addColumn(tr("Name"));
prop->addColumn(tr("Value"));
prop->addColumn(tr("display"));
@ -92,8 +87,7 @@ ComponentDialog::ComponentDialog(Component *c,
QHBox *h3 = new QHBox(this);
g->addWidget(h3,4,1);
QWidget *h = new QWidget(h3); // stretchable placeholder
h3->setStretchFactor(h,5);
h3->setStretchFactor(new QWidget(h3),5); // stretchable placeholder
BrowseButt = new QPushButton(tr("Browse"),h3);
BrowseButt->setEnabled(false);
BrowseButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@ -138,6 +132,8 @@ ComponentDialog::ComponentDialog(Component *c,
connect(prop, SIGNAL(clicked(QListViewItem*)),
SLOT(slotSelectProperty(QListViewItem*)));
resize(400, 250);
}
ComponentDialog::~ComponentDialog()

View File

@ -3,7 +3,7 @@
-------------------
begin : Tue Sep 9 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -24,7 +24,6 @@
#include "ground.h"
#include "resistor.h"
#include "resistorus.h"
#include "capacitor.h"
#include "inductor.h"
#include "dcblock.h"

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -53,7 +53,6 @@ Coplanar::Coplanar()
tx = x1+4;
ty = y2+4;
Sign = "CLIN";
Model = "CLIN";
Name = "CL";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -44,7 +44,6 @@ DC_Sim::DC_Sim()
tx = x1+4;
ty = y2+4;
Sign = ".DC";
Model = ".DC";
Name = "DC";
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -39,7 +39,6 @@ dcBlock::dcBlock()
tx = x1+4;
ty = y2+4;
Sign = "DCBlock";
Model = "DCBlock";
Name = "C";
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -41,7 +41,6 @@ dcFeed::dcFeed()
tx = x1+4;
ty = y2+4;
Sign = "DCFeed";
Model = "DCFeed";
Name = "L";
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -36,7 +36,6 @@ Diode::Diode()
tx = x1+4;
ty = y2+4;
Sign = "Diode";
Model = "Diode";
Name = "D";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -38,7 +38,6 @@ Equation::Equation()
tx = x1+4;
ty = y2+4;
Sign = "Eqn";
Model = "Eqn";
Name = "Eqn";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -34,8 +34,7 @@ Ground::Ground()
tx = 0;
ty = 0;
Sign = "GND";
Model = "";
Model = "GND";
Name = "";
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -48,7 +48,6 @@ Gyrator::Gyrator()
tx = x1+4;
ty = y2+4;
Sign = "Gyrator";
Model = "Gyrator";
Name = "X";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -46,7 +46,6 @@ HB_Sim::HB_Sim()
tx = x1+4;
ty = y2+4;
Sign = ".HB";
Model = ".HB";
Name = "HB";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -36,7 +36,6 @@ Inductor::Inductor()
tx = x1+4;
ty = y2+4;
Sign = "L";
Model = "L";
Name = "L";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -49,7 +49,6 @@ iProbe::iProbe()
tx = x1+4;
ty = y2+4;
Sign = "IProbe";
Model = "IProbe";
Name = "Pr";
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -42,7 +42,6 @@ Isolator::Isolator()
tx = x1+4;
ty = y2+4;
Sign = "Isolator";
Model = "Isolator";
Name = "X";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -41,12 +41,36 @@ JFET::JFET()
tx = x2+4;
ty = y1+4;
Sign = "JFET";
Model = "JFET";
Name = "T";
// this must be the first property in the list !!!
Props.append(new Property("Type", "n", true,
QObject::tr("polarity (n,p)")));
QObject::tr("polarity (n,p)")));
Props.append(new Property("Vt0", "-2.0 V", true,
QObject::tr("threshold voltage")));
Props.append(new Property("Beta", "1e-4", true,
QObject::tr("transconductance parameter")));
Props.append(new Property("Lambda", "0.0", true,
QObject::tr("channel-length modulation parameter")));
Props.append(new Property("Rd", "0.0", false,
QObject::tr("parasitic drain resistance")));
Props.append(new Property("Rs", "0.0", false,
QObject::tr("parasitic source resistance")));
Props.append(new Property("Is", "1e-14", false,
QObject::tr("gate-junction saturation current")));
Props.append(new Property("N", "1.0", false,
QObject::tr("gate-junction emission coefficient")));
Props.append(new Property("Cgs", "0.0", false,
QObject::tr("zero-bias gate-source junction capacitance")));
Props.append(new Property("Cgd", "0.0", false,
QObject::tr("zero-bias gate-drain junction capacitance")));
Props.append(new Property("Pb", "1.0", false,
QObject::tr("gate-junction potential")));
Props.append(new Property("Fc", "0.5", false,
QObject::tr("forward-bias junction capacitance coefficient")));
Props.append(new Property("M", "0.5", false,
QObject::tr("gate P-N grading coefficient")));
}
JFET::~JFET()

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -47,7 +47,6 @@ MOSFET::MOSFET()
tx = x2+4;
ty = y1+4;
Sign = "MOSFET";
Model = "MOSFET";
Name = "T";

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -44,8 +44,7 @@ MOSFET_depl::MOSFET_depl()
tx = x2+4;
ty = y1+4;
Sign = "dMOSFET";
Model = "dMOSFET";
Model = "DMOSFET";
Name = "T";
// Props.append(new Property("Type", "n", true,

View File

@ -3,7 +3,7 @@
-------------------
begin : Fri Jun 4 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -41,7 +41,6 @@ MScorner::MScorner()
tx = x1+4;
ty = y2+4;
Sign = "MCORN";
Model = "MCORN";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -52,7 +52,6 @@ MScoupled::MScoupled()
tx = x1+4;
ty = y2+4;
Sign = "CMS";
Model = "CMS";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -55,7 +55,6 @@ MScross::MScross()
tx = x1+4;
ty = y2+4;
Sign = "MCROSS";
Model = "MCROSS";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -39,7 +39,6 @@ MSline::MSline()
tx = x1+4;
ty = y2+4;
Sign = "MLIN";
Model = "MLIN";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -42,7 +42,6 @@ MSmbend::MSmbend()
tx = x1+4;
ty = y2+4;
Sign = "MMBEND";
Model = "MMBEND";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -37,7 +37,6 @@ MSopen::MSopen()
tx = x1+4;
ty = y2+4;
Sign = "MOPEN";
Model = "MOPEN";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -43,7 +43,6 @@ MSstep::MSstep()
tx = x1+4;
ty = y2+4;
Sign = "MSTEP";
Model = "MSTEP";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -45,7 +45,6 @@ MStee::MStee()
tx = x1+4;
ty = y2+4;
Sign = "MTEE";
Model = "MTEE";
Name = "MS";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -46,7 +46,6 @@ Param_Sweep::Param_Sweep()
tx = x1+4;
ty = y2+4;
Sign = ".SW";
Model = ".SW";
Name = "SW";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -40,7 +40,6 @@ Phaseshifter::Phaseshifter()
tx = x1+4;
ty = y2+4;
Sign = "PShift";
Model = "PShift";
Name = "X";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -17,16 +17,11 @@
#include "resistor.h"
Resistor::Resistor()
Resistor::Resistor(bool european)
{
Description = QObject::tr("resistor");
Lines.append(new Line(-19, -9, 19, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, -9, 18, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 19, 9,-19, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 9,-18, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
createSymbol(european);
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
@ -36,21 +31,52 @@ Resistor::Resistor()
tx = x1+4;
ty = y2+4;
Sign = "R";
Model = "R";
Name = "R";
Props.append(new Property("R", "50 Ohm", true,
QObject::tr("ohmic resistance in Ohms")));
// this must be the last property in the list !!!
Props.append(new Property("Symbol", "europaen", false,
QObject::tr("schematic symbol (european,US)")));
if(!european) Props.getLast()->Value = "US";
}
Resistor::~Resistor()
{
}
void Resistor::createSymbol(bool european)
{
if(european) {
Lines.append(new Line(-19, -9, 19, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, -9, 18, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 19, 9,-19, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 9,-18, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
}
else {
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 0,-15, -7,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-15, -7, -9, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -9, 7, -3, -7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -3, -7, 3, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 3, 7, 9, -7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 9, -7, 15, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 15, 7, 18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
}
}
Component* Resistor::newOne()
{
return new Resistor();
Resistor* p = new Resistor();
p->Props.getLast()->Value = Props.getLast()->Value;
p->recreate();
return p;
}
Component* Resistor::info(QString& Name, char* &BitmapFile, bool getNewOne)
@ -61,3 +87,47 @@ Component* Resistor::info(QString& Name, char* &BitmapFile, bool getNewOne)
if(getNewOne) return new Resistor();
return 0;
}
Component* Resistor::info_us(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Resistor US");
BitmapFile = "resistor_us";
if(getNewOne) {
Resistor* p = new Resistor();
p->Props.getLast()->Value = "US";
p->recreate();
return p;
}
return 0;
}
void Resistor::recreate()
{
Lines.clear();
createSymbol(Props.getLast()->Value != "US");
Line *p1;
bool mmir = mirroredX;
int tmp, ttx = tx, tty = ty, rrot = rotated;
if(mmir) // mirror all lines
for(p1 = Lines.first(); p1 != 0; p1 = Lines.next()) {
p1->y1 = -p1->y1;
p1->y2 = -p1->y2;
}
for(int z=0; z<rrot; z++) // rotate all lines
for(p1 = Lines.first(); p1 != 0; p1 = Lines.next()) {
tmp = -p1->x1;
p1->x1 = p1->y1;
p1->y1 = tmp;
tmp = -p1->x2;
p1->x2 = p1->y2;
p1->y2 = tmp;
}
tx = ttx; ty = tty; // restore properties (were changed by rotate/mirror)
rotated = rrot;
mirroredX = mmir;
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -23,10 +23,15 @@
class Resistor : public Component {
public:
Resistor();
Resistor(bool european=true);
~Resistor();
Component* newOne();
static Component* info(QString&, char* &, bool getNewOne=false);
static Component* info_us(QString&, char* &, bool getNewOne=false);
void recreate();
private:
void createSymbol(bool european=true);
};
#endif

View File

@ -1,66 +0,0 @@
/***************************************************************************
resistorus.cpp - description
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.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 "resistorus.h"
ResistorUS::ResistorUS()
{
Description = QObject::tr("resistor (US symbol)");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 0,-15, -7,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-15, -7, -9, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -9, 7, -3, -7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -3, -7, 3, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 3, 7, 9, -7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 9, -7, 15, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 15, 7, 18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
x1 = -30; y1 = -9;
x2 = 30; y2 = 9;
tx = x1+4;
ty = y2+4;
Sign = "Rus";
Model = "R";
Name = "R";
Props.append(new Property("R", "50 Ohm", true,
QObject::tr("ohmic resistance in Ohms")));
}
ResistorUS::~ResistorUS()
{
}
Component* ResistorUS::newOne()
{
return new ResistorUS();
}
Component* ResistorUS::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Resistor US");
BitmapFile = "resistor_us";
if(getNewOne) return new ResistorUS();
return 0;
}

View File

@ -1,32 +0,0 @@
/***************************************************************************
resistorus.h - description
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.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 RESISTORUS_H
#define RESISTORUS_H
#include "component.h"
class ResistorUS : public Component {
public:
ResistorUS();
~ResistorUS();
Component* newOne();
static Component* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -51,7 +51,6 @@ Source_ac::Source_ac()
tx = x1+4;
ty = y2+4;
Sign = "Pac";
Model = "Pac";
Name = "P";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -46,7 +46,6 @@ SP_Sim::SP_Sim()
tx = x1+4;
ty = y2+4;
Sign = ".SP";
Model = ".SP";
Name = "SP";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -54,7 +54,6 @@ SParamFile::SParamFile(int No)
tx = x1+4;
ty = y2+4;
Sign = QString("SPfile")+QString::number(No);
Model = QString("SPfile")+QString::number(No);
Name = "X";
@ -68,7 +67,7 @@ SParamFile::~SParamFile()
Component* SParamFile::newOne()
{
int z = Sign.mid(6).toInt();
int z = Model.mid(6).toInt();
return new SParamFile(z);
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -50,7 +50,6 @@ Subcircuit::Subcircuit(int No)
tx = x1+4;
ty = y2+4;
Sign = QString("Sub")+QString::number(No);
Model = QString("Sub")+QString::number(No);
Name = "SUB";
@ -64,7 +63,7 @@ Subcircuit::~Subcircuit()
Component* Subcircuit::newOne()
{
int z = Sign.mid(3).toInt();
int z = Model.mid(3).toInt();
return new Subcircuit(z);
}

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -32,8 +32,7 @@ SubCirPort::SubCirPort()
tx = x1+4;
ty = y2+4;
Sign = "Port";
Model = "";
Model = "Port";
Name = "P";
Props.append(new Property("Num", "1", true,

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -52,7 +52,6 @@ Substrate::Substrate()
tx = x1+4;
ty = y2+4;
Sign = "SUBST";
Model = "SUBST";
Name = "Subst";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -43,13 +43,16 @@ symTrafo::symTrafo()
Lines.append(new Line(-10,-22,-10,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 10,-30, 10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 10,-10, 22,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -1,-57, -1, 57,QPen(QPen::darkBlue,1))); // core lines
// core lines
Lines.append(new Line( -1,-57, -1, 57,QPen(QPen::darkBlue,1)));
Lines.append(new Line( 1,-57, 1, 57,QPen(QPen::darkBlue,1)));
Texts.append(new Text(-23,-47,"T1"));
Texts.append(new Text(-23, 32,"T2"));
Arcs.append(new Arc(-21,-64, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2))); // mark the turn direction
// mark the turn direction
Arcs.append(new Arc(-21,-64, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21, 15, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 15,-24, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
@ -65,7 +68,6 @@ symTrafo::symTrafo()
tx = x1+4;
ty = y2+4;
Sign = "sTr";
Model = "sTr";
Name = "Tr";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -38,7 +38,6 @@ TLine::TLine()
tx = x1+4;
ty = y2+4;
Sign = "TLIN";
Model = "TLIN";
Name = "Line";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
@ -46,7 +46,6 @@ TR_Sim::TR_Sim()
tx = x1+4;
ty = y2+4;
Sign = ".TR";
Model = ".TR";
Name = "TR";

View File

@ -3,7 +3,7 @@
-------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************

Some files were not shown because too many files have changed in this diff Show More