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 
git-svn-id: https://qucs.svn.sourceforge.net/svnroot/qucs/trunk@811 b5b04e8c-4942-46c9-ab4f-83783d557d1c
This commit is contained in:
margraf 2006-02-27 07:10:34 +00:00
parent 0c881b0316
commit 3159b4bf48
48 changed files with 1705 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -28,7 +28,7 @@ Version 0.0.9
* number of ports of S-parameter component not anymore limited
* language can be chosen in application settings dialog
* new component: coaxial line
* new component: coaxial line, voltage probe
* fixed bug in Cauer band-stop filter
Version 0.0.8

7
qucs/ChangeLog
View File

@ -1,3 +1,10 @@
2006-02-25 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* new components: switch, relais, AM- and PM-modulator
* correct path for files loaded via command line
* catch wrong characters for components names on schematic
* sources all have initial rotation angle as in icon
2006-02-18 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* load resistors with backward compatibility

4
qucs/bitmaps/Makefile.am
View File

@ -31,7 +31,7 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \
attenuator.png biast.png circulator.png dcblock.png dcfeed.png diode.png \
isolator.png mscorner.png mscross.png msstep.png mstee.png substrate.png \
subport.png spfile1.png spfile2.png spfile3.png coplanar.png ellipse.png \
mscoupled.png gyrator.png cpwgap.png \
mscoupled.png gyrator.png cpwgap.png vprobe.png switch.png relais.png \
pshifter.png iprobe.png noise_current.png noise_volt.png msmbend.png \
msopen.png filledellipse.png filledrect.png ac_current.png npn.png pnp.png \
nfet.png pfet.png nmosfet.png pmosfet.png dmosfet.png msgap.png npnsub.png \
@ -41,7 +41,7 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \
cpwopen.png cpwstep.png mutual.png mutual2.png noise_ii.png noise_vv.png \
noise_iv.png or.png nor.png and.png nand.png xor.png xnor.png digi.png \
inverter.png digi_source.png timing.png truth.png rsflipflop.png \
dflipflop.png jkflipflop.png coupler.png coaxial.png vprobe.png
dflipflop.png jkflipflop.png coupler.png coaxial.png am_mod.png pm_mod.png
# toolbar pictures
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \

BIN
qucs/bitmaps/am_mod.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

BIN
qucs/bitmaps/dc_voltage.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 263 B

BIN
qucs/bitmaps/pm_mod.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

BIN
qucs/bitmaps/relais.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 269 B

BIN
qucs/bitmaps/switch.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

6
qucs/components/Makefile.am
View File

@ -43,7 +43,8 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
mutual2.cpp noise_ii.cpp noise_iv.cpp noise_vv.cpp logical_or.cpp \
logical_nor.cpp logical_and.cpp logical_nand.cpp logical_xor.cpp \
logical_xnor.cpp logical_inv.cpp digi_sim.cpp digi_source.cpp coupler.cpp \
rs_flipflop.cpp d_flipflop.cpp jk_flipflop.cpp coaxialline.cpp vprobe.cpp
rs_flipflop.cpp d_flipflop.cpp jk_flipflop.cpp coaxialline.cpp vprobe.cpp \
switch.cpp relais.cpp am_modulator.cpp pm_modulator.cpp
nodist_libcomponents_a_SOURCES = $(MOCFILES)
@ -60,7 +61,8 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
cpwgap.h cpwstep.h libcomp.h mutual.h mutual2.h noise_ii.h noise_iv.h \
noise_vv.h logical_or.h logical_nor.h logical_and.h logical_nand.h \
logical_xor.h logical_xnor.h logical_inv.h digi_sim.h digi_source.h \
coupler.h rs_flipflop.h d_flipflop.h jk_flipflop.h coaxialline.h vprobe.h
coupler.h rs_flipflop.h d_flipflop.h jk_flipflop.h coaxialline.h vprobe.h \
switch.h relais.h am_modulator.h pm_modulator.h
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs

77
qucs/components/am_modulator.cpp Normal file
View File

@ -0,0 +1,77 @@
/***************************************************************************
am_modulator.cpp
------------------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "am_modulator.h"
AM_Modulator::AM_Modulator()
{
Description = QObject::tr("ac voltage source with amplitude modulator");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -7, -4, 8, 8, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 0, -4, 8, 8,16*180, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 30, 0, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0,-30, 0,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 5,-18, 11,-18,QPen(QPen::red,1)));
Lines.append(new Line( 8,-21, 8,-15,QPen(QPen::red,1)));
Lines.append(new Line( 5, 18, 11, 18,QPen(QPen::black,1)));
Lines.append(new Line(-12, 0,-30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 0,-17, 5,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 0,-17, -5,QPen(QPen::darkBlue,2)));
Texts.append(new Text(-30,-18, QObject::tr("AM"), Qt::black, 10.0,1.0,0.0));
Ports.append(new Port( 0,-30));
Ports.append(new Port( 0, 30));
Ports.append(new Port(-30, 0));
x1 = -30; y1 = -30;
x2 = 14; y2 = 30;
tx = x2+4;
ty = y1+4;
Model = "AM_Mod";
Name = "V";
Props.append(new Property("U", "1 V", true,
QObject::tr("peak voltage in Volts")));
Props.append(new Property("f", "1 GHz", false,
QObject::tr("frequency in Hertz")));
Props.append(new Property("Phase", "0", false,
QObject::tr("initial phase in degrees")));
Props.append(new Property("m", "1.0", false,
QObject::tr("modulation level")));
}
AM_Modulator::~AM_Modulator()
{
}
Component* AM_Modulator::newOne()
{
return new AM_Modulator();
}
Element* AM_Modulator::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("AM modulated Source");
BitmapFile = "am_mod";
if(getNewOne) return new AM_Modulator();
return 0;
}

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

@ -0,0 +1,32 @@
/***************************************************************************
am_modulator.h
----------------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef AM_MODULATOR_H
#define AM_MODULATOR_H
#include "component.h"
class AM_Modulator : public Component {
public:
AM_Modulator();
~AM_Modulator();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

8
qucs/components/ampere_ac.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
ampere_ac.cpp - description
-------------------
ampere_ac.cpp
---------------
begin : Sun May 23 2004
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -48,6 +48,10 @@ Ampere_ac::Ampere_ac()
QObject::tr("frequency in Hertz")));
Props.append(new Property("Phase", "0", false,
QObject::tr("initial phase in degrees")));
Props.append(new Property("Theta", "0", false,
QObject::tr("damping factor (transient simulation only)")));
rotate(); // fix historical flaw
}
Ampere_ac::~Ampere_ac()

6
qucs/components/ampere_dc.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
ampere_dc.cpp - description
-------------------
ampere_dc.cpp
---------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -42,6 +42,8 @@ Ampere_dc::Ampere_dc()
Props.append(new Property("I", "1 mA", true,
QObject::tr("current in Ampere")));
rotate(); // fix historical flaw
}
Ampere_dc::~Ampere_dc()

6
qucs/components/ampere_noise.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
ampere_noise.cpp - description
-------------------
ampere_noise.cpp
------------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -55,6 +55,8 @@ Ampere_noise::Ampere_noise()
QObject::tr("frequency coefficient")));
Props.append(new Property("a", "0", false,
QObject::tr("additive frequency term")));
rotate(); // fix historical flaw
}
Ampere_noise::~Ampere_noise()

14
qucs/components/component.cpp
View File

@ -686,7 +686,9 @@ bool Component::load(const QString& _s)
n = s.section(' ',8,8); // rotated
tmp = n.toInt(&ok);
if(!ok) return false;
for(int z=0; z<tmp; z++) rotate();
if(rotated > tmp) // neccessary because of historical flaw in ...
tmp += 4; // ... components like "volt_dc"
for(int z=rotated; z<tmp; z++) rotate();
}
@ -1209,6 +1211,7 @@ Component* getComponentFromName(QString& Line)
case 'R' : if(cstr.isEmpty()) c = new Resistor();
else if(cstr == "us") c = new Resistor(false); // backward capatible
else if(cstr == "SFF") c = new RS_FlipFlop();
else if(cstr == "elais") c = new Relais();
break;
case 'C' : if(cstr.isEmpty()) c = new Capacitor();
else if(cstr == "CCS") c = new CCCS();
@ -1260,6 +1263,7 @@ Component* getComponentFromName(QString& Line)
case 'P' : if(cstr == "ac") c = new Source_ac();
else if(cstr == "ort") c = new SubCirPort();
else if(cstr == "Shift") c = new Phaseshifter();
else if(cstr == "M_Mod") c = new PM_Modulator();
break;
case 'S' : if(cstr == "Pfile") c = new SParamFile();
else if(cstr.left(5) == "Pfile") { // backward compatible
@ -1268,6 +1272,7 @@ Component* getComponentFromName(QString& Line)
else if(cstr == "ub") c = new Subcircuit();
else if(cstr == "UBST") c = new Substrate();
else if(cstr == "PICE") c = new SpiceFile();
else if(cstr == "witch") c = new Switch();
break;
case 'D' : if(cstr == "CBlock") c = new dcBlock();
else if(cstr == "CFeed") c = new dcFeed();
@ -1276,11 +1281,12 @@ Component* getComponentFromName(QString& Line)
else if(cstr == "FF") c = new D_FlipFlop();
break;
case 'B' : if(cstr == "iasT") c = new BiasT();
else if(cstr == "JT") c = new BJTsub();
break;
else if(cstr == "JT") c = new BJTsub();
break;
case 'A' : if(cstr == "ttenuator") c = new Attenuator();
else if(cstr == "mp") c = new Amplifier();
else if(cstr == "mp") c = new Amplifier();
else if(cstr == "ND") c = new Logical_AND();
else if(cstr == "M_Mod") c = new AM_Modulator();
break;
case 'M' : if(cstr == "UT") c = new Mutual();
else if(cstr == "UT2") c = new Mutual2();

4
qucs/components/components.h
View File

@ -97,6 +97,10 @@
#include "mutual.h"
#include "mutual2.h"
#include "coupler.h"
#include "switch.h"
#include "relais.h"
#include "am_modulator.h"
#include "pm_modulator.h"
#include "logical_or.h"
#include "logical_nor.h"
#include "logical_and.h"

6
qucs/components/ipulse.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
ipulse.cpp - description
-------------------
ipulse.cpp
------------
begin : Sat Sep 18 2004
copyright : (C) 2004 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -59,6 +59,8 @@ iPulse::iPulse()
QObject::tr("rise time of the leading edge")));
Props.append(new Property("Tf", "1 ns", false,
QObject::tr("fall time of the trailing edge")));
rotate(); // fix historical flaw
}
iPulse::~iPulse()

6
qucs/components/irect.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
irect.cpp - description
-------------------
irect.cpp
-----------
begin : Sat Sep 18 2004
copyright : (C) 2004 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -55,6 +55,8 @@ iRect::iRect()
QObject::tr("duration of high pulses")));
Props.append(new Property("TL", "1 ms", true,
QObject::tr("duration of low pulses")));
rotate(); // fix historical flaw
}
iRect::~iRect()

77
qucs/components/pm_modulator.cpp Normal file
View File

@ -0,0 +1,77 @@
/***************************************************************************
pm_modulator.cpp
------------------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "pm_modulator.h"
PM_Modulator::PM_Modulator()
{
Description = QObject::tr("ac voltage source with phase modulator");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -7, -4, 8, 8, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 0, -4, 8, 8,16*180, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 30, 0, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0,-30, 0,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 5,-18, 11,-18,QPen(QPen::red,1)));
Lines.append(new Line( 8,-21, 8,-15,QPen(QPen::red,1)));
Lines.append(new Line( 5, 18, 11, 18,QPen(QPen::black,1)));
Lines.append(new Line(-12, 0,-30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 0,-17, 5,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 0,-17, -5,QPen(QPen::darkBlue,2)));
Texts.append(new Text(-30,-18, QObject::tr("PM"), Qt::black, 10.0,1.0,0.0));
Ports.append(new Port( 0,-30));
Ports.append(new Port( 0, 30));
Ports.append(new Port(-30, 0));
x1 = -30; y1 = -30;
x2 = 14; y2 = 30;
tx = x2+4;
ty = y1+4;
Model = "PM_Mod";
Name = "V";
Props.append(new Property("U", "1 V", true,
QObject::tr("peak voltage in Volts")));
Props.append(new Property("f", "1 GHz", false,
QObject::tr("frequency in Hertz")));
Props.append(new Property("Phase", "0", false,
QObject::tr("initial phase in degrees")));
Props.append(new Property("M", "1.0", false,
QObject::tr("modulation index")));
}
PM_Modulator::~PM_Modulator()
{
}
Component* PM_Modulator::newOne()
{
return new PM_Modulator();
}
Element* PM_Modulator::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("PM modulated Source");
BitmapFile = "pm_mod";
if(getNewOne) return new PM_Modulator();
return 0;
}

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

@ -0,0 +1,32 @@
/***************************************************************************
pm_modulator.h
----------------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef PM_MODULATOR_H
#define PM_MODULATOR_H
#include "component.h"
class PM_Modulator : public Component {
public:
PM_Modulator();
~PM_Modulator();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

81
qucs/components/relais.cpp Normal file
View File

@ -0,0 +1,81 @@
/***************************************************************************
relais.cpp
------------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "relais.h"
Relais::Relais()
{
Description = QObject::tr("relais");
Lines.append(new Line(-30,-30,-30, -8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 8,-30, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-45, -8,-15, -8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-45, 8,-15, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-45, -8,-45, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-15, -8,-15, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-45, 8,-15, -8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-15, 0, 35, 0,QPen(QPen::darkBlue,1,Qt::DotLine)));
Lines.append(new Line( 30,-30, 30,-18,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 15, 30, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 15, 45,-15,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 27,-18, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Ellips.append(new Area( 27, 12, 6, 6, QPen(QPen::darkBlue,2),
QBrush(Qt::darkBlue, Qt::SolidPattern)));
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 = -48; y1 = -30;
x2 = 45; y2 = 30;
tx = x1+4;
ty = y2+4;
Model = "Relais";
Name = "S";
Props.append(new Property("Von", "0.4 V", false,
QObject::tr("voltage to switch on the relais")));
Props.append(new Property("Voff", "0.6 V", false,
QObject::tr("voltage to switch off the relais")));
Props.append(new Property("Ron", "0", false,
QObject::tr("resistance of \"on\" state in ohms")));
Props.append(new Property("Roff", "1e12", false,
QObject::tr("resistance of \"off\" state in ohms")));
}
Relais::~Relais()
{
}
Component* Relais::newOne()
{
return new Relais();
}
Element* Relais::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Relais");
BitmapFile = "relais";
if(getNewOne) return new Relais();
return 0;
}

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

@ -0,0 +1,32 @@
/***************************************************************************
relais.h
----------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef RELAIS_H
#define RELAIS_H
#include "component.h"
class Relais : public Component {
public:
Relais();
~Relais();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

6
qucs/components/source_ac.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
source_ac.cpp - description
-------------------
source_ac.cpp
---------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -65,6 +65,8 @@ Source_ac::Source_ac()
QObject::tr("frequency in Hertz")));
Props.append(new Property("Temp", "26.85", false,
QObject::tr("simulation temperature in degree Celsius")));
rotate(); // fix historical flaw
}
Source_ac::~Source_ac()

69
qucs/components/switch.cpp Normal file
View File

@ -0,0 +1,69 @@
/***************************************************************************
switch.cpp
------------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "switch.h"
Switch::Switch()
{
Description = QObject::tr("switch (time controled)");
Lines.append(new Line(-30, 0,-15, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 17, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-15, 0, 15,-15,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 12, -3, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Ellips.append(new Area(-18, -3, 6, 6, QPen(QPen::darkBlue,2),
QBrush(Qt::darkBlue, Qt::SolidPattern)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
x1 = -30; y1 = -17;
x2 = 30; y2 = 7;
tx = x1+4;
ty = y2+4;
Model = "Switch";
Name = "S";
Props.append(new Property("init", "off", false,
QObject::tr("initial state")+"[on, off]"));
Props.append(new Property("time", "1 ms", false,
QObject::tr("time when state changes (comma separated list possible)")));
Props.append(new Property("Ron", "0", false,
QObject::tr("resistance of \"on\" state in ohms")));
Props.append(new Property("Roff", "1e12", false,
QObject::tr("resistance of \"off\" state in ohms")));
}
Switch::~Switch()
{
}
Component* Switch::newOne()
{
return new Switch();
}
Element* Switch::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Switch");
BitmapFile = "switch";
if(getNewOne) return new Switch();
return 0;
}

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

@ -0,0 +1,32 @@
/***************************************************************************
switch.h
----------
begin : Sat Feb 25 2006
copyright : (C) 2006 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef SWITCH_H
#define SWITCH_H
#include "component.h"
class Switch : public Component {
public:
Switch();
~Switch();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
};
#endif

2
qucs/components/tline.cpp
View File

@ -45,6 +45,8 @@ TLine::TLine()
QObject::tr("characteristic impedance")));
Props.append(new Property("L", "1 mm", true,
QObject::tr("electrical length of the line")));
Props.append(new Property("Alpha", "0", true,
QObject::tr("attenuation factor per length in 1/m")));
}
TLine::~TLine()

8
qucs/components/volt_ac.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
volt_ac.cpp - description
-------------------
volt_ac.cpp
-------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -48,6 +48,10 @@ Volt_ac::Volt_ac()
QObject::tr("frequency in Hertz")));
Props.append(new Property("Phase", "0", false,
QObject::tr("initial phase in degrees")));
Props.append(new Property("Theta", "0", false,
QObject::tr("damping factor (transient simulation only)")));
rotate(); // fix historical flaw
}
Volt_ac::~Volt_ac()

12
qucs/components/volt_dc.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
volt_dc.cpp - description
-------------------
volt_dc.cpp
-------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -26,9 +26,9 @@ Volt_dc::Volt_dc()
Lines.append(new Line( -4, -6, -4, 6,QPen(QPen::darkBlue,4)));
Lines.append(new Line( 30, 0, 4, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -4, 0,-30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10, 5, 10, 11,QPen(QPen::red,1)));
Lines.append(new Line( 13, 8, 7, 8,QPen(QPen::red,1)));
Lines.append(new Line( -9, 5, -9, 11,QPen(QPen::black,1)));
Lines.append(new Line( 11, 5, 11, 11,QPen(QPen::red,1)));
Lines.append(new Line( 14, 8, 8, 8,QPen(QPen::red,1)));
Lines.append(new Line(-11, 5,-11, 11,QPen(QPen::black,1)));
Ports.append(new Port( 30, 0));
Ports.append(new Port(-30, 0));
@ -43,6 +43,8 @@ Volt_dc::Volt_dc()
Props.append(new Property("U", "1 V", true,
QObject::tr("voltage in Volts")));
rotate(); // fix historical flaw
}
Volt_dc::~Volt_dc()

6
qucs/components/volt_noise.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
volt_noise.cpp - description
-------------------
volt_noise.cpp
----------------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -50,6 +50,8 @@ Volt_noise::Volt_noise()
QObject::tr("frequency coefficient")));
Props.append(new Property("a", "0", false,
QObject::tr("additive frequency term")));
rotate(); // fix historical flaw
}
Volt_noise::~Volt_noise()

6
qucs/components/vpulse.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
vpulse.cpp - description
-------------------
vpulse.cpp
------------
begin : Sat Sep 18 2004
copyright : (C) 2004 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -58,6 +58,8 @@ vPulse::vPulse()
QObject::tr("rise time of the leading edge")));
Props.append(new Property("Tf", "1 ns", false,
QObject::tr("fall time of the trailing edge")));
rotate(); // fix historical flaw
}
vPulse::~vPulse()

6
qucs/components/vrect.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
vrect.cpp - description
-------------------
vrect.cpp
-----------
begin : Sat Sep 18 2004
copyright : (C) 2004 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -54,6 +54,8 @@ vRect::vRect()
QObject::tr("duration of high pulses")));
Props.append(new Property("TL", "1 ms", true,
QObject::tr("duration of low pulses")));
rotate(); // fix historical flaw
}
vRect::~vRect()

294
qucs/qucs.cpp
View File

@ -53,18 +53,6 @@
#define COMBO_passive 0
#define COMBO_Sources 1
#define COMBO_TLines 2
#define COMBO_nonlinear 3
#define COMBO_digital 4
#define COMBO_File 5
#define COMBO_Sims 6
#define COMBO_Diagrams 7
// must be the last one
#define COMBO_Paints 8
QDir QucsWorkDir; // current project path
QDir QucsHomeDir; // Qucs user directory where all projects are located
@ -240,6 +228,139 @@ void QucsApp::fillComboBox(bool setAll)
CompChoose->insertItem(tr("paintings"));
}
// ######################################################################
// The following arrays contains the components that appear in the
// component listview.
typedef Element* (*pInfoFunc) (QString&, char* &, bool);
pInfoFunc lumpedComponents[] =
{&Resistor::info, &Resistor::info_us, &Capacitor::info, &Inductor::info,
&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, &Coupler::info, &iProbe::info,
&vProbe::info, &Mutual::info, &Mutual2::info, &Switch::info,
&Relais::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, &Noise_ii::info, &Noise_vv::info,
&Noise_iv::info, &AM_Modulator::info, &PM_Modulator::info, 0};
pInfoFunc TransmissionLines[] =
{&TLine::info, &CoaxialLine::info, &Substrate::info, &MSline::info,
&MScoupled::info, &MScorner::info, &MSmbend::info, &MSstep::info,
&MStee::info, &MScross::info, &MSopen::info, &MSgap::info, &MSvia::info,
&Coplanar::info, &CPWopen::info, &CPWshort::info, &CPWgap::info,
&CPWstep::info, 0};
pInfoFunc nonlinearComps[] =
{&Diode::info, &BJT::info, &BJT::info_pnp, &BJTsub::info,
&BJTsub::info_pnp, &JFET::info, &JFET::info_p,
&MOSFET::info, &MOSFET::info_p, &MOSFET::info_depl,
&MOSFET_sub::info, &MOSFET_sub::info_p, &MOSFET_sub::info_depl,
&OpAmp::info, 0};
pInfoFunc digitalComps[] =
{&Digi_Source::info, &Logical_Inv::info, &Logical_OR::info,
&Logical_NOR::info, &Logical_AND::info, &Logical_NAND::info,
&Logical_XOR::info, &Logical_XNOR::info, &RS_FlipFlop::info,
&D_FlipFlop::info, &JK_FlipFlop::info, 0};
pInfoFunc Simulations[] =
{&DC_Sim::info, &TR_Sim::info, &AC_Sim::info, &SP_Sim::info,
&HB_Sim::info, &Param_Sweep::info, &Digi_Sim::info, 0};
pInfoFunc FileComponents[] =
{&SpiceFile::info, &SParamFile::info1, &SParamFile::info2,
&SParamFile::info, 0};
pInfoFunc Diagrams[] =
{&RectDiagram::info, &PolarDiagram::info, &TabDiagram::info,
&SmithDiagram::info, &SmithDiagram::info_y, &PSDiagram::info,
&PSDiagram::info_sp, &Rect3DDiagram::info, &CurveDiagram::info,
&TimingDiagram::info, &TruthDiagram::info, 0};
pInfoFunc Paintings[] =
{&GraphicLine::info, &Arrow::info, &GraphicText::info,
&Ellipse::info, &Rectangle::info, &Ellipse::info_filled,
&Rectangle::info_filled, &EllipseArc::info, 0};
// Order of the component groups in the ComboBox
pInfoFunc *ComponentGroups[] =
{lumpedComponents, Sources, TransmissionLines, nonlinearComps,
digitalComps, FileComponents, Simulations, Diagrams, 0};
// #######################################################################
// Whenever the Component Library ComboBox is changed, this slot fills the
// Component IconView with the appropriat components.
void QucsApp::slotSetCompView(int index)
{
view->editText->setHidden(true); // disable text edit of component property
char *File;
QString Name;
pInfoFunc *Infos = 0;
CompComps->clear(); // clear the IconView
if((index+1) >= CompChoose->count()) // because of symbol edit mode
Infos = &Paintings[0];
else
Infos = ComponentGroups[index];
while(*Infos != 0) {
(**Infos) (Name, File, false);
new QIconViewItem(CompComps, Name,
QImage(QucsSettings.BitmapDir+QString(File)+".png"));
Infos++;
}
}
// ----------------------------------------------------------------------
// Is called when the mouse is clicked within the Component QIconView.
void QucsApp::slotSelectComponent(QIconViewItem *item)
{
view->editText->setHidden(true); // disable text edit of component property
// delete previously selected elements
if(view->selElem != 0) delete view->selElem;
view->selElem = 0; // no component/diagram/painting selected
if(view->drawn) view->viewport()->repaint(); // don't use update() here !!!
view->drawn = false;
if(item == 0) { // mouse button pressed not over an item ?
CompComps->clearSelection(); // deselect component in ViewList
return;
}
// toggle last toolbar button off
if(activeAction) {
activeAction->blockSignals(true); // do not call toggle slot
activeAction->setOn(false); // set last toolbar button off
activeAction->blockSignals(false);
}
activeAction = 0;
view->MouseMoveAction = &QucsView::MMoveElement;
view->MousePressAction = &QucsView::MPressElement;
view->MouseReleaseAction = 0;
view->MouseDoubleClickAction = 0;
pInfoFunc Infos = 0;
int i = CompComps->index(item);
if((CompChoose->currentItem()+1) >= CompChoose->count())
Infos = Paintings[i]; // the only one in "symbol-painting" mode
else
Infos = *(ComponentGroups[CompChoose->currentItem()] + i);
char *Dummy2;
QString Dummy1;
if(Infos) view->selElem = (*Infos) (Dummy1, Dummy2, true);
}
// ----------------------------------------------------------
// Menu that appears if right mouse button is pressed on a file in the
// "Content" ListView.
@ -1258,8 +1379,9 @@ void QucsApp::slotChangePage(QString Name)
TabView->setCurrentPage(2); // switch to "Component"-Tab
if(Name.right(4) == ".dpl") {
CompChoose->setCurrentItem(COMBO_Diagrams); // switch to diagrams
slotSetCompView(COMBO_Diagrams);
cNo = sizeof(ComponentGroups)/sizeof(pInfoFunc) - 2;
CompChoose->setCurrentItem(cNo); // switch to diagrams
slotSetCompView(cNo);
}
}
@ -1644,150 +1766,6 @@ void QucsApp::slotProjDelButt()
Projects->removeItem(Projects->currentItem()); // remove from project list
}
// ######################################################################
// The following arrays contains the components that appear in the
// component listview.
typedef Element* (*pInfoFunc) (QString&, char* &, bool);
pInfoFunc lumpedComponents[] =
{&Resistor::info, &Resistor::info_us, &Capacitor::info, &Inductor::info,
&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, &Coupler::info, &iProbe::info,
&vProbe::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, &Noise_ii::info, &Noise_vv::info,
&Noise_iv::info, 0};
pInfoFunc TransmissionLines[] =
{&TLine::info, &CoaxialLine::info, &Substrate::info, &MSline::info,
&MScoupled::info, &MScorner::info, &MSmbend::info, &MSstep::info,
&MStee::info, &MScross::info, &MSopen::info, &MSgap::info, &MSvia::info,
&Coplanar::info, &CPWopen::info, &CPWshort::info, &CPWgap::info,
&CPWstep::info, 0};
pInfoFunc nonlinearComps[] =
{&Diode::info, &BJT::info, &BJT::info_pnp, &BJTsub::info,
&BJTsub::info_pnp, &JFET::info, &JFET::info_p,
&MOSFET::info, &MOSFET::info_p, &MOSFET::info_depl,
&MOSFET_sub::info, &MOSFET_sub::info_p, &MOSFET_sub::info_depl,
&OpAmp::info, 0};
pInfoFunc digitalComps[] =
{&Digi_Source::info, &Logical_Inv::info, &Logical_OR::info,
&Logical_NOR::info, &Logical_AND::info, &Logical_NAND::info,
&Logical_XOR::info, &Logical_XNOR::info, &RS_FlipFlop::info,
&D_FlipFlop::info, &JK_FlipFlop::info, 0};
pInfoFunc Simulations[] =
{&DC_Sim::info, &TR_Sim::info, &AC_Sim::info, &SP_Sim::info,
&HB_Sim::info, &Param_Sweep::info, &Digi_Sim::info, 0};
pInfoFunc FileComponents[] =
{&SpiceFile::info, &SParamFile::info1, &SParamFile::info2, &SParamFile::info};
pInfoFunc Diagrams[] =
{&RectDiagram::info, &PolarDiagram::info, &TabDiagram::info,
&SmithDiagram::info, &SmithDiagram::info_y, &PSDiagram::info,
&PSDiagram::info_sp, &Rect3DDiagram::info, &CurveDiagram::info,
&TimingDiagram::info, &TruthDiagram::info, 0};
pInfoFunc Paintings[] =
{&GraphicLine::info, &Arrow::info, &GraphicText::info,
&Ellipse::info, &Rectangle::info, &Ellipse::info_filled,
&Rectangle::info_filled, &EllipseArc::info, 0};
// #######################################################################
// Whenever the Component Library ComboBox is changed, this slot fills the
// Component IconView with the appropriat components.
void QucsApp::slotSetCompView(int index)
{
view->editText->setHidden(true); // disable text edit of component property
char *File;
QString Name;
pInfoFunc *Infos = 0;
CompComps->clear(); // clear the IconView
if((index+1) >= CompChoose->count()) // because of symbol edit mode
Infos = &Paintings[0];
else
switch(index) {
case COMBO_passive: Infos = &lumpedComponents[0]; break;
case COMBO_Sources: Infos = &Sources[0]; break;
case COMBO_TLines: Infos = &TransmissionLines[0]; break;
case COMBO_nonlinear: Infos = &nonlinearComps[0]; break;
case COMBO_digital: Infos = &digitalComps[0]; break;
case COMBO_File: Infos = &FileComponents[0]; break;
case COMBO_Sims: Infos = &Simulations[0]; break;
case COMBO_Diagrams: Infos = &Diagrams[0]; break;
}
while(*Infos != 0) {
(**Infos) (Name, File, false);
new QIconViewItem(CompComps, Name,
QImage(QucsSettings.BitmapDir+QString(File)+".png"));
Infos++;
}
}
// ----------------------------------------------------------------------
// Is called when the mouse is clicked within the Component QIconView.
void QucsApp::slotSelectComponent(QIconViewItem *item)
{
view->editText->setHidden(true); // disable text edit of component property
// delete previously selected elements
if(view->selElem != 0) delete view->selElem;
view->selElem = 0; // no component/diagram/painting selected
if(view->drawn) view->viewport()->repaint(); // don't use update() here !!!
view->drawn = false;
if(item == 0) { // mouse button pressed not over an item ?
CompComps->clearSelection(); // deselect component in ViewList
return;
}
// toggle last toolbar button off
if(activeAction) {
activeAction->blockSignals(true); // do not call toggle slot
activeAction->setOn(false); // set last toolbar button off
activeAction->blockSignals(false);
}
activeAction = 0;
view->MouseMoveAction = &QucsView::MMoveElement;
view->MousePressAction = &QucsView::MPressElement;
view->MouseReleaseAction = 0;
view->MouseDoubleClickAction = 0;
pInfoFunc Infos = 0;
int i = CompComps->index(item);
if((CompChoose->currentItem()+1) >= CompChoose->count())
Infos = Paintings[i]; // the only one in "symbol-painting" mode
else
switch(CompChoose->currentItem()) {
case COMBO_passive: Infos = lumpedComponents[i]; break;
case COMBO_Sources: Infos = Sources[i]; break;
case COMBO_TLines: Infos = TransmissionLines[i]; break;
case COMBO_nonlinear: Infos = nonlinearComps[i]; break;
case COMBO_digital: Infos = digitalComps[i]; break;
case COMBO_File: Infos = FileComponents[i]; break;
case COMBO_Sims: Infos = Simulations[i]; break;
case COMBO_Diagrams: Infos = Diagrams[i]; break;
}
char *Dummy2;
QString Dummy1;
if(Infos) view->selElem = (*Infos) (Dummy1, Dummy2, true);
}
// -----------------------------------------------------------------------
// Is called when the mouse is clicked within the Content QListView.
void QucsApp::slotSelectSubcircuit(QListViewItem *item)

80
qucs/qucs_de.ts
View File

@ -3519,6 +3519,86 @@ Verwendung: qucsedit [-r] Datei
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_es.ts
View File

@ -3294,6 +3294,86 @@ Use: qucsedit [-r] archivo
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_fr.ts
View File

@ -3288,6 +3288,86 @@ Invocation : qucsedit [-r] fichier
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_he.ts
View File

@ -3208,6 +3208,86 @@ Usage: qucsedit [-r] file
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_hu.ts
View File

@ -3286,6 +3286,86 @@ Digitális szimuláció</translation>
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_it.ts
View File

@ -3426,6 +3426,86 @@ Usage: qucsedit [-r] file
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_jp.ts
View File

@ -3255,6 +3255,86 @@ Usage: qucsedit [-r] file
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_pl.ts
View File

@ -3340,6 +3340,86 @@ Stosowanie: qucsedit [-r] plik
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_pt.ts
View File

@ -3217,6 +3217,86 @@ Usage: qucsedit [-r] file
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_ro.ts
View File

@ -3293,6 +3293,86 @@ Folosire: qucsedit [-r] file
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_sv.ts
View File

@ -3134,6 +3134,86 @@ Usage: qucsedit [-r] file
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_tr.ts
View File

@ -3134,6 +3134,86 @@ Kullanım: qucsedit -r kütük
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

80
qucs/qucs_uk.ts
View File

@ -3088,6 +3088,86 @@ Usage: qucsedit [-r] file
<source>type of the port (for digital simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with amplitude modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>damping factor (transient simulation only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac voltage source with phase modulator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>modulation index</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PM modulated Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch on the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>voltage to switch off the relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;on&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>resistance of &quot;off&quot; state in ohms</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relais</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>switch (time controled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>initial state</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>time when state changes (comma separated list possible)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>attenuation factor per length in 1/m</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>

2
qucs/qucsdoc.cpp
View File

@ -98,6 +98,8 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& _Name) : File(this)
if(_Name.isEmpty()) Tab = new QTab(QObject::tr("untitled"));
else {
QFileInfo Info(DocName);
DocName = Info.absFilePath();
Tab = new QTab(Info.fileName());
DataSet = Info.baseName()+".dat"; // name of the default dataset
if(Info.extension(false) == "sch")

19
qucs/qucsview.cpp
View File

@ -38,6 +38,10 @@
#include <stdlib.h>
QRegExp Expr_CompProp;
QRegExpValidator Val_CompProp(Expr_CompProp, 0); // for edit component name on schematic
QucsView::QucsView(QWidget *parent) : QScrollView(parent)
{
setVScrollBarMode(QScrollView::AlwaysOn);
@ -83,10 +87,7 @@ QucsView::QucsView(QWidget *parent) : QScrollView(parent)
// .......................................................................
// valid expressions for component property editor
Expression.setPattern("[^\"=]+");
Validator = new QRegExpValidator(Expression, this);
editText = new QLineEdit(viewport());
editText->setValidator(Validator);
editText->setFrame(false);
editText->setHidden(true);
editText->setPaletteBackgroundColor(QucsSettings.BGColor);
@ -100,7 +101,6 @@ QucsView::~QucsView()
{
delete ComponentMenu;
delete focusMEvent;
delete Validator;
}
// -----------------------------------------------------------
@ -2461,7 +2461,8 @@ void QucsView::contentsDragMoveEvent(QDragMoveEvent *Event)
}
// -----------------------------------------------------------
// Is called if return is pressed in the component text QLineEdit.
// Is called if user clicked on component text of if return is
// pressed in the component text QLineEdit.
void QucsView::slotApplyCompText()
{
QString s;
@ -2543,12 +2544,18 @@ void QucsView::slotApplyCompText()
int(d->Scale * float(MAy1 - d->ViewY1)),
MAx2, MAy2);
editText->setReadOnly(false);
if(pp) {
if(pp) { // is it a property ?
s = pp->Value;
MAx2 += editText->fontMetrics().width(pp->Name+"=");
if(pp->Description.find('[') >= 0) // is selection list ?
editText->setReadOnly(true);
Expr_CompProp.setPattern("[^\"=]+");
}
else // it is the component name
Expr_CompProp.setPattern("[\\w_]+");
Val_CompProp.setRegExp(Expr_CompProp);
editText->setValidator(&Val_CompProp);
z = editText->fontMetrics().lineSpacing();
MAy2 += n*z;
editText->move(QPoint(MAx2, MAy2));

5
qucs/qucsview.h
View File

@ -61,7 +61,7 @@ public:
bool drawn; // indicates whether the scheme element was drawn last time
QString ProjName;
QLineEdit *editText; // for edit component properties
QLineEdit *editText; // for edit component properties on schematic
QPtrList<Element> movingElements;
@ -173,9 +173,6 @@ private:
QMouseEvent *focusMEvent;
Wire *labeledWire; // remember the wire whose label is moving
ViewPainter Painter;
QRegExp Expression;
QRegExpValidator *Validator;
};
#endif