*** empty log message ***

This commit is contained in:
margraf 2005-08-22 06:02:22 +00:00
parent 1f066b76f8
commit 957db33bcf
42 changed files with 3321 additions and 163 deletions

View File

@ -1,3 +1,8 @@
2005-08-19 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* add new components models to library, thanks to
Leandro D'Archivio
2005-07-23 Stefan Jahn <stefan@lkcc.org>
* qucs-lib/qucslib.1: Added manpage for the QucsLib library

View File

@ -1,4 +1,4 @@
<Qucs Library 0.0.7 "Diodes">
<Qucs Library 0.0.8 "Diodes">
<Component 1N4148>
<Description>
@ -209,64 +209,64 @@
</Model>
</Component>
<Component 6A1>
<Component 6A01>
<Description>
universal silicon rectifier diode, added by Leandro DArchivio
universal silicon rectifier diode, added by Leandro D'Archivio <morti667@hotmail.com>
100V, 6.0A, 2.0us
Manufacturer: Diodes Inc.
</Description>
<Model>
<Diode D_6A1_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "100" 0 "10u" 0>
<Diode D_6A01_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "100" 0 "10u" 0>
</Model>
</Component>
<Component 6A2>
<Component 6A02>
<Description>
universal silicon rectifier diode, added by Leandro DArchivio
universal silicon rectifier diode, added by Leandro D'Archivio <morti667@hotmail.com>
200V, 6.0A, 2.0us
Manufacturer: Diodes Inc.
</Description>
<Model>
<Diode D_6A2_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "200" 0 "10u" 0>
<Diode D_6A02_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "200" 0 "10u" 0>
</Model>
</Component>
<Component 6A4>
<Component 6A04>
<Description>
universal silicon rectifier diode, added by Leandro DArchivio
universal silicon rectifier diode, added by Leandro D'Archivio <morti667@hotmail.com>
400V, 6.0A, 2.0us
Manufacturer: Diodes Inc.
</Description>
<Model>
<Diode D_6A4_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "400" 0 "10u" 0>
<Diode D_6A04_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "400" 0 "10u" 0>
</Model>
</Component>
<Component 6A6>
<Component 6A06>
<Description>
universal silicon rectifier diode, added by Leandro DArchivio
universal silicon rectifier diode, added by Leandro D'Archivio <morti667@hotmail.com>
600V, 6.0A, 2us
Manufacturer: Diodes Inc.
</Description>
<Model>
<Diode D_6A6_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "600" 0 "10u" 0>
<Diode D_6A06_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "600" 0 "10u" 0>
</Model>
</Component>
<Component 6A8>
<Component 6A08>
<Description>
universal silicon rectifier diode, added by Leandro DArchivio
universal silicon rectifier diode, added by Leandro D'Archivio <morti667@hotmail.com>
800V, 6.0A, 2us
Manufacturer: Diodes Inc.
</Description>
<Model>
<Diode D_6A8_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "800" 0 "10u" 0>
<Diode D_6A08_ 1 0 0 -26 13 0 0 "52.4n" 1 "1.7" 1 "60p" 0 "0.333" 0 "0.7" 0 "0.5" 0 "0" 0 "0" 0 "2" 0 "7m" 0 "2.88u" 0 "26.85" 0 "0" 0 "1" 0 "1" 0 "800" 0 "10u" 0>
</Model>
</Component>
<Component 6A10>
<Description>
universal silicon rectifier diode, added by Leandro DArchivio
universal silicon rectifier diode, added by Leandro D'Archivio <morti667@hotmail.com>
1KV, 6.0A, 2.0us
Manufacturer: Diodes Inc.
</Description>

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,10 @@
2005-20-08 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* new components: mutual indoctors (2 and 3), correlated
noise sources
* fixed bug: crash after "calc DC bias" with S-parameter
* show DC bias for sweeps
2005-06-08 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* ChangeDialog with post-select of components

View File

@ -38,7 +38,8 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \
pnpsub.png dmosfet_sub.png nmosfet_sub.png pmosfet_sub.png ellipsearc.png \
vpulse.png ipulse.png vrect.png irect.png msvia.png amplifier.png opamp.png \
ysmith.png smithpolar.png polarsmith.png spicefile.png rect3d.png curve.png \
cpwopen.png cpwstep.png
cpwopen.png cpwstep.png mutual.png mutual2.png noise_ii.png noise_vv.png \
noise_iv.png
# toolbar pictures
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \

BIN
qucs/bitmaps/mutual.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 B

BIN
qucs/bitmaps/mutual2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

BIN
qucs/bitmaps/noise_ii.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

BIN
qucs/bitmaps/noise_iv.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

BIN
qucs/bitmaps/noise_vv.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 B

View File

@ -39,7 +39,8 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
msmbend.cpp msopen.cpp ampere_ac.cpp bjt.cpp jfet.cpp mosfet.cpp \
msgap.cpp bjtsub.cpp mosfet_sub.cpp vpulse.cpp ipulse.cpp vrect.cpp \
irect.cpp msvia.cpp amplifier.cpp opamp.cpp spicefile.cpp cpwopen.cpp \
cpwshort.cpp spicedialog.cpp cpwgap.cpp cpwstep.cpp libcomp.cpp
cpwshort.cpp spicedialog.cpp cpwgap.cpp cpwstep.cpp libcomp.cpp mutual.cpp \
mutual2.cpp noise_ii.cpp noise_iv.cpp noise_vv.cpp
nodist_libcomponents_a_SOURCES = $(MOCFILES)
@ -53,7 +54,8 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
iprobe.h volt_noise.h ampere_noise.h msmbend.h msopen.h ampere_ac.h bjt.h \
jfet.h mosfet.h msgap.h bjtsub.h mosfet_sub.h vpulse.h ipulse.h vrect.h \
irect.h msvia.h amplifier.h opamp.h spicefile.h cpwopen.h cpwshort.h \
cpwgap.h cpwstep.h libcomp.h
cpwgap.h cpwstep.h libcomp.h mutual.h mutual2.h noise_ii.h noise_iv.h \
noise_vv.h
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs

View File

@ -1057,6 +1057,8 @@ Component* getComponentFromName(QString& Line)
else if(cstr == "solator") c = new Isolator();
else if(cstr == "pulse") c = new iPulse();
else if(cstr == "rect") c = new iRect();
else if(cstr == "Inoise") c = new Noise_ii();
else if(cstr == "Vnoise") c = new Noise_iv();
break;
case 'J' : if(cstr == "FET") c = new JFET();
break;
@ -1067,6 +1069,7 @@ Component* getComponentFromName(QString& Line)
else if(cstr == "noise") c = new Volt_noise();
else if(cstr == "pulse") c = new vPulse();
else if(cstr == "rect") c = new vRect();
else if(cstr == "Vnoise") c = new Noise_vv();
break;
case 'T' : if(cstr == "r") c = new Transformer();
else if(cstr == "LIN") c = new TLine();
@ -1093,7 +1096,9 @@ Component* getComponentFromName(QString& Line)
case 'A' : if(cstr == "ttenuator") c = new Attenuator();
else if(cstr == "mp") c = new Amplifier();
break;
case 'M' : if(cstr == "LIN") c = new MSline();
case 'M' : if(cstr.isEmpty()) c = new Mutual();
else if(cstr == "2") c = new Mutual2();
else if(cstr == "LIN") c = new MSline();
else if(cstr == "OSFET") c = new MOSFET_sub();
else if(cstr == "STEP") c = new MSstep();
else if(cstr == "CORN") c = new MScorner();

View File

@ -83,12 +83,16 @@
#include "iprobe.h"
#include "volt_noise.h"
#include "ampere_noise.h"
#include "noise_ii.h"
#include "noise_iv.h"
#include "noise_vv.h"
#include "vpulse.h"
#include "ipulse.h"
#include "vrect.h"
#include "irect.h"
#include "spicefile.h"
#include "libcomp.h"
#include "mutual.h"
#include "mutual2.h"
#endif

View File

@ -0,0 +1,86 @@
/***************************************************************************
mutual.cpp
------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 "mutual.h"
Mutual::Mutual()
{
Description = QObject::tr("two mutual inductors");
Arcs.append(new Arc(-16,-18,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, -6,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 6,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-18,-10,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-30,-30,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-18, 10,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-30, 30,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 18,-10, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 30,-30, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10, 18, 10, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10, 30, 30, 30,QPen(QPen::darkBlue,2)));
Texts.append(new Text(-21, -22, "1"));
Texts.append(new Text( 15, -22, "2"));
Arcs.append(new Arc(-14,-40, 28, 20, 16*30, 16*120,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30,-30));
Ports.append(new Port( 30,-30));
Ports.append(new Port( 30, 30));
Ports.append(new Port(-30, 30));
x1 = -33; y1 = -43;
x2 = 33; y2 = 34;
tx = x1+4;
ty = y2+4;
Model = "M";
Name = "Tr";
Props.append(new Property("L1", "1 mH", false,
QObject::tr("inductance of coil 1")));
Props.append(new Property("L2", "1 mH", false,
QObject::tr("inductance of coil 2")));
Props.append(new Property("R1", "0.1 Ohm", false,
QObject::tr("resistance of coil 1")));
Props.append(new Property("R2", "0.1 Ohm", false,
QObject::tr("resistance of coil 2")));
Props.append(new Property("k", "0.9", false,
QObject::tr("coupling factor between coil 1 and 2")));
}
Mutual::~Mutual()
{
}
Component* Mutual::newOne()
{
return new Mutual();
}
Element* Mutual::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Mutual Inductors");
BitmapFile = "mutual";
if(getNewOne) return new Mutual();
return 0;
}

32
qucs/components/mutual.h Normal file
View File

@ -0,0 +1,32 @@
/***************************************************************************
mutual.h
----------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 MUTUAL_H
#define MUTUAL_H
#include "component.h"
class Mutual : public Component {
public:
Mutual();
~Mutual();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -0,0 +1,99 @@
/***************************************************************************
symtrafo.cpp
--------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 "mutual2.h"
Mutual2::Mutual2()
{
Description = QObject::tr("three mutual inductors");
Arcs.append(new Arc(-16,-58,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-46,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-34,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 46,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 34,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 22,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-58,-10,-70,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-70,-30,-70,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-18, 10,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-30, 30,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 58,-10, 70,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 70,-30, 70,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10, 18, 10, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10, 30, 30, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-10,-30,-10,QPen(QPen::darkBlue,2)));
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)));
Texts.append(new Text(-20,-61,"1"));
Texts.append(new Text(-20, 18,"2"));
Texts.append(new Text( 15,-22,"3"));
Arcs.append(new Arc(-25,-65, 50,100, 16*29, 16*61,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-25,-35, 50,100,16*270, 16*61,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30,-70));
Ports.append(new Port( 30,-30));
Ports.append(new Port( 30, 30));
Ports.append(new Port(-30, 70));
Ports.append(new Port(-30, 10));
Ports.append(new Port(-30,-10));
x1 = -33; y1 = -74;
x2 = 33; y2 = 74;
tx = x1+4;
ty = y2+4;
Model = "M2";
Name = "Tr";
Props.append(new Property("L1", "1 mH", false,
QObject::tr("inductance of coil 1")));
Props.append(new Property("L2", "1 mH", false,
QObject::tr("inductance of coil 2")));
Props.append(new Property("L3", "1 mH", false,
QObject::tr("inductance of coil 3")));
Props.append(new Property("k12", "0.9", false,
QObject::tr("coupling factor between coil 1 and 2")));
Props.append(new Property("k13", "0.9", false,
QObject::tr("coupling factor between coil 1 and 3")));
Props.append(new Property("k23", "0.9", false,
QObject::tr("coupling factor between coil 2 and 3")));
}
Mutual2::~Mutual2()
{
}
Component* Mutual2::newOne()
{
return new Mutual2();
}
Element* Mutual2::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("3 Mutual Inductors");
BitmapFile = "mutual2";
if(getNewOne) return new Mutual2();
return 0;
}

32
qucs/components/mutual2.h Normal file
View File

@ -0,0 +1,32 @@
/***************************************************************************
mutual2.h
-----------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 MUTUAL2_H
#define MUTUAL2_H
#include "component.h"
class Mutual2 : public Component {
public:
Mutual2();
~Mutual2();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -0,0 +1,94 @@
/***************************************************************************
noise_ii.cpp
--------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 "noise_ii.h"
Noise_ii::Noise_ii()
{
Description = QObject::tr("correlated current sources");
// left noise source
Arcs.append(new Arc(-42,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 7,-30, -7,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-30, -6,-34, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-30, -6,-26, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-29, 12,-42, -1,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-24, 10,-27, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-37, -3,-40, -6,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20, 7,-25, 2,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-34, -7,-37,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 1,-31,-12,QPen(QPen::darkBlue,2)));
// right noise source
Arcs.append(new Arc( 18,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 30, 30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30,-30, 30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 7, 30, -7,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 30, -6, 26, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 30, -6, 34, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 31, 12, 18, -1,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 36, 10, 33, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 23, -3, 20, -6,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 40, 7, 35, 2,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 26, -7, 23,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 42, 1, 29,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 0, 18, 0,QPen(QPen::darkBlue,3)));
Ports.append(new Port(-30,-30));
Ports.append(new Port( 30,-30));
Ports.append(new Port( 30, 30));
Ports.append(new Port(-30, 30));
x1 = -44; y1 = -30;
x2 = 44; y2 = 30;
tx = x1+4;
ty = y2+4;
Model = "IInoise";
Name = "SRC";
Props.append(new Property("i1", "1e-6", true,
QObject::tr("current power spectral density of source 1")));
Props.append(new Property("i2", "1e-6", true,
QObject::tr("current power spectral density of source 2")));
Props.append(new Property("C", "0.5", true,
QObject::tr("normalized correlation coefficient")));
}
Noise_ii::~Noise_ii()
{
}
Component* Noise_ii::newOne()
{
return new Noise_ii();
}
Element* Noise_ii::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Correlated Noise Sources");
BitmapFile = "noise_ii";
if(getNewOne) return new Noise_ii();
return 0;
}

View File

@ -0,0 +1,32 @@
/***************************************************************************
noise_ii.h
------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 NOISE_II_H
#define NOISE_II_H
#include "component.h"
class Noise_ii : public Component {
public:
Noise_ii();
~Noise_ii();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -0,0 +1,89 @@
/***************************************************************************
noise_iv.cpp
--------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 "noise_iv.h"
Noise_iv::Noise_iv()
{
Description = QObject::tr("correlated current sources");
// left noise source
Arcs.append(new Arc(-42,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 7,-30, -7,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-30, -6,-34, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-30, -6,-26, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-29, 12,-42, -1,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-24, 10,-27, 7,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-37, -3,-40, -6,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20, 7,-25, 2,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-34, -7,-37,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 1,-31,-12,QPen(QPen::darkBlue,2)));
// right noise source
Arcs.append(new Arc( 18,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 30, 30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30,-30, 30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 31, 12, 18, -1,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 36, 10, 20, -6,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 40, 7, 23,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 42, 2, 28,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 0, 18, 0,QPen(QPen::darkBlue,3)));
Ports.append(new Port(-30,-30));
Ports.append(new Port( 30,-30));
Ports.append(new Port( 30, 30));
Ports.append(new Port(-30, 30));
x1 = -44; y1 = -30;
x2 = 44; y2 = 30;
tx = x1+4;
ty = y2+4;
Model = "IVnoise";
Name = "SRC";
Props.append(new Property("i1", "1e-6", true,
QObject::tr("current power spectral density of source 1")));
Props.append(new Property("v2", "1e-6", true,
QObject::tr("voltage power spectral density of source 2")));
Props.append(new Property("C", "0.5", true,
QObject::tr("normalized correlation coefficient")));
}
Noise_iv::~Noise_iv()
{
}
Component* Noise_iv::newOne()
{
return new Noise_iv();
}
Element* Noise_iv::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Correlated Noise Sources");
BitmapFile = "noise_iv";
if(getNewOne) return new Noise_iv();
return 0;
}

View File

@ -0,0 +1,32 @@
/***************************************************************************
noise_iv.h
------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 NOISE_IV_H
#define NOISE_IV_H
#include "component.h"
class Noise_iv : public Component {
public:
Noise_iv();
~Noise_iv();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -0,0 +1,84 @@
/***************************************************************************
noise_vv.cpp
--------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 "noise_vv.h"
Noise_vv::Noise_vv()
{
Description = QObject::tr("correlated current sources");
// left noise source
Arcs.append(new Arc(-42,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-29, 12,-42, -1,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-24, 10,-40, -6,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20, 7,-37,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 2,-32,-12,QPen(QPen::darkBlue,2)));
// right noise source
Arcs.append(new Arc( 18,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 30, 30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30,-30, 30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 31, 12, 18, -1,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 36, 10, 20, -6,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 40, 7, 23,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 42, 2, 28,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 0, 18, 0,QPen(QPen::darkBlue,3)));
Ports.append(new Port(-30,-30));
Ports.append(new Port( 30,-30));
Ports.append(new Port( 30, 30));
Ports.append(new Port(-30, 30));
x1 = -44; y1 = -30;
x2 = 44; y2 = 30;
tx = x1+4;
ty = y2+4;
Model = "VVnoise";
Name = "SRC";
Props.append(new Property("v1", "1e-6", true,
QObject::tr("voltage power spectral density of source 1")));
Props.append(new Property("v2", "1e-6", true,
QObject::tr("voltage power spectral density of source 2")));
Props.append(new Property("C", "0.5", true,
QObject::tr("normalized correlation coefficient")));
}
Noise_vv::~Noise_vv()
{
}
Component* Noise_vv::newOne()
{
return new Noise_vv();
}
Element* Noise_vv::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Correlated Noise Sources");
BitmapFile = "noise_vv";
if(getNewOne) return new Noise_vv();
return 0;
}

View File

@ -0,0 +1,32 @@
/***************************************************************************
noise_vv.h
------------
begin : Sat Aug 20 2005
copyright : (C) 2005 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 NOISE_VV_H
#define NOISE_VV_H
#include "component.h"
class Noise_vv : public Component {
public:
Noise_vv();
~Noise_vv();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

View File

@ -63,8 +63,8 @@ symTrafo::symTrafo()
Ports.append(new Port(-30, 10));
Ports.append(new Port(-30,-10));
x1 = -33; y1 = -73;
x2 = 33; y2 = 73;
x1 = -33; y1 = -74;
x2 = 33; y2 = 74;
tx = x1+4;
ty = y2+4;

View File

@ -49,8 +49,8 @@ Transformer::Transformer()
Ports.append(new Port( 30, 30));
Ports.append(new Port(-30, 30));
x1 = -33; y1 = -33;
x2 = 33; y2 = 33;
x1 = -33; y1 = -34;
x2 = 33; y2 = 34;
tx = x1+4;
ty = y2+4;

View File

@ -17,43 +17,67 @@
#include "sweepdialog.h"
#include "qucsdoc.h"
#include "node.h"
#include "qucs.h"
#include "main.h"
#include "qucsview.h"
#include "../diagrams/graph.h"
#include <qlabel.h>
#include <qlayout.h>
#include <qvalidator.h>
#include <qpushbutton.h>
#include <qspinbox.h>
/*class mySpinBox : public QSpinBox {
Q_OBJECT
public:
mySpinBox() {};
};*/
mySpinBox::mySpinBox(int Min, int Max, int Step, double *Val, QWidget *Parent)
: QSpinBox(Min, Max, Step, Parent)
{
Values = Val;
}
QString mySpinBox::mapValueToText(int Val)
{
return QString::number(*(Values+Val));
}
SweepDialog::SweepDialog(QucsDoc *d, Graph *g, QWidget *parent)
SweepDialog::SweepDialog(QucsDoc *d, QWidget *parent)
: QDialog(parent, 0, TRUE, Qt::WDestructiveClose)
{
setCaption(tr("Bias Points"));
Doc = d;
pGraph = g;
Expr.setPattern(""); // no number should be inserted manually
Validator = new QRegExpValidator(Expr, this);
pGraph = setBiasPoints();
// if simulation has no sweeps, terminate dialog before showing it
if(pGraph->cPointsX.count() == 0) {
reject();
return;
}
if(pGraph->cPointsX.count() <= 1)
if(pGraph->cPointsX.getFirst()->count <= 1) {
reject();
return;
}
setCaption(tr("Bias Points"));
int i = 0;
// ...........................................................
QGridLayout *all = new QGridLayout(this, pGraph->cPointsX.count()+1,2,3,3);
DataX *pD;
QSpinBox *Box;
mySpinBox *Box;
for(pD = pGraph->cPointsX.first(); pD!=0; pD = pGraph->cPointsX.next()) {
all->addWidget(new QLabel(pD->Var, this), i,0);
Box = new QSpinBox(0, pD->count-1, 1, this);
Box = new mySpinBox(0, pD->count-1, 1, pD->Points, this);
Box->setValidator(Validator);
Box->setValue(0); // call "mapValueToText()"
all->addWidget(Box, i++,1);
connect(Box, SIGNAL(valueChanged(int)), SLOT(slotNewValue(int)));
BoxList.append(Box);
@ -69,14 +93,127 @@ SweepDialog::~SweepDialog()
{
delete pGraph;
delete Validator;
for(double *p = ValueList.first(); p!=0; p = ValueList.next())
delete p;
}
// ---------------------------------------------------------------
void SweepDialog::slotNewValue(int)
{
// DataX *pD = pGraph->cPointsX.first();
DataX *pD = pGraph->cPointsX.first();
// for(QSpinBox *pb = BoxList.first(); pb!=0; pb = BoxList.next()) {
// *(pd->Points + pb->value());
// }
int Factor = 1, Index = 0;
for(mySpinBox *pb = BoxList.first(); pb!=0; pb = BoxList.next()) {
Index += pb->value() * Factor;
Factor *= pD->count;
}
Index *= 2; // because of complex values
double *p = ValueList.first();
for(Node *pn = NodeList.first(); pn!=0; pn = NodeList.next()) {
pn->Name = num2str(*(p+Index));
if(pn->x1 & 0x10)
pn->Name += "A";
else
pn->Name += "V";
p = ValueList.next();
}
QucsMain->view->viewport()->update();
}
// ---------------------------------------------------
Graph* SweepDialog::setBiasPoints()
{
// When this function is entered, a simulation was performed.
// Thus, the node names are still in "node->Name".
bool hasNoComp;
Graph *pg = new Graph("");
Diagram *Diag = new Diagram();
Node *pn;
Element *pe;
// create DC voltage for all nodes
for(pn = Doc->Nodes->first(); pn != 0; pn = Doc->Nodes->next()) {
if(pn->Name.isEmpty()) continue;
pn->x1 = 0;
if(pn->Connections.count() < 2) {
pn->Name = ""; // no text at open nodes
continue;
}
else {
hasNoComp = true;
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next())
if(pe->Type == isWire) {
if( ((Wire*)pe)->isHorizontal() ) pn->x1 |= 2;
}
else {
if( ((Component*)pe)->Model == "GND" ) {
hasNoComp = true; // no text at ground symbol
break;
}
if(pn->cx < pe->cx) pn->x1 |= 1; // to the right is no room
hasNoComp = false;
}
if(hasNoComp) { // text only were a component is connected
pn->Name = "";
continue;
}
}
pg->Var = pn->Name + ".V";
if(Diag->loadVarData(Doc->DataSet, pg)) {
pn->Name = num2str(*(pg->cPointsY)) + "V";
NodeList.append(pn); // remember node ...
ValueList.append(pg->cPointsY); // ... and all of its values
pg->cPointsY = 0; // do not delete it next time !
}
else
pn->Name = "0V";
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next())
if(pe->Type == isWire) {
if( ((Wire*)pe)->Port1 != pn ) // no text at next node
((Wire*)pe)->Port1->Name = "";
else ((Wire*)pe)->Port2->Name = "";
}
}
// create DC current through each probe
for(Component *pc = Doc->Comps->first(); pc != 0; pc = Doc->Comps->next())
if(pc->Model == "IProbe") {
pn = pc->Ports.first()->Connection;
if(!pn->Name.isEmpty()) // preserve node voltage ?
pn = pc->Ports.next()->Connection;
pn->x1 = 0x10; // mark current
pg->Var = pc->Name + ".I";
if(Diag->loadVarData(Doc->DataSet, pg)) {
pn->Name = num2str(*(pg->cPointsY)) + "A";
NodeList.append(pn); // remember node ...
ValueList.append(pg->cPointsY); // ... and all of its values
pg->cPointsY = 0; // do not delete it next time !
}
else
pn->Name = "0A";
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next())
if(pe->Type == isWire) {
if( ((Wire*)pe)->isHorizontal() ) pn->x1 |= 2;
}
else {
if(pn->cx < pe->cx) pn->x1 |= 1; // to the right is no room
}
}
Doc->showBias = 1;
delete Diag;
return pg;
}

View File

@ -21,31 +21,50 @@
#include <qdialog.h>
#include <qregexp.h>
#include <qptrlist.h>
#include <qspinbox.h>
class QucsDoc;
class Graph;
class Node;
class QGridLayout;
class QRegExpValidator;
class QSpinBox;
class mySpinBox : public QSpinBox {
Q_OBJECT
public:
mySpinBox(int, int, int, double*, QWidget*);
protected:
QString mapValueToText(int);
private:
double *Values;
};
class SweepDialog : public QDialog {
Q_OBJECT
public:
SweepDialog(QucsDoc*, Graph*, QWidget *parent=0);
SweepDialog(QucsDoc*, QWidget *parent=0);
~SweepDialog();
private slots:
void slotNewValue(int);
private:
Graph* setBiasPoints();
QGridLayout *all; // the mother of all widgets
QRegExpValidator *Validator;
QRegExp Expr;
QPtrList<QSpinBox> BoxList;
QRegExpValidator *Validator;
QPtrList<mySpinBox> BoxList;
QucsDoc *Doc;
Graph *pGraph;
QPtrList<Node> NodeList;
QPtrList<double> ValueList;
};
#endif

View File

@ -201,7 +201,7 @@ void QucsApp::fillComboBox(bool setAll)
CompChoose->insertItem(tr("sources"));
CompChoose->insertItem(tr("transmission lines"));
CompChoose->insertItem(tr("nonlinear components"));
CompChoose->insertItem(tr("file data"));
CompChoose->insertItem(tr("file components"));
CompChoose->insertItem(tr("simulations"));
CompChoose->insertItem(tr("diagrams"));
}
@ -1135,16 +1135,11 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim)
if(sim->ErrText->lines() > 1) // were there warnings ?
Init.slotShowWarnings();
if(sim->Doc->showBias == 0) {
if(sim->Doc->showBias == 0) { // paint dc bias into schematic ?
sim->slotClose(); // close and delete simulation window
Graph *pg = sim->Doc->setBiasPoints();
// if simulation has sweeps, show dialog to choose bias point
if((pg->cPointsX.count() > 1) || (pg->cPointsX.getFirst()->count > 1)) {
SweepDialog *Dia = new SweepDialog(sim->Doc, pg);
SweepDialog *Dia = new SweepDialog(sim->Doc);
Dia->show();
}
}
else if(sim->Doc->SimOpenDpl) {
slotChangePage(sim->Doc->DataDisplay); // switch to data display
sim->slotClose(); // close and delete simulation window
@ -1578,13 +1573,15 @@ pInfoFunc lumpedComponents[] =
&Ground::info, &SubCirPort::info, &Transformer::info, &symTrafo::info,
&dcBlock::info, &dcFeed::info, &BiasT::info, &Attenuator::info,
&Amplifier::info, &Isolator::info, &Circulator::info,
&Gyrator::info, &Phaseshifter::info, &iProbe::info, 0};
&Gyrator::info, &Phaseshifter::info, &iProbe::info, &Mutual::info,
&Mutual2::info, 0};
pInfoFunc Sources[] =
{&Volt_dc::info, &Ampere_dc::info, &Volt_ac::info, &Ampere_ac::info,
&Source_ac::info, &Volt_noise::info, &Ampere_noise::info, &VCCS::info,
&CCCS::info, &VCVS::info, &CCVS::info, &vPulse::info, &iPulse::info,
&vRect::info, &iRect::info, 0};
&vRect::info, &iRect::info, &Noise_ii::info, &Noise_vv::info,
&Noise_iv::info, 0};
pInfoFunc TransmissionLines[] =
{&TLine::info, &Substrate::info, &MSline::info, &MScoupled::info,

View File

@ -3037,6 +3037,82 @@ Verwendung: qucsedit [-r] Datei
<source>wrong dependency</source>
<translation>falsche Abhängigkeit</translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -4023,7 +4099,7 @@ About Qt by Trolltech</source>
</message>
<message>
<source>file data</source>
<translation>Dateidaten</translation>
<translation type="obsolete">Dateidaten</translation>
</message>
<message>
<source>simulations</source>
@ -4889,6 +4965,10 @@ Bearbeitet den Schaltplan</translation>
<source>no warnings</source>
<translation type="obsolete">keine Warnungen</translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2826,6 +2826,82 @@ Use: qucsedit [-r] archivo
<source>wrong dependency</source>
<translation>dependencia incorrecta</translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2954,7 +3030,7 @@ Use: qucsedit [-r] archivo
</message>
<message>
<source>file data</source>
<translation>archivo de datos</translation>
<translation type="obsolete">archivo de datos</translation>
</message>
<message>
<source>simulations</source>
@ -3459,6 +3535,10 @@ Edita el esquema</translation>
<source>no warnings</source>
<translation type="obsolete">sin avisos</translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2814,6 +2814,82 @@ Invocation : qucsedit [-r] fichier
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2934,7 +3010,7 @@ Invocation : qucsedit [-r] fichier
</message>
<message>
<source>file data</source>
<translation>fichier modèle</translation>
<translation type="obsolete">fichier modèle</translation>
</message>
<message>
<source>simulations</source>
@ -3443,6 +3519,10 @@ Modifie ce schéma</translation>
<source>Cannot start filter synthesis program!</source>
<translation type="obsolete">Lancement du programme de synthèse impossible !</translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2744,6 +2744,82 @@ Usage: qucsedit [-r] file
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2876,7 +2952,7 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>file data</source>
<translation>מידע קובץ</translation>
<translation type="obsolete">מידע קובץ</translation>
</message>
<message>
<source>simulations</source>
@ -3356,6 +3432,10 @@ Edits the symbol for this schematic</source>
Edits the schematic</source>
<translation>ערוך סכימה עורך את הסכימה</translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2801,6 +2801,82 @@ Használat: qucsedit [-r] fájl
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2933,7 +3009,7 @@ Nem indítható a tápvonal tervező program!
</message>
<message>
<source>file data</source>
<translation>Alkatrész fájlból (beágyazás)</translation>
<translation type="obsolete">Alkatrész fájlból (beágyazás)</translation>
</message>
<message>
<source>simulations</source>
@ -3451,6 +3527,10 @@ Nem indítható a tápvonal tervező program!
<source>3D-Cartesian</source>
<translation type="obsolete">3D-Derékszögű</translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2946,6 +2946,82 @@ Usage: qucsedit [-r] file
<source>wrong dependency</source>
<translation>dipendenza errata</translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -3770,7 +3846,7 @@ Breve introduzione a Qucs</translation>
</message>
<message>
<source>file data</source>
<translation>file dati</translation>
<translation type="obsolete">file dati</translation>
</message>
<message>
<source>simulations</source>

View File

@ -2790,6 +2790,82 @@ Usage: qucsedit [-r] file
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2918,7 +2994,7 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>file data</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source>simulations</source>
@ -3382,6 +3458,10 @@ Edits the schematic</source>
<source>Edit Properties</source>
<translation type="obsolete"></translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2870,6 +2870,82 @@ Stosowanie: qucsedit [-r] plik
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2990,7 +3066,7 @@ Stosowanie: qucsedit [-r] plik
</message>
<message>
<source>file data</source>
<translation>dane plikowe</translation>
<translation type="obsolete">dane plikowe</translation>
</message>
<message>
<source>simulations</source>
@ -3500,6 +3576,10 @@ Edytuj schemat</translation>
<source>SPICE netlist</source>
<translation>netlista w formacie SPICE</translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2753,6 +2753,82 @@ Usage: qucsedit [-r] file
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2881,7 +2957,7 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>file data</source>
<translation>arquivo de dados</translation>
<translation type="obsolete">arquivo de dados</translation>
</message>
<message>
<source>simulations</source>
@ -3360,6 +3436,10 @@ Edits the schematic</source>
<source>SPICE netlist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2829,6 +2829,82 @@ Folosire: qucsedit [-r] file
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2945,7 +3021,7 @@ Folosire: qucsedit [-r] file
</message>
<message>
<source>file data</source>
<translation>date din fişier</translation>
<translation type="obsolete">date din fişier</translation>
</message>
<message>
<source>simulations</source>
@ -3451,6 +3527,10 @@ Editează această schemă</translation>
<source>SPICE netlist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -2632,6 +2632,82 @@ Usage: qucsedit [-r] file
<source>wrong dependency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>three mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>inductance of coil 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 1 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>coupling factor between coil 2 and 3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>two mutual inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of coil 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3 Mutual Inductors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>correlated current sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>current power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>normalized correlation coefficient</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Correlated Noise Sources</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage power spectral density of source 1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2758,10 +2834,6 @@ Usage: qucsedit [-r] file
<source>nonlinear components</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>file data</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>simulations</source>
<translation type="unfinished"></translation>
@ -3095,6 +3167,10 @@ Edits the symbol for this schematic</source>
Edits the schematic</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>file components</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsEdit</name>

View File

@ -1,6 +1,6 @@
/***************************************************************************
qucsdoc.cpp
---------------
-------------
begin : Wed Sep 3 2003
copyright : (C) 2003, 2004 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -3264,90 +3264,3 @@ Component* QucsDoc::selectCompText(int x_, int y_, int& w, int& h)
return 0;
}
// ---------------------------------------------------
Graph* QucsDoc::setBiasPoints()
{
// When this function is entered, a simulation was performed.
// Thus, the node names are still in "node->Name".
bool hasNoComp;
Graph *pg = new Graph("");
Diagram *Diag = new Diagram();
Node *pn;
Element *pe;
// create DC voltage for all nodes
for(pn = Nodes->first(); pn != 0; pn = Nodes->next()) {
if(pn->Name.isEmpty()) continue;
pn->x1 = 0;
if(pn->Connections.count() < 2) {
pn->Name = ""; // no text at open nodes
continue;
}
else {
hasNoComp = true;
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next())
if(pe->Type == isWire) {
if( ((Wire*)pe)->isHorizontal() ) pn->x1 |= 2;
}
else {
if( ((Component*)pe)->Model == "GND" ) {
hasNoComp = true; // no text at ground symbol
break;
}
if(pn->cx < pe->cx) pn->x1 |= 1; // to the right is no room
hasNoComp = false;
}
if(hasNoComp) { // text only were a component is connected
pn->Name = "";
continue;
}
}
pg->Var = pn->Name + ".V";
if(Diag->loadVarData(DataSet, pg))
pn->Name = num2str(*(pg->cPointsY)) + "V";
else
pn->Name = "0V";
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next())
if(pe->Type == isWire) {
if( ((Wire*)pe)->Port1 != pn ) // no text at next node
((Wire*)pe)->Port1->Name = "";
else ((Wire*)pe)->Port2->Name = "";
}
}
// create DC current through each probe
for(Component *pc = Comps->first(); pc != 0; pc = Comps->next())
if(pc->Model == "IProbe") {
pn = pc->Ports.first()->Connection;
if(!pn->Name.isEmpty()) // preserve node voltage ?
pn = pc->Ports.next()->Connection;
pn->x1 = 0x10; // mark current
pg->Var = pc->Name + ".I";
if(Diag->loadVarData(DataSet, pg))
pn->Name = num2str(*(pg->cPointsY)) + "A";
else
pn->Name = "0A";
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next())
if(pe->Type == isWire) {
if( ((Wire*)pe)->isHorizontal() ) pn->x1 |= 2;
}
else {
if(pn->cx < pe->cx) pn->x1 |= 1; // to the right is no room
}
}
showBias = 1;
delete Diag;
return pg;
}

View File

@ -119,7 +119,6 @@ public:
Component* selectCompText(int, int, int&, int&);
int showBias; // -1=no, 0=calculation running, >0=show DC bias points
Graph* setBiasPoints();
QucsFile File; // class to perform load, save, copy, paste

View File

@ -1,7 +1,7 @@
/***************************************************************************
qucsview.cpp
----------------
begin : Thu Aug 28 18:17:41 CEST 2003
--------------
begin : Thu Aug 28 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/