SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
margraf 2004-01-31 21:27:38 +00:00
parent 6a82c3db55
commit d54752e7bd
72 changed files with 626 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,7 +1,12 @@
2004-01-31 Michael Margraf
* added tr(...) to all strings
* some tiny improvements
2004-01-24 Stefan Jahn <stefan@lkcc.org>
* configure.ac: Additionally checking for X headers and
libraries. Checking for multi-threaded and non-threaded Qt
* configure.ac: Additionally checking for X headers and
libraries. Checking for multi-threaded and non-threaded Qt
library.
2004-01-19 Stefan Jahn <stefan@lkcc.org>

1
configure.ac
View File

@ -186,7 +186,6 @@ AH_TOP([
AC_CONFIG_FILES([Makefile
qucs/Makefile
qucs/bitmaps/Makefile
qucs/sim/Makefile
qucs/components/Makefile
qucs/diagrams/Makefile
qucs/paintings/Makefile

2
qucs/bitmaps/Makefile.am
View File

@ -31,7 +31,7 @@ XPMS = ac_voltage.xpm arrow.xpm capacitor.xpm dc_current.xpm dc_voltage.xpm \
isolator.xpm mscorner.xpm mscross.xpm msstep.xpm mstee.xpm substrate.xpm \
port.xpm spfile1.xpm spfile2.xpm spfile3.xpm spfile4.xpm spfile5.xpm \
spfile6.xpm coplanar.xpm ellipse.xpm mscoupled.xpm gyrator.xpm \
pshifter.xpm
pshifter.xpm iprobe.xpm noise_current.xpm noise_volt.xpm
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \
deactiv.png bottom.png editpaste.png equation.png fileclose.png \

38
qucs/bitmaps/iprobe.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
static char * iprobe_xpm[] = {
"32 32 3 1",
" c None",
". c #000000",
"+ c #FF0000",
" ",
" ",
" ",
" ",
" ",
" ..................... ",
" . . ",
" . ................. . ",
" . . . . ",
" . . . ..... . . ",
" . . .. .. . . ",
" . . . . . . . ",
" . . . . . . . ",
" . . . . . ",
" . . . . . ",
" . . . . . ",
" . . . . . ",
" . . ... . . ",
" . . ... . . ",
" . ................. . ",
" . . ",
" . . . ",
" + . ... . + ",
" + +.........................+ +",
" + . ... . + ",
" . . . ",
" . . ",
" ..................... ",
" ",
" ",
" ",
" "};

38
qucs/bitmaps/noise_current.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
static char * noise_current_xpm[] = {
"32 32 3 1",
" c None",
". c #FF0000",
"+ c #000000",
" ",
" ",
" . ",
" . . ",
" . ",
" + ",
" + ",
" + ",
" + ",
" +++++ ",
" ++ + ++ ",
" + + + + ",
" + + + + + ",
" ++ +++ + + ",
" + + +++ + + ",
" + +++++ + + ",
" ++ + ++ ",
" + + + + + ",
" + + + + + ",
" + + + ++ ",
" + + + + + ",
" + + + + ",
" ++ + ++ ",
" +++++ ",
" + ",
" + ",
" + ",
" + ",
" . ",
" . . ",
" . ",
" "};

38
qucs/bitmaps/noise_volt.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
static char * noise_volt_xpm[] = {
"32 32 3 1",
" c None",
". c #FF0000",
"+ c #000000",
" ",
" ",
" . ",
" . . ",
" . ",
" + ",
" + ",
" + ",
" + ",
" +++++ ",
" ++ + ++ ",
" + + + + ",
" + + + + ",
" ++ + + + ",
" + + + + + ",
" + + + + + ",
" ++ + + ++ ",
" + + + + + ",
" + + + + + ",
" + + + ++ ",
" + + + + ",
" + + + + ",
" ++ + ++ ",
" +++++ ",
" + ",
" + ",
" + ",
" + ",
" . ",
" . . ",
" . ",
" "};

6
qucs/components/Makefile.am
View File

@ -35,7 +35,8 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.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 \
component.cpp resistor.cpp $(MOCFILES)
component.cpp resistor.cpp iprobe.cpp volt_noise.cpp ampere_noise.cpp \
$(MOCFILES)
noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
inductor.h biast.h dcblock.h dcfeed.h ground.h subcirport.h symtrafo.h \
@ -43,7 +44,8 @@ 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 resistorus.h \
iprobe.h volt_noise.h ampere_noise.h
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES)

8
qucs/components/ac_sim.cpp
View File

@ -20,7 +20,7 @@
AC_Sim::AC_Sim()
{
Description = "ac simulation";
Description = QObject::tr("ac simulation");
Lines.append(new Line(-56,-12, 56,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-56, 12, 56, 12,QPen(QPen::darkBlue,2)));
@ -42,9 +42,9 @@ AC_Sim::AC_Sim()
Model = ".AC";
Name = "AC";
Props.append(new Property("Start", "1 GHz", true, "start frequency in Hertz"));
Props.append(new Property("Stop", "10 GHz", true, "stop frequency in Hertz"));
Props.append(new Property("Step", "1 GHz", true, "frequency steps in Hertz"));
Props.append(new Property("Start", "1 GHz", true, QObject::tr("start frequency in Hertz")));
Props.append(new Property("Stop", "10 GHz", true, QObject::tr("stop frequency in Hertz")));
Props.append(new Property("Step", "1 GHz", true, QObject::tr("frequency steps in Hertz")));
}
AC_Sim::~AC_Sim()

4
qucs/components/ampere_dc.cpp
View File

@ -20,7 +20,7 @@
Ampere_dc::Ampere_dc()
{
Description = "ideal dc current source";
Description = QObject::tr("ideal dc current source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
@ -41,7 +41,7 @@ Ampere_dc::Ampere_dc()
Model = "Idc";
Name = "I";
Props.append(new Property("I", "1 mA", true, "current in Ampere"));
Props.append(new Property("I", "1 mA", true, QObject::tr("current in Ampere")));
}
Ampere_dc::~Ampere_dc()

57
qucs/components/ampere_noise.cpp Normal file
View File

@ -0,0 +1,57 @@
/***************************************************************************
ampere_noise.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 "ampere_noise.h"
Ampere_noise::Ampere_noise()
{
Description = QObject::tr("noise current source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -7, 0, 7, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 6, 0, 0, -4,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 6, 0, 0, 4,QPen(QPen::darkBlue,3)));
Ports.append(new Port( 30, 0));
Ports.append(new Port(-30, 0));
x1 = -30; y1 = -14;
x2 = 30; y2 = 14;
tx = x1+4;
ty = y2+4;
Sign = "Inoise";
Model = "Inoise";
Name = "I";
Props.append(new Property("i", "1e-6", true, QObject::tr("equivalent current density in A/sqrt(Hz)")));
Props.append(new Property("e", "0", true, QObject::tr("frequency exponent")));
Props.append(new Property("c", "1", true, QObject::tr("frequency coefficient")));
Props.append(new Property("a", "0", true, QObject::tr("additive frequency term")));
}
Ampere_noise::~Ampere_noise()
{
}
Ampere_noise* Ampere_noise::newOne()
{
return new Ampere_noise();
}

31
qucs/components/ampere_noise.h Normal file
View File

@ -0,0 +1,31 @@
/***************************************************************************
ampere_noise.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 AMPERE_NOISE_H
#define AMPERE_NOISE_H
#include "component.h"
class Ampere_noise : public Component {
public:
Ampere_noise();
~Ampere_noise();
Ampere_noise* newOne();
};
#endif

6
qucs/components/attenuator.cpp
View File

@ -20,7 +20,7 @@
Attenuator::Attenuator()
{
Description = "attenuator";
Description = QObject::tr("attenuator");
Lines.append(new Line( -4, -6, -4, 6,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -4, -6, 4, -6,QPen(QPen::darkBlue,2)));
@ -49,8 +49,8 @@ Attenuator::Attenuator()
Model = "Attenuator";
Name = "X";
Props.append(new Property("L", "10 dB", true, "attenuation"));
Props.append(new Property("Zref", "50 Ohm", false, "reference impedance"));
Props.append(new Property("L", "10 dB", true, QObject::tr("attenuation")));
Props.append(new Property("Zref", "50 Ohm", false, QObject::tr("reference impedance")));
}
Attenuator::~Attenuator()

2
qucs/components/biast.cpp
View File

@ -20,7 +20,7 @@
BiasT::BiasT()
{
Description = "bias t";
Description = QObject::tr("bias t");
Arcs.append(new Arc( -3, 2, 7, 7, 16*270, 16*180,QPen(QPen::darkBlue,1)));
Arcs.append(new Arc( -3, 8, 7, 7, 16*270, 16*180,QPen(QPen::darkBlue,1)));

4
qucs/components/capacitor.cpp
View File

@ -20,7 +20,7 @@
Capacitor::Capacitor()
{
Description = "capacitor";
Description = QObject::tr("capacitor");
Lines.append(new Line( -4,-11, -4, 11,QPen(QPen::darkBlue,4)));
Lines.append(new Line( 4,-11, 4, 11,QPen(QPen::darkBlue,4)));
@ -39,7 +39,7 @@ Capacitor::Capacitor()
Model = "C";
Name = "C";
Props.append(new Property("C", "1 pF", true, "capacitance in Farad"));
Props.append(new Property("C", "1 pF", true, QObject::tr("capacitance in Farad")));
}
Capacitor::~Capacitor()

6
qucs/components/cccs.cpp
View File

@ -20,7 +20,7 @@
CCCS::CCCS()
{
Description = "current controlled current source";
Description = QObject::tr("current controlled current source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 11, -7, 11, 7,QPen(QPen::darkBlue,3)));
@ -58,8 +58,8 @@ CCCS::CCCS()
Model = "CCCS";
Name = "SRC";
Props.append(new Property("G", "1", true, "forward transfer factor"));
Props.append(new Property("T", "0", true, "delay time"));
Props.append(new Property("G", "1", true, QObject::tr("forward transfer factor")));
Props.append(new Property("T", "0", true, QObject::tr("delay time")));
}
CCCS::~CCCS()

6
qucs/components/ccvs.cpp
View File

@ -20,7 +20,7 @@
CCVS::CCVS()
{
Description = "current controlled voltage source";
Description = QObject::tr("current controlled voltage source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
@ -59,8 +59,8 @@ CCVS::CCVS()
Model = "CCVS";
Name = "SRC";
Props.append(new Property("G", "1 Ohm", true, "forward transfer factor"));
Props.append(new Property("T", "0", true, "delay time"));
Props.append(new Property("G", "1 Ohm", true, QObject::tr("forward transfer factor")));
Props.append(new Property("T", "0", true, QObject::tr("delay time")));
}
CCVS::~CCVS()

8
qucs/components/circulator.cpp
View File

@ -20,7 +20,7 @@
Circulator::Circulator()
{
Description = "circulator";
Description = QObject::tr("circulator");
Arcs.append(new Arc(-14,-14, 29, 29, 0,16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-14, 0,QPen(QPen::darkBlue,2)));
@ -46,9 +46,9 @@ Circulator::Circulator()
Model = "Circulator";
Name = "X";
Props.append(new Property("Z1", "50 Ohm", false, "reference impedance of port 1"));
Props.append(new Property("Z2", "50 Ohm", false, "reference impedance of port 2"));
Props.append(new Property("Z3", "50 Ohm", false, "reference impedance of port 3"));
Props.append(new Property("Z1", "50 Ohm", false, QObject::tr("reference impedance of port 1")));
Props.append(new Property("Z2", "50 Ohm", false, QObject::tr("reference impedance of port 2")));
Props.append(new Property("Z3", "50 Ohm", false, QObject::tr("reference impedance of port 3")));
}
Circulator::~Circulator()

22
qucs/components/componentdialog.cpp
View File

@ -52,7 +52,7 @@ ComponentDialog::ComponentDialog(Component *c, QWidget *parent, const char *name
Name = new QLabel(this);
g->addWidget(Name,1,1);
Description = new QLabel(this);
g->addWidget(Description,2,1);
@ -82,23 +82,23 @@ ComponentDialog::ComponentDialog(Component *c, QWidget *parent, const char *name
disp = new QCheckBox(tr("display in schematic"),this);
g->addWidget(disp,5,1);
connect(disp, SIGNAL(stateChanged(int)), SLOT(slotApplyState(int)));
QVBoxLayout *v = new QVBoxLayout(); // stretchable placeholder
v->addStretch(2);
g->addLayout(v,6,1);
// ------------------------------------------------------------
Comp = c;
label1->setText(c->Description);
changed = false;
// prop->clear();
QString s;
// insert all properties into the ListBox
for(Property *p = c->Props.last(); p != 0; p = c->Props.prev()) {
if(p->display) s = "yes";
else s = "no";
if(p->display) s = tr("yes");
else s = tr("no");
prop->insertItem(new QListViewItem(prop,p->Name,p->Value,s));
}
@ -108,7 +108,7 @@ ComponentDialog::ComponentDialog(Component *c, QWidget *parent, const char *name
}
connect(prop, SIGNAL(clicked(QListViewItem*)), SLOT(slotSelectProperty(QListViewItem*)));
}
}
ComponentDialog::~ComponentDialog()
{
@ -121,7 +121,7 @@ void ComponentDialog::slotSelectProperty(QListViewItem *item)
Name->setText(item->text(0));
edit->setText(item->text(1));
if(item->text(2) == "yes") disp->setChecked(true);
if(item->text(2) == tr("yes")) disp->setChecked(true);
else disp->setChecked(false);
Property *pp;
@ -175,8 +175,8 @@ void ComponentDialog::slotApplyProperty()
// -------------------------------------------------------------------------
void ComponentDialog::slotApplyState(int State)
{
if(State == QButton::On) prop->currentItem()->setText(2, "yes");
else prop->currentItem()->setText(2, "no");
if(State == QButton::On) prop->currentItem()->setText(2, tr("yes"));
else prop->currentItem()->setText(2, tr("no"));
}
// -------------------------------------------------------------------------
@ -204,7 +204,7 @@ void ComponentDialog::slotApplyInput()
changed = true;
}
display = (item->text(2) == "yes");
display = (item->text(2) == tr("yes"));
if(pp->display != display) {
pp->display = display;
changed = true;

3
qucs/components/components.h
View File

@ -65,6 +65,9 @@
#include "sp_sim.h"
#include "hb_sim.h"
#include "param_sweep.h"
#include "iprobe.h"
#include "volt_noise.h"
#include "ampere_noise.h"
#endif

10
qucs/components/coplanar.cpp
View File

@ -20,7 +20,7 @@
Coplanar::Coplanar()
{
Description = "coplanar line";
Description = QObject::tr("coplanar line");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
@ -57,10 +57,10 @@ Coplanar::Coplanar()
Model = "CLIN";
Name = "CL";
Props.append(new Property("Subst", "Subst1", true, "name of substrate definition"));
Props.append(new Property("W", "1 mm", true, "width of the line"));
Props.append(new Property("S", "1 mm", true, "width of a gap"));
Props.append(new Property("L", "10 mm", true, "length of the line"));
Props.append(new Property("Subst", "Subst1", true, QObject::tr("name of substrate definition")));
Props.append(new Property("W", "1 mm", true, QObject::tr("width of the line")));
Props.append(new Property("S", "1 mm", true, QObject::tr("width of a gap")));
Props.append(new Property("L", "10 mm", true, QObject::tr("length of the line")));
// Props.append(new Property("Model", "Kirschning", false, "microstrip model |Kirschning|Kobayashi|Yamashita"));
}

2
qucs/components/dc_sim.cpp
View File

@ -20,7 +20,7 @@
DC_Sim::DC_Sim()
{
Description = "dc simulation";
Description = QObject::tr("dc simulation");
Lines.append(new Line(-56,-12, 56,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-56, 12, 56, 12,QPen(QPen::darkBlue,2)));

2
qucs/components/dcblock.cpp
View File

@ -19,7 +19,7 @@
dcBlock::dcBlock()
{
Description = "dc block";
Description = QObject::tr("dc block");
Lines.append(new Line(- 4,-11, -4, 11,QPen(QPen::darkBlue,4)));
Lines.append(new Line( 4,-11, 4, 11,QPen(QPen::darkBlue,4)));

2
qucs/components/dcfeed.cpp
View File

@ -20,7 +20,7 @@
dcFeed::dcFeed()
{
Description = "dc feed";
Description = QObject::tr("dc feed");
Arcs.append(new Arc(-17, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -6, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));

2
qucs/components/diode.cpp
View File

@ -20,7 +20,7 @@
Diode::Diode()
{
Description = "diode";
Description = QObject::tr("diode");
Lines.append(new Line(-30, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -6, -9, -6, 9,QPen(QPen::darkBlue,2)));

4
qucs/components/equation.cpp
View File

@ -20,11 +20,11 @@
Equation::Equation()
{
Description = "equation";
Description = QObject::tr("equation");
Lines.append(new Line(-24, -6,-24, 6,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-24, 6, 24, 6,QPen(QPen::darkBlue,2)));
Texts.append(new Text(-20, 2,"Equation"));
Texts.append(new Text(-20, 2,QObject::tr("Equation")));
x1 = -27; y1 = -9;
x2 = 27; y2 = 9;

2
qucs/components/ground.cpp
View File

@ -20,7 +20,7 @@
Ground::Ground()
{
Description = "ground (reference potential)";
Description = QObject::tr("ground (reference potential)");
Lines.append(new Line( 0, 0, 0, 10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-11, 10, 11, 10,QPen(QPen::darkBlue,3)));

6
qucs/components/gyrator.cpp
View File

@ -20,7 +20,7 @@
Gyrator::Gyrator()
{
Description = "gyrator (impedance inverter)";
Description = QObject::tr("gyrator (impedance inverter)");
Arcs.append(new Arc( 2, -9, 19, 19, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21, -9, 19, 19,16*270, 16*180,QPen(QPen::darkBlue,2)));
@ -52,8 +52,8 @@ Gyrator::Gyrator()
Model = "Gyrator";
Name = "X";
Props.append(new Property("R", "50 Ohm", true, "gyrator ratio"));
Props.append(new Property("Zref", "50 Ohm", true, "referenz impedance"));
Props.append(new Property("R", "50 Ohm", true, QObject::tr("gyrator ratio")));
Props.append(new Property("Zref", "50 Ohm", true, QObject::tr("reference impedance")));
}
Gyrator::~Gyrator()

6
qucs/components/hb_sim.cpp
View File

@ -20,7 +20,7 @@
HB_Sim::HB_Sim()
{
Description = "Harmonic balance simulation";
Description = QObject::tr("Harmonic balance simulation");
Lines.append(new Line(-75,-21, 75,-21,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-75, 21, 75, 21,QPen(QPen::darkBlue,2)));
@ -42,8 +42,8 @@ HB_Sim::HB_Sim()
Model = ".HB";
Name = "HB";
Props.append(new Property("f", "1 GHz", true, "frequency in Hertz"));
Props.append(new Property("n", "4", true, "number of harmonics"));
Props.append(new Property("f", "1 GHz", true, QObject::tr("frequency in Hertz")));
Props.append(new Property("n", "4", true, QObject::tr("number of harmonics")));
}
HB_Sim::~HB_Sim()

4
qucs/components/inductor.cpp
View File

@ -20,7 +20,7 @@
Inductor::Inductor()
{
Description = "inductor";
Description = QObject::tr("inductor");
Arcs.append(new Arc(-17, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -6, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
@ -40,7 +40,7 @@ Inductor::Inductor()
Model = "L";
Name = "L";
Props.append(new Property("L", "1 nH", true, "inductance in Henry"));
Props.append(new Property("L", "1 nH", true, QObject::tr("inductance in Henry")));
}
Inductor::~Inductor()

54
qucs/components/iprobe.cpp Normal file
View File

@ -0,0 +1,54 @@
/***************************************************************************
iprobe.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 "iprobe.h"
iProbe::iProbe()
{
Description = QObject::tr("current probe");
Lines.append(new Line(-30, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -2, -3, 2, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -2, 3, 2, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20,-22, 20,-22,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20, 6, 20, 6,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20,-22, 20, 6,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 20,-22, 20, 6,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
x1 = -30; y1 = -11;
x2 = 30; y2 = 11;
tx = x1+4;
ty = y2+4;
Sign = "IProbe";
Model = "IProbe";
Name = "Pr";
}
iProbe::~iProbe()
{
}
iProbe* iProbe::newOne()
{
return new iProbe();
}

31
qucs/components/iprobe.h Normal file
View File

@ -0,0 +1,31 @@
/***************************************************************************
iprobe.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 IPROBE_H
#define IPROBE_H
#include "component.h"
class iProbe : public Component {
public:
iProbe();
~iProbe();
iProbe* newOne();
};
#endif

6
qucs/components/isolator.cpp
View File

@ -20,7 +20,7 @@
Isolator::Isolator()
{
Description = "isolator";
Description = QObject::tr("isolator");
Lines.append(new Line( -8, 0, 8, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 8, 0, 0, -5,QPen(QPen::darkBlue,3)));
@ -46,8 +46,8 @@ Isolator::Isolator()
Model = "Isolator";
Name = "X";
Props.append(new Property("Z1", "50 Ohm", false, "reference impedance of input port"));
Props.append(new Property("Z2", "50 Ohm", false, "reference impedance of output port"));
Props.append(new Property("Z1", "50 Ohm", false, QObject::tr("reference impedance of input port")));
Props.append(new Property("Z2", "50 Ohm", false, QObject::tr("reference impedance of output port")));
}
Isolator::~Isolator()

8
qucs/components/mscorner.cpp
View File

@ -20,7 +20,7 @@
MScorner::MScorner()
{
Description = "microstrip corner";
Description = QObject::tr("microstrip corner");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 18, 0, 30,QPen(QPen::darkBlue,2)));
@ -45,9 +45,9 @@ MScorner::MScorner()
Model = "MCORN";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true, "substrate"));
Props.append(new Property("W1", "1 mm", true, "width of line 1"));
Props.append(new Property("W2", "2 mm", true, "width of line 2"));
Props.append(new Property("Subst", "Subst1", true, QObject::tr("substrate")));
Props.append(new Property("W1", "1 mm", true, QObject::tr("width of line 1")));
Props.append(new Property("W2", "2 mm", true, QObject::tr("width of line 2")));
}
MScorner::~MScorner()

12
qucs/components/mscoupled.cpp
View File

@ -20,7 +20,7 @@
MScoupled::MScoupled()
{
Description = "coupled microstrip line";
Description = QObject::tr("coupled microstrip line");
Lines.append(new Line(-30,-12,-16,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-30,-12,QPen(QPen::darkBlue,2)));
@ -56,11 +56,11 @@ MScoupled::MScoupled()
Model = "CMS";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true, "name of substrate definition"));
Props.append(new Property("W", "1 mm", true, "width of the line"));
Props.append(new Property("L", "10 mm", true, "length of the line"));
Props.append(new Property("S", "1 mm", true, "spacing between the lines"));
Props.append(new Property("Model", "Kirschning", false, "microstrip model |Kirschning|Kobayashi|Yamashita"));
Props.append(new Property("Subst", "Subst1", true, QObject::tr("name of substrate definition")));
Props.append(new Property("W", "1 mm", true, QObject::tr("width of the line")));
Props.append(new Property("L", "10 mm", true, QObject::tr("length of the line")));
Props.append(new Property("S", "1 mm", true, QObject::tr("spacing between the lines")));
Props.append(new Property("Model", "Kirschning", false, QObject::tr("microstrip model |Kirschning|Kobayashi|Yamashita")));
}
MScoupled::~MScoupled()

12
qucs/components/mscross.cpp
View File

@ -20,7 +20,7 @@
MScross::MScross()
{
Description = "microstrip cross";
Description = QObject::tr("microstrip cross");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
@ -59,11 +59,11 @@ MScross::MScross()
Model = "MCROSS";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true, "substrate"));
Props.append(new Property("W1", "1 mm", true, "width of line 1"));
Props.append(new Property("W2", "2 mm", true, "width of line 2"));
Props.append(new Property("W3", "1 mm", true, "width of line 3"));
Props.append(new Property("W4", "2 mm", true, "width of line 4"));
Props.append(new Property("Subst", "Subst1", true, QObject::tr("substrate")));
Props.append(new Property("W1", "1 mm", true, QObject::tr("width of line 1")));
Props.append(new Property("W2", "2 mm", true, QObject::tr("width of line 2")));
Props.append(new Property("W3", "1 mm", true, QObject::tr("width of line 3")));
Props.append(new Property("W4", "2 mm", true, QObject::tr("width of line 4")));
}
MScross::~MScross()

10
qucs/components/msline.cpp
View File

@ -20,7 +20,7 @@
MSline::MSline()
{
Description = "microstrip line";
Description = QObject::tr("microstrip line");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
@ -43,10 +43,10 @@ MSline::MSline()
Model = "MLIN";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true, "name of substrate definition"));
Props.append(new Property("W", "1 mm", true, "width of the line"));
Props.append(new Property("L", "10 mm", true, "length of the line"));
Props.append(new Property("Model", "Kirschning", false, "microstrip model |Kirschning|Kobayashi|Yamashita"));
Props.append(new Property("Subst", "Subst1", true, QObject::tr("name of substrate definition")));
Props.append(new Property("W", "1 mm", true, QObject::tr("width of the line")));
Props.append(new Property("L", "10 mm", true, QObject::tr("length of the line")));
Props.append(new Property("Model", "Kirschning", false, QObject::tr("microstrip model |Kirschning|Kobayashi|Yamashita")));
}
MSline::~MSline()

8
qucs/components/msstep.cpp
View File

@ -20,7 +20,7 @@
MSstep::MSstep()
{
Description = "microstrip impedance step";
Description = QObject::tr("microstrip impedance step");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
@ -47,9 +47,9 @@ MSstep::MSstep()
Model = "MSTEP";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true, "substrate"));
Props.append(new Property("W1", "2 mm", true, "width 1 of the line"));
Props.append(new Property("W2", "1 mm", true, "width 2 of the line"));
Props.append(new Property("Subst", "Subst1", true, QObject::tr("substrate")));
Props.append(new Property("W1", "2 mm", true, QObject::tr("width 1 of the line")));
Props.append(new Property("W2", "1 mm", true, QObject::tr("width 2 of the line")));
}
MSstep::~MSstep()

10
qucs/components/mstee.cpp
View File

@ -20,7 +20,7 @@
MStee::MStee()
{
Description = "microstrip tee";
Description = QObject::tr("microstrip tee");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
@ -49,10 +49,10 @@ MStee::MStee()
Model = "MTEE";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true, "substrate"));
Props.append(new Property("W1", "1 mm", true, "width of line 1"));
Props.append(new Property("W2", "1 mm", true, "width of line 2"));
Props.append(new Property("W3", "2 mm", true, "width of line 3"));
Props.append(new Property("Subst", "Subst1", true, QObject::tr("substrate")));
Props.append(new Property("W1", "1 mm", true, QObject::tr("width of line 1")));
Props.append(new Property("W2", "1 mm", true, QObject::tr("width of line 2")));
Props.append(new Property("W3", "2 mm", true, QObject::tr("width of line 3")));
}
MStee::~MStee()

10
qucs/components/param_sweep.cpp
View File

@ -20,7 +20,7 @@
Param_Sweep::Param_Sweep()
{
Description = "Parameter sweep";
Description = QObject::tr("Parameter sweep");
Lines.append(new Line(-46,-22, 46,-22,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-46, 22, 46, 22,QPen(QPen::darkBlue,2)));
@ -42,10 +42,10 @@ Param_Sweep::Param_Sweep()
Model = ".SW";
Name = "SW";
Props.append(new Property("Param", "R1", true, "parameter to sweep"));
Props.append(new Property("Start", "5 Ohm", true, "start value for sweep"));
Props.append(new Property("Stop", "50 Ohm", true, "stop value for sweep"));
Props.append(new Property("Step", "5 Ohm", true, "step size for sweep"));
Props.append(new Property("Param", "R1", true, QObject::tr("parameter to sweep")));
Props.append(new Property("Start", "5 Ohm", true, QObject::tr("start value for sweep")));
Props.append(new Property("Stop", "50 Ohm", true, QObject::tr("stop value for sweep")));
Props.append(new Property("Step", "5 Ohm", true, QObject::tr("step size for sweep")));
}
Param_Sweep::~Param_Sweep()

6
qucs/components/phaseshifter.cpp
View File

@ -20,7 +20,7 @@
Phaseshifter::Phaseshifter()
{
Description = "phase shifter";
Description = QObject::QObject::tr("phase shifter");
Lines.append(new Line(-14,-14, 14,-14,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-14, 14, 14, 14,QPen(QPen::darkBlue,2)));
@ -44,8 +44,8 @@ Phaseshifter::Phaseshifter()
Model = "PShift";
Name = "X";
Props.append(new Property("phi", "90", true, "phase shift in degree"));
Props.append(new Property("Zref", "50 Ohm", false, "reference impedance"));
Props.append(new Property("phi", "90", true, QObject::QObject::tr("phase shift in degree")));
Props.append(new Property("Zref", "50 Ohm", false, QObject::QObject::tr("reference impedance")));
}
Phaseshifter::~Phaseshifter()

6
qucs/components/resistorus.cpp
View File

@ -19,7 +19,7 @@
ResistorUS::ResistorUS()
{
Description = "resistor (US symbol)";
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)));
@ -43,8 +43,8 @@ ResistorUS::ResistorUS()
Model = "R";
Name = "R";
Props.append(new Property("R", "50 Ohm", true, "ohmic resistance in Ohms"));
// Props.append(new Property("Noise", "yes", false, "thermal noise yes or no"));
Props.append(new Property("R", "50 Ohm", true, QObject::tr("ohmic resistance in Ohms")));
// Props.append(new Property("Noise", "yes", false, QObject::tr("thermal noise yes or no")));
}
ResistorUS::~ResistorUS()

10
qucs/components/source_ac.cpp
View File

@ -20,7 +20,7 @@
Source_ac::Source_ac()
{
Description = "ac power source";
Description = QObject::QObject::tr("ac power source");
Lines.append(new Line(-22,-11, 22,-11,QPen(QPen::darkGray,1)));
Lines.append(new Line(-22, 10, 22, 10,QPen(QPen::darkGray,1)));
@ -55,10 +55,10 @@ Source_ac::Source_ac()
Model = "Pac";
Name = "P";
Props.append(new Property("Num", "1", true, "number of the port"));
Props.append(new Property("Z", "50 Ohm", true, "port impedance"));
Props.append(new Property("P", "0 dBm", true, "ac power in Watts"));
Props.append(new Property("f", "1 GHz", true, "frequency in Hertz"));
Props.append(new Property("Num", "1", true, QObject::QObject::tr("number of the port")));
Props.append(new Property("Z", "50 Ohm", true, QObject::QObject::tr("port impedance")));
Props.append(new Property("P", "0 dBm", true, QObject::QObject::tr("ac power in Watts")));
Props.append(new Property("f", "1 GHz", true, QObject::QObject::tr("frequency in Hertz")));
}
Source_ac::~Source_ac()

8
qucs/components/sp_sim.cpp
View File

@ -20,7 +20,7 @@
SP_Sim::SP_Sim()
{
Description = "S parameter simulation";
Description = QObject::tr("S parameter simulation");
Lines.append(new Line(-53,-21, 53,-21,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-53, 21, 53, 21,QPen(QPen::darkBlue,2)));
@ -42,9 +42,9 @@ SP_Sim::SP_Sim()
Model = ".SP";
Name = "SP";
Props.append(new Property("Start", "1 GHz", true, "start frequency in Hertz"));
Props.append(new Property("Stop", "10 GHz", true, "stop frequency in Hertz"));
Props.append(new Property("Step", "1 GHz", true, "frequency steps in Hertz"));
Props.append(new Property("Start", "1 GHz", true, QObject::tr("start frequency in Hertz")));
Props.append(new Property("Stop", "10 GHz", true, QObject::tr("stop frequency in Hertz")));
Props.append(new Property("Step", "1 GHz", true, QObject::tr("frequency steps in Hertz")));
}
SP_Sim::~SP_Sim()

6
qucs/components/sparamfile.cpp
View File

@ -20,14 +20,14 @@
SParamFile::SParamFile(int No)
{
Description = "S parameter file";
Description = QObject::tr("S parameter file");
int h = 30*((No-1)/2) + 15;
Lines.append(new Line(-15, -h, 15, -h,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 15, -h, 15, h,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-15, h, 15, h,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-15, -h,-15, h,QPen(QPen::darkBlue,2)));
Texts.append(new Text( -6, 0,"file"));
Texts.append(new Text( -6, 0,QObject::tr("file")));
int i=0, y = 15-h;
@ -58,7 +58,7 @@ SParamFile::SParamFile(int No)
Model = QString("SPfile")+QString::number(No);
Name = "X";
Props.append(new Property("File", "test.s2p", true, "name of the s parameter file"));
Props.append(new Property("File", "test.s2p", true, QObject::tr("name of the s parameter file")));
}
SParamFile::~SParamFile()

4
qucs/components/subcircuit.cpp
View File

@ -20,7 +20,7 @@
Subcircuit::Subcircuit(int No)
{
Description = "subcircuit";
Description = QObject::tr("subcircuit");
int h = 30*((No-1)/2) + 15;
Lines.append(new Line(-15, -h, 15, -h,QPen(QPen::darkBlue,2)));
@ -54,7 +54,7 @@ Subcircuit::Subcircuit(int No)
Model = QString("Sub")+QString::number(No);
Name = "SUB";
Props.append(new Property("File", "test.sch", true, "name of qucs schematic file"));
Props.append(new Property("File", "test.sch", true, QObject::tr("name of qucs schematic file")));
}
Subcircuit::~Subcircuit()

4
qucs/components/subcirport.cpp
View File

@ -20,7 +20,7 @@
SubCirPort::SubCirPort()
{
Description = "port of a subcircuit";
Description = QObject::tr("port of a subcircuit");
Arcs.append(new Arc(-25, -6, 13, 13, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-14, 0, 0, 0,QPen(QPen::darkBlue,2)));
@ -36,7 +36,7 @@ SubCirPort::SubCirPort()
Model = "";
Name = "P";
Props.append(new Property("Num", "1", true));
Props.append(new Property("Num", "1", true, QObject::tr("number of the port within the subcircuit")));
}
SubCirPort::~SubCirPort()

10
qucs/components/substrate.cpp
View File

@ -20,7 +20,7 @@
Substrate::Substrate()
{
Description = "substrate definition";
Description = QObject::tr("substrate definition");
Lines.append(new Line(-30,-16, 30,-16,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-12, 30,-12,QPen(QPen::darkBlue,2)));
@ -56,10 +56,10 @@ Substrate::Substrate()
Model = "SUBST";
Name = "Subst";
Props.append(new Property("er", "9.8", true, "permittivity"));
Props.append(new Property("h", "1 mm", true, "thickness in meters"));
Props.append(new Property("t", "35 um", true, "thickness of metalization"));
Props.append(new Property("tand", "0", true, "loss tangent"));
Props.append(new Property("er", "9.8", true, QObject::tr("permittivity")));
Props.append(new Property("h", "1 mm", true, QObject::tr("thickness in meters")));
Props.append(new Property("t", "35 um", true, QObject::tr("thickness of metalization")));
Props.append(new Property("tand", "0", true, QObject::tr("loss tangent")));
}
Substrate::~Substrate()

10
qucs/components/symtrafo.cpp
View File

@ -20,7 +20,7 @@
symTrafo::symTrafo()
{
Description = "ideal symmetrical transformer";
Description = QObject::tr("ideal symmetrical transformer");
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)));
@ -48,11 +48,11 @@ symTrafo::symTrafo()
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
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)));
Ports.append(new Port(-30,-70));
Ports.append(new Port( 30,-30));
Ports.append(new Port( 30, 30));
@ -69,8 +69,8 @@ symTrafo::symTrafo()
Model = "sTr";
Name = "Tr";
Props.append(new Property("T1", "1", true, "voltage transformation ration of coil 1"));
Props.append(new Property("T2", "1", true, "voltage transformation ration of coil 2"));
Props.append(new Property("T1", "1", true, QObject::tr("voltage transformation ration of coil 1")));
Props.append(new Property("T2", "1", true, QObject::tr("voltage transformation ration of coil 2")));
}
symTrafo::~symTrafo()

6
qucs/components/tline.cpp
View File

@ -20,7 +20,7 @@
TLine::TLine()
{
Description = "ideal transmission line";
Description = QObject::tr("ideal transmission line");
Arcs.append(new Arc(-20, -9, 9, 19, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 11, -9, 9, 19,16*270, 16*180,QPen(QPen::darkBlue,2)));
@ -42,8 +42,8 @@ TLine::TLine()
Model = "TLIN";
Name = "Line";
Props.append(new Property("Z", "50 Ohm", true, "characteristic impedance"));
Props.append(new Property("L", "1 mm", true, "electrical length of the line"));
Props.append(new Property("Z", "50 Ohm", true, QObject::tr("characteristic impedance")));
Props.append(new Property("L", "1 mm", true, QObject::tr("electrical length of the line")));
}
TLine::~TLine()

8
qucs/components/tr_sim.cpp
View File

@ -20,7 +20,7 @@
TR_Sim::TR_Sim()
{
Description = "transient simulation";
Description = QObject::tr("transient simulation");
Lines.append(new Line(-45,-21, 45,-21,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-45, 21, 45, 21,QPen(QPen::darkBlue,2)));
@ -42,9 +42,9 @@ TR_Sim::TR_Sim()
Model = ".TR";
Name = "TR";
Props.append(new Property("Start", "0", true, "start time in seconds"));
Props.append(new Property("Stop", "1 ms", true, "stop time in seconds"));
Props.append(new Property("Step", "10 us", true, "time step in seconds"));
Props.append(new Property("Start", "0", true, QObject::tr("start time in seconds")));
Props.append(new Property("Stop", "1 ms", true, QObject::tr("stop time in seconds")));
Props.append(new Property("Step", "10 us", true, QObject::tr("time step in seconds")));
}
TR_Sim::~TR_Sim()

6
qucs/components/transformer.cpp
View File

@ -20,7 +20,7 @@
Transformer::Transformer()
{
Description = "ideal transformer";
Description = QObject::tr("ideal transformer");
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)));
@ -42,7 +42,7 @@ Transformer::Transformer()
Texts.append(new Text(-21, -8,"T"));
Arcs.append(new Arc(-21,-24, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 15,-24, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30,-30));
Ports.append(new Port( 30,-30));
@ -58,7 +58,7 @@ Transformer::Transformer()
Model = "Tr";
Name = "Tr";
Props.append(new Property("T", "1", true, "voltage transformation ration"));
Props.append(new Property("T", "1", true, QObject::tr("voltage transformation ration")));
}
Transformer::~Transformer()

6
qucs/components/vccs.cpp
View File

@ -20,7 +20,7 @@
VCCS::VCCS()
{
Description = "voltage controlled current source";
Description = QObject::tr("voltage controlled current source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 11, -7, 11, 7,QPen(QPen::darkBlue,3)));
@ -60,8 +60,8 @@ VCCS::VCCS()
Model = "VCCS";
Name = "SRC";
Props.append(new Property("G", "1 S", true, "forward transconductance"));
Props.append(new Property("T", "0", true, "delay time"));
Props.append(new Property("G", "1 S", true, QObject::tr("forward transconductance")));
Props.append(new Property("T", "0", true, QObject::tr("delay time")));
}
VCCS::~VCCS()

6
qucs/components/vcvs.cpp
View File

@ -20,7 +20,7 @@
VCVS::VCVS()
{
Description = "voltage controlled voltage source";
Description = QObject::tr("voltage controlled voltage source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
@ -61,8 +61,8 @@ VCVS::VCVS()
Model = "VCVS";
Name = "SRC";
Props.append(new Property("G", "1", true, "forward transfer factor"));
Props.append(new Property("T", "0", true, "delay time"));
Props.append(new Property("G", "1", true, QObject::tr("forward transfer factor")));
Props.append(new Property("T", "0", true, QObject::tr("delay time")));
}
VCVS::~VCVS()

6
qucs/components/volt_ac.cpp
View File

@ -20,7 +20,7 @@
Volt_ac::Volt_ac()
{
Description = "ideal ac voltage source";
Description = QObject::tr("ideal ac voltage source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -3, -7, 8, 8,16*270, 16*180,QPen(QPen::darkBlue,1)));
@ -43,8 +43,8 @@ Volt_ac::Volt_ac()
Model = "Vac";
Name = "V";
Props.append(new Property("U", "1 V", true, "rms voltage in Volts"));
Props.append(new Property("f", "1 GHz", true, "frequency in Hertz"));
Props.append(new Property("U", "1 V", true, QObject::tr("rms voltage in Volts")));
Props.append(new Property("f", "1 GHz", true, QObject::tr("frequency in Hertz")));
}
Volt_ac::~Volt_ac()

4
qucs/components/volt_dc.cpp
View File

@ -20,7 +20,7 @@
Volt_dc::Volt_dc()
{
Description = "ideal dc voltage source";
Description = QObject::tr("ideal dc voltage source");
Lines.append(new Line( 4,-13, 4, 13,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -4, -6, -4, 6,QPen(QPen::darkBlue,4)));
@ -42,7 +42,7 @@ Volt_dc::Volt_dc()
Model = "Vdc";
Name = "V";
Props.append(new Property("U", "1 V", true, "voltage in Volts"));
Props.append(new Property("U", "1 V", true, QObject::tr("voltage in Volts")));
}
Volt_dc::~Volt_dc()

56
qucs/components/volt_noise.cpp Normal file
View File

@ -0,0 +1,56 @@
/***************************************************************************
volt_noise.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 "volt_noise.h"
Volt_noise::Volt_noise()
{
Description = QObject::tr("noise voltage source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 0, 0,-12,QPen(QPen::darkBlue,2)));
Ports.append(new Port( 30, 0));
Ports.append(new Port(-30, 0));
x1 = -30; y1 = -14;
x2 = 30; y2 = 14;
tx = x1+4;
ty = y2+4;
Sign = "Vnoise";
Model = "Vnoise";
Name = "V";
Props.append(new Property("u", "1e-6", true, QObject::tr("equivalent voltage density in V/sqrt(Hz)")));
Props.append(new Property("e", "0", true, QObject::tr("frequency exponent")));
Props.append(new Property("c", "1", true, QObject::tr("frequency coefficient")));
Props.append(new Property("a", "0", true, QObject::tr("additive frequency term")));
}
Volt_noise::~Volt_noise()
{
}
Volt_noise* Volt_noise::newOne()
{
return new Volt_noise();
}

31
qucs/components/volt_noise.h Normal file
View File

@ -0,0 +1,31 @@
/***************************************************************************
volt_noise.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 VOLT_NOISE_H
#define VOLT_NOISE_H
#include "component.h"
class Volt_noise : public Component {
public:
Volt_noise();
~Volt_noise();
Volt_noise* newOne();
};
#endif

4
qucs/diagrams/diagram.cpp
View File

@ -201,7 +201,7 @@ bool Diagram::loadVarData(const QString& fileName)
QFile file(fileName);
if(!file.open(IO_ReadOnly)) {
QMessageBox::critical(0, "Error", "Cannot load dataset: "+fileName);
QMessageBox::critical(0, QObject::tr("Error"), QObject::tr("Cannot load dataset: ")+fileName);
return false;
}
@ -275,7 +275,7 @@ int Diagram::loadIndepVarData(const QString& var, const QString& fileName)
{
QFile file(fileName);
if(!file.open(IO_ReadOnly)) {
QMessageBox::critical(0, "Error", "Cannot load dataset: "+fileName);
QMessageBox::critical(0, QObject::tr("Error"), QObject::tr("Cannot load dataset: ")+fileName);
return 0;
}

50
qucs/diagrams/diagramdialog.cpp
View File

@ -41,7 +41,7 @@ DiagramDialog::DiagramDialog(Diagram *d, const QString& _DataSet, QWidget *paren
{
Diag = d;
defaultDataSet = _DataSet;
setCaption("Edit Diagram Properties");
setCaption(tr("Edit Diagram Properties"));
changed = false;
toTake = false; // should double-clicked variable be inserted immediately into the graph list ?
// setFixedSize(QSize(400, 400));
@ -55,15 +55,15 @@ DiagramDialog::DiagramDialog(Diagram *d, const QString& _DataSet, QWidget *paren
QVBox *Tab1 = new QVBox(this);
Tab1->setSpacing(5);
QVButtonGroup *InputGroup = new QVButtonGroup("Graph Input", Tab1);
QVButtonGroup *InputGroup = new QVButtonGroup(tr("Graph Input"), Tab1);
GraphInput = new QLineEdit(InputGroup);
connect(GraphInput, SIGNAL(textChanged(const QString&)), SLOT(slotResetToTake(const QString&)));
QHBox *Box2 = new QHBox(InputGroup);
Box2->setSpacing(5);
QLabel *l3 = new QLabel("Color:",Box2);
QLabel *l3 = new QLabel(tr("Color:"),Box2);
ColorButt = new QPushButton(" ",Box2);
connect(ColorButt, SIGNAL(clicked()), SLOT(slotSetColor()));
QLabel *l4 = new QLabel(" Thickness:",Box2);
QLabel *l4 = new QLabel(tr(" Thickness:"),Box2);
Expr.setPattern("[0-9]{1}"); // valid expression for property input
QValidator *Validator = new QRegExpValidator(Expr, this);
GraphThick = new QLineEdit(Box2);
@ -75,48 +75,48 @@ DiagramDialog::DiagramDialog(Diagram *d, const QString& _DataSet, QWidget *paren
QHBox *Box1 = new QHBox(Tab1);
Box1->setSpacing(5);
QVButtonGroup *DataGroup = new QVButtonGroup("Dataset", Box1);
QVButtonGroup *DataGroup = new QVButtonGroup(tr("Dataset"), Box1);
ChooseData = new QComboBox(false, DataGroup);
ChooseData->setMinimumWidth(200);
connect(ChooseData, SIGNAL(activated(int)), SLOT(slotReadVars(int)));
ChooseVars = new QListView(DataGroup);
ChooseVars->addColumn("Name");
ChooseVars->addColumn("Status");
ChooseVars->addColumn("Size");
ChooseVars->addColumn(tr("Name"));
ChooseVars->addColumn(tr("Status"));
ChooseVars->addColumn(tr("Size"));
// QT 3.2
// connect(Content, SIGNAL(doubleClicked(QListViewItem*, const QPoint &,int)),
// SLOT(slotTakeVar(QListViewItem*, const QPoint &,int)));
connect(ChooseVars, SIGNAL(doubleClicked(QListViewItem*)), SLOT(slotTakeVar(QListViewItem*)));
QVButtonGroup *GraphGroup = new QVButtonGroup("Graph", Box1);
QVButtonGroup *GraphGroup = new QVButtonGroup(tr("Graph"), Box1);
GraphList = new QListBox(GraphGroup);
connect(GraphList, SIGNAL(clicked(QListBoxItem*)), SLOT(slotSelectGraph(QListBoxItem*)));
QPushButton *NewButt = new QPushButton("New Graph", GraphGroup);
QPushButton *NewButt = new QPushButton(tr("New Graph"), GraphGroup);
connect(NewButt, SIGNAL(clicked()), SLOT(slotNewGraph()));
QPushButton *DelButt = new QPushButton("Delete Graph", GraphGroup);
QPushButton *DelButt = new QPushButton(tr("Delete Graph"), GraphGroup);
connect(DelButt, SIGNAL(clicked()), SLOT(slotDeleteGraph()));
t->addTab(Tab1, "Data");
t->addTab(Tab1, tr("Data"));
// ...........................................................
QWidget *Tab2 = new QWidget(t);
QGridLayout *gp = new QGridLayout(Tab2,6,2,5,5);
QLabel *l1 = new QLabel("x-Axis Label:", Tab2);
QLabel *l1 = new QLabel(tr("x-Axis Label:"), Tab2);
gp->addWidget(l1,0,0);
xLabel = new QLineEdit(Tab2);
gp->addWidget(xLabel,0,1);
QLabel *l2 = new QLabel("y-Axis Label:", Tab2);
QLabel *l2 = new QLabel(tr("y-Axis Label:"), Tab2);
gp->addWidget(l2,1,0);
yLabel = new QLineEdit(Tab2);
gp->addWidget(yLabel,1,1);
GridOn = new QCheckBox("show Grid", Tab2);
GridOn = new QCheckBox(tr("show Grid"), Tab2);
gp->addMultiCellWidget(GridOn,2,2,0,1);
t->addTab(Tab2, "Properties");
t->addTab(Tab2, tr("Properties"));
// ...........................................................
QHBox *Butts = new QHBox(this);
@ -124,13 +124,13 @@ DiagramDialog::DiagramDialog(Diagram *d, const QString& _DataSet, QWidget *paren
Butts->setMargin(5);
all->addWidget(Butts);
QPushButton *OkButt = new QPushButton("OK", Butts);
QPushButton *OkButt = new QPushButton(tr("OK"), Butts);
connect(OkButt, SIGNAL(clicked()), SLOT(slotOK()));
QPushButton *ApplyButt = new QPushButton("Apply", Butts);
QPushButton *ApplyButt = new QPushButton(tr("Apply"), Butts);
connect(ApplyButt, SIGNAL(clicked()), SLOT(slotApply()));
QPushButton *CancelButt = new QPushButton("Cancel", Butts);
QPushButton *CancelButt = new QPushButton(tr("Cancel"), Butts);
connect(CancelButt, SIGNAL(clicked()), SLOT(reject()));
QPushButton *HelpButt = new QPushButton("Function Help", Butts);
QPushButton *HelpButt = new QPushButton(tr("Function Help"), Butts);
connect(HelpButt, SIGNAL(clicked()), SLOT(slotFuncHelp()));
OkButt->setDefault(true);
@ -178,7 +178,7 @@ DiagramDialog::~DiagramDialog()
void DiagramDialog::slotReadVars(int)
{
QString DocName = ChooseData->currentText()+".dat";
QFile file(DocName);
if(!file.open(IO_ReadOnly)) {
return;
@ -199,7 +199,7 @@ void DiagramDialog::slotReadVars(int)
new QListViewItem(ChooseVars, Line.section(' ', 1, 1), "indep", tmp.remove('>'));
}
}
file.close();
}
@ -210,7 +210,7 @@ void DiagramDialog::slotTakeVar(QListViewItem *Item)
{
GraphInput->blockSignals(true);
if(toTake) GraphInput->setText("");
int i = GraphInput->cursorPosition();
QString s = GraphInput->text();
GraphInput->setText(s.left(i)+Item->text(0)+s.right(s.length()-i));
@ -228,7 +228,7 @@ void DiagramDialog::slotTakeVar(QListViewItem *Item)
changed = true;
toTake = true;
}
GraphInput->blockSignals(false);
}
@ -245,7 +245,7 @@ void DiagramDialog::slotSelectGraph(QListBoxItem *item)
GraphInput->blockSignals(true);
GraphInput->setText(GraphList->text(index));
GraphInput->blockSignals(false);
Graph *g = Diag->Graphs.at(index);
GraphThick->setText(QString::number(g->Thick));
ColorButt->setPaletteBackgroundColor(g->Color);

4
qucs/diagrams/rectdiagram.cpp
View File

@ -33,8 +33,8 @@ RectDiagram::RectDiagram(int _cx, int _cy) : Diagram(_cx, _cy)
Name = "Rect";
xLabel = "x-Achse";
yLabel = "y-Achse";
xLabel = "";
yLabel = "";
calcDiagram();
}

12
qucs/newprojdialog.cpp
View File

@ -26,22 +26,22 @@
NewProjDialog::NewProjDialog(QWidget *parent, const char *name)
: QDialog(parent, name, true)
{
setCaption("Create new project");
setCaption(tr("Create new project"));
QGridLayout *gbox = new QGridLayout(this,3,3,5,5);
QLabel *Label1 = new QLabel("Project name:",this);
QLabel *Label1 = new QLabel(tr("Project name:"),this);
gbox->addWidget(Label1,0,0);
ProjName = new QLineEdit(this);
ProjName->setMinimumWidth(250);
gbox->addMultiCellWidget(ProjName,0,0,1,2);
OpenProj = new QCheckBox("open new project",this);
OpenProj = new QCheckBox(tr("open new project"),this);
OpenProj->setChecked(true);
gbox->addMultiCellWidget(OpenProj,1,1,1,2);
ButtonOk = new QPushButton("Create",this);
ButtonOk = new QPushButton(tr("Create"),this);
gbox->addWidget(ButtonOk,2,1);
ButtonCancel = new QPushButton("Cancel",this);
ButtonCancel = new QPushButton(tr("Cancel"),this);
gbox->addWidget(ButtonCancel,2,2);
connect(ButtonOk, SIGNAL(clicked()), SLOT(accept()));

26
qucs/paintings/arrowdialog.cpp
View File

@ -27,7 +27,7 @@
ArrowDialog::ArrowDialog(QWidget *parent, const char *name)
: QDialog(parent, name, Qt::WDestructiveClose)
{
setCaption("Edit Arrow Properties");
setCaption(tr("Edit Arrow Properties"));
Expr.setPattern("[0-9]{1,2}"); // valid expression for property input
QValidator *Validator = new QRegExpValidator(Expr, this);
@ -39,13 +39,13 @@ ArrowDialog::ArrowDialog(QWidget *parent, const char *name)
h0->setSpacing(5);
v->addWidget(h0);
new QLabel("Head Length: ", h0);
new QLabel(tr("Head Length: "), h0);
HeadLength = new QLineEdit(h0);
HeadLength->setValidator(Validator);
HeadLength->setMaximumWidth(35);
HeadLength->setText("10");
new QLabel(" Head Width: ", h0);
new QLabel(tr(" Head Width: "), h0);
HeadWidth = new QLineEdit(h0);
HeadWidth->setValidator(Validator);
HeadWidth->setMaximumWidth(35);
@ -56,12 +56,12 @@ ArrowDialog::ArrowDialog(QWidget *parent, const char *name)
h1->setSpacing(5);
v->addWidget(h1);
new QLabel("Line color: ", h1);
new QLabel(tr("Line color: "), h1);
ColorButt = new QPushButton(" ",h1);
ColorButt->setPaletteBackgroundColor(QColor(0,0,0));
connect(ColorButt, SIGNAL(clicked()), SLOT(slotSetColor()));
new QLabel(" Line Width: ", h1);
new QLabel(tr(" Line Width: "), h1);
LineWidth = new QLineEdit(h1);
LineWidth->setValidator(Validator);
LineWidth->setMaximumWidth(35);
@ -72,13 +72,13 @@ ArrowDialog::ArrowDialog(QWidget *parent, const char *name)
h2->setSpacing(5);
v->addWidget(h2);
new QLabel("Line style: ", h2);
new QLabel(tr("Line style: "), h2);
StyleBox = new QComboBox(h2);
StyleBox->insertItem("solid line");
StyleBox->insertItem("dash line");
StyleBox->insertItem("dot line");
StyleBox->insertItem("dash dot line");
StyleBox->insertItem("dash dot dot line");
StyleBox->insertItem(tr("solid line"));
StyleBox->insertItem(tr("dash line"));
StyleBox->insertItem(tr("dot line"));
StyleBox->insertItem(tr("dash dot line"));
StyleBox->insertItem(tr("dash dot dot line"));
connect(StyleBox, SIGNAL(activated(int)), SLOT(slotSetStyle(int)));
LineStyle = Qt::SolidLine;
@ -86,9 +86,9 @@ ArrowDialog::ArrowDialog(QWidget *parent, const char *name)
h3->setSpacing(5);
v->addWidget(h3);
QPushButton *ButtOK = new QPushButton("OK",h3);
QPushButton *ButtOK = new QPushButton(tr("OK"),h3);
connect(ButtOK, SIGNAL(clicked()), SLOT(accept()));
QPushButton *ButtCancel = new QPushButton("Cancel",h3);
QPushButton *ButtCancel = new QPushButton(tr("Cancel"),h3);
connect(ButtCancel, SIGNAL(clicked()), SLOT(reject()));
ButtOK->setFocus();

2
qucs/paintings/ellipse.cpp
View File

@ -226,7 +226,7 @@ bool Ellipse::Dialog()
{
bool changed = false;
LineDialog *d = new LineDialog("Edit Ellipse Properties");
LineDialog *d = new LineDialog(QObject::tr("Edit Ellipse Properties"));
d->ColorButt->setPaletteBackgroundColor(Pen.color());
d->LineWidth->setText(QString::number(Pen.width()));
d->SetComboBox(Pen.style());

2
qucs/paintings/graphicline.cpp
View File

@ -233,7 +233,7 @@ bool GraphicLine::Dialog()
{
bool changed = false;
LineDialog *d = new LineDialog("Edit Line Properties");
LineDialog *d = new LineDialog(QObject::tr("Edit Line Properties"));
d->ColorButt->setPaletteBackgroundColor(Pen.color());
d->LineWidth->setText(QString::number(Pen.width()));
d->SetComboBox(Pen.style());

12
qucs/paintings/graphictextdialog.cpp
View File

@ -27,7 +27,7 @@
GraphicTextDialog::GraphicTextDialog(QWidget *parent, const char *name)
: QDialog(parent, name, Qt::WDestructiveClose)
{
setCaption("Edit Text Properties");
setCaption(tr("Edit Text Properties"));
QVBoxLayout *v = new QVBoxLayout(this);
v->setSpacing(5);
@ -42,12 +42,12 @@ GraphicTextDialog::GraphicTextDialog(QWidget *parent, const char *name)
h1->setSpacing(5);
v->addWidget(h1);
new QLabel("Text color: ", h1);
new QLabel(tr("Text color: "), h1);
ColorButt = new QPushButton(" ",h1);
ColorButt->setPaletteBackgroundColor(QColor(0,0,0));
connect(ColorButt, SIGNAL(clicked()), SLOT(slotSetColor()));
new QLabel(" Text size: ", h1);
new QLabel(tr(" Text size: "), h1);
Expr.setPattern("[0-9]{1,2}"); // valid expression for property input
QValidator *Validator = new QRegExpValidator(Expr, this);
TextSize = new QLineEdit(h1);
@ -60,11 +60,11 @@ GraphicTextDialog::GraphicTextDialog(QWidget *parent, const char *name)
h2->setSpacing(5);
v->addWidget(h2);
QPushButton *ButtOK = new QPushButton("OK",h2);
QPushButton *ButtOK = new QPushButton(tr("OK"),h2);
connect(ButtOK, SIGNAL(clicked()), SLOT(accept()));
QPushButton *ButtCancel = new QPushButton("Cancel",h2);
QPushButton *ButtCancel = new QPushButton(tr("Cancel"),h2);
connect(ButtCancel, SIGNAL(clicked()), SLOT(reject()));
text->setFocus();
}

20
qucs/paintings/linedialog.cpp
View File

@ -37,12 +37,12 @@ LineDialog::LineDialog(const QString& _Caption, QWidget *parent, const char *nam
h1->setSpacing(5);
v->addWidget(h1);
new QLabel("Line color: ", h1);
new QLabel(tr("Line color: "), h1);
ColorButt = new QPushButton(" ",h1);
ColorButt->setPaletteBackgroundColor(QColor(0,0,0));
connect(ColorButt, SIGNAL(clicked()), SLOT(slotSetColor()));
new QLabel(" Line Width: ", h1);
new QLabel(tr(" Line Width: "), h1);
Expr.setPattern("[0-9]{1,2}"); // valid expression for property input
QValidator *Validator = new QRegExpValidator(Expr, this);
LineWidth = new QLineEdit(h1);
@ -55,13 +55,13 @@ LineDialog::LineDialog(const QString& _Caption, QWidget *parent, const char *nam
h2->setSpacing(5);
v->addWidget(h2);
new QLabel("Line Style: ", h2);
new QLabel(tr("Line Style: "), h2);
StyleBox = new QComboBox(h2);
StyleBox->insertItem("solid line");
StyleBox->insertItem("dash line");
StyleBox->insertItem("dot line");
StyleBox->insertItem("dash dot line");
StyleBox->insertItem("dash dot dot line");
StyleBox->insertItem(tr("solid line"));
StyleBox->insertItem(tr("dash line"));
StyleBox->insertItem(tr("dot line"));
StyleBox->insertItem(tr("dash dot line"));
StyleBox->insertItem(tr("dash dot dot line"));
connect(StyleBox, SIGNAL(activated(int)), SLOT(slotSetStyle(int)));
LineStyle = Qt::SolidLine;
@ -69,9 +69,9 @@ LineDialog::LineDialog(const QString& _Caption, QWidget *parent, const char *nam
h3->setSpacing(5);
v->addWidget(h3);
QPushButton *ButtOK = new QPushButton("OK",h3);
QPushButton *ButtOK = new QPushButton(tr("OK"),h3);
connect(ButtOK, SIGNAL(clicked()), SLOT(accept()));
QPushButton *ButtCancel = new QPushButton("Cancel",h3);
QPushButton *ButtCancel = new QPushButton(tr("Cancel"),h3);
connect(ButtCancel, SIGNAL(clicked()), SLOT(reject()));
ButtOK->setFocus();

2
qucs/paintings/rectangle.cpp
View File

@ -221,7 +221,7 @@ bool Rectangle::Dialog()
{
bool changed = false;
LineDialog *d = new LineDialog("Edit Rectangle Properties");
LineDialog *d = new LineDialog(QObject::tr("Edit Rectangle Properties"));
d->ColorButt->setPaletteBackgroundColor(Pen.color());
d->LineWidth->setText(QString::number(Pen.width()));
d->SetComboBox(Pen.style());

17
qucs/qucs.cpp
View File

@ -1484,12 +1484,15 @@ void QucsApp::slotSetCompView(int index)
new QIconViewItem(CompComps, tr("Circulator"), QImage(BITMAPDIR "circulator.xpm"));
new QIconViewItem(CompComps, tr("Gyrator"), QImage(BITMAPDIR "gyrator.xpm"));
new QIconViewItem(CompComps, tr("Phase Shifter"), QImage(BITMAPDIR "pshifter.xpm"));
new QIconViewItem(CompComps, tr("Current Probe"), QImage(BITMAPDIR "iprobe.xpm"));
break;
case COMBO_Sources:
new QIconViewItem(CompComps, tr("dc Voltage Source"), QImage(BITMAPDIR "dc_voltage.xpm"));
new QIconViewItem(CompComps, tr("dc Current Source"), QImage(BITMAPDIR "dc_current.xpm"));
new QIconViewItem(CompComps, tr("ac Voltage Source"), QImage(BITMAPDIR "ac_voltage.xpm"));
new QIconViewItem(CompComps, tr("Power Source"), QImage(BITMAPDIR "source.xpm"));
new QIconViewItem(CompComps, tr("Noise Voltage Source"), QImage(BITMAPDIR "noise_volt.xpm"));
new QIconViewItem(CompComps, tr("Noise Current Source"), QImage(BITMAPDIR "noise_current.xpm"));
new QIconViewItem(CompComps, tr("Voltage Controlled Current Source"), QImage(BITMAPDIR "vccs.xpm"));
new QIconViewItem(CompComps, tr("Current Controlled Current Source"), QImage(BITMAPDIR "cccs.xpm"));
new QIconViewItem(CompComps, tr("Voltage Controlled Voltage Source"), QImage(BITMAPDIR "vcvs.xpm"));
@ -1603,6 +1606,8 @@ void QucsApp::slotSelectComponent(QIconViewItem *item)
break;
case 15: view->selComp = new Phaseshifter();
break;
// case 16: view->selComp = new iProbe();
// break;
}
break;
case COMBO_Sources:
@ -1615,13 +1620,17 @@ void QucsApp::slotSelectComponent(QIconViewItem *item)
break;
case 3: view->selComp = new Source_ac();
break;
case 4: view->selComp = new VCCS();
// case 4: view->selComp = new Volt_noise();
// break;
// case 5: view->selComp = new Ampere_noise();
// break;
case 6: view->selComp = new VCCS();
break;
case 5: view->selComp = new CCCS();
case 7: view->selComp = new CCCS();
break;
case 6: view->selComp = new VCVS();
case 8: view->selComp = new VCVS();
break;
case 7: view->selComp = new CCVS();
case 9: view->selComp = new CCVS();
break;
}
break;

6
qucs/qucsdoc.cpp
View File

@ -182,7 +182,7 @@ void QucsDoc::setOnGrid(int& x, int& y)
void QucsDoc::paintGrid(QPainter *p, int cX, int cY, int Width, int Height)
{
if(!GridOn) return;
int x1 = int(cX/Scale)+ViewX1;
if(x1<0) x1 -= GridX - 1;
else x1 += GridX;
@ -1921,6 +1921,7 @@ bool QucsDoc::loadComponents(QTextStream *stream, bool insert)
else if(cstr == "<C") c = new Capacitor();
else if(cstr == "<L") c = new Inductor();
else if(cstr == "<GND") c = new Ground();
// else if(cstr == "<IProbe") c = new iProbe();
else if(cstr == "<Tr") c = new Transformer();
else if(cstr == "<sTr") c = new symTrafo();
else if(cstr == "<Vdc") c = new Volt_dc();
@ -1931,6 +1932,8 @@ bool QucsDoc::loadComponents(QTextStream *stream, bool insert)
else if(cstr == "<CCCS") c = new CCCS();
else if(cstr == "<VCVS") c = new VCVS();
else if(cstr == "<CCVS") c = new CCVS();
// else if(cstr == "<Vnoise") c = new Volt_noise();
// else if(cstr == "<Inoise") c = new Ampere_noise();
else if(cstr == "<Port") c = new SubCirPort();
else if(cstr.left(7) == "<SPfile") { c = new SParamFile(cstr.mid(7).toInt()); }
else if(cstr.left(4) == "<Sub") { c = new Subcircuit(cstr.mid(4).toInt()); }
@ -1950,6 +1953,7 @@ bool QucsDoc::loadComponents(QTextStream *stream, bool insert)
else if(cstr == "<MTEE") c = new MStee();
else if(cstr == "<MCROSS") c = new MScross();
else if(cstr == "<Diode") c = new Diode();
else if(cstr == "<Eqn") c = new Equation();
else if(cstr == "<.DC") c = new DC_Sim();
else if(cstr == "<.AC") c = new AC_Sim();
else if(cstr == "<.TR") c = new TR_Sim();

5
qucs/qucsview.cpp
View File

@ -458,7 +458,10 @@ void QucsView::MPressLabel(QMouseEvent *Event)
Name = QInputDialog::getText(tr("Insert Nodename"), tr("Enter the label:"), QLineEdit::Normal,
Name, &OK, this);
if(OK && !Name.isEmpty()) {
if(Name.at(0) == '_') Name.remove(0,1); // label must not start with '_'
Name.replace(' ', '_'); // label must not contain spaces
while(Name.at(0) == '_') Name.remove(0,1); // label must not start with '_'
if(Name.isEmpty()) return;
if(pw2 != 0) pw2->Name = ""; // delete old name
pw->Name = Name;
pw->delta = x-pw->x1 + y-pw->y1;

2
qucs/settingsdialog.cpp
View File

@ -52,7 +52,7 @@ SettingsDialog::SettingsDialog(QucsDoc *d, QWidget *parent, const char *name)
Check_OpenDpl = new QCheckBox(tr("open data display after simulation"),Tab1);
gp->addMultiCellWidget(Check_OpenDpl,2,2,0,1);
t->addTab(Tab1, tr("Simulation"));
// ...........................................................

6
qucs/simmessage.cpp
View File

@ -28,7 +28,7 @@
SimMessage::SimMessage(QWidget *parent) : QDialog(parent)
{
setCaption(tr("Qucs Simulation Messages"));
QVBoxLayout *all = new QVBoxLayout(this);
all->setSpacing(5);
QVGroupBox *Group1 = new QVGroupBox(tr("Progress:"),this);
@ -40,7 +40,7 @@ SimMessage::SimMessage(QWidget *parent) : QDialog(parent)
ProgText->setWordWrap(QTextEdit::NoWrap);
ProgText->setMinimumSize(400,80);
QVGroupBox *Group2 = new QVGroupBox(tr("Errors and Warnings:"),this);
all->addWidget(Group2);
@ -81,7 +81,7 @@ bool SimMessage::startProcess(const QStringList& commands)
SimProcess.setArguments(commands);
if(!SimProcess.start()) return false;
return true;
}