*** empty log message ***

This commit is contained in:
margraf 2005-07-04 06:07:17 +00:00
parent 96afe52228
commit bcd5d061ee
43 changed files with 173 additions and 151 deletions

2
NEWS
View File

@ -26,6 +26,8 @@ files.
Version 0.0.7 Version 0.0.7
------------- -------------
* renamed Qucs. New name is "Quite Universal Circuit Simulator"
* several small improvements and bug fixes
* Latex-like mnemonics (e.g. \tau) in graphic texts and diagram labels * Latex-like mnemonics (e.g. \tau) in graphic texts and diagram labels
* library manager including transistor, diode, substrate, etc. libraries * library manager including transistor, diode, substrate, etc. libraries

4
README
View File

@ -34,8 +34,8 @@ http://qucs.sourceforge.net
Requirements Requirements
============ ============
Qucs needs Qt <http://www.trolltech.com>. This current version is Qucs needs Qt(R) by Trolltech(R) <http://www.trolltech.com>.
known to work with Qt 3.1 and later. This current version is known to work with Qt 3.1 and later.
Installation Installation

View File

@ -33,7 +33,7 @@ Distribution process:
- Maintainance currently requires the following software packages: - Maintainance currently requires the following software packages:
+ Autoconf version 2.57 (at least) + Autoconf version 2.57 (at least)
+ GNU automake 1.7.0 (at least) + GNU automake 1.7.0 (at least)
+ Qt installation >= version 3.1 + Qt installation >= version 3.1 (by Trolltech)
- Get latest `config.guess' and `config.sub' from GNU servers or run the - Get latest `config.guess' and `config.sub' from GNU servers or run the
command `automake -a -f -c' with latest automake version installed. command `automake -a -f -c' with latest automake version installed.
- Run `make distclean', `sh autogen.sh' and `make all'. - Run `make distclean', `sh autogen.sh' and `make all'.
@ -69,7 +69,7 @@ the tarballs created using `make distcheck'.
- a LaTeX installation (including IEEEtran bibstyle) - a LaTeX installation (including IEEEtran bibstyle)
- GNU Octave - GNU Octave
- epsTk 2.0.1 (at least) - epsTk 2.0.1 (at least)
- Qt installation >= version 3.1 - Qt installation >= version 3.1 (by Trolltech)
* Unpack the packages in a temporary directory. * Unpack the packages in a temporary directory.
- mkdir /temporary-dir and cd /temporary-dir - mkdir /temporary-dir and cd /temporary-dir

View File

@ -9,7 +9,7 @@ large-signal, small-signal and noise behaviour of the circuit. After
that simulation has finished you can view the simulation results on a that simulation has finished you can view the simulation results on a
presentation page or window. presentation page or window.
* Qucs, briefly for Qt Universal Circuit Simulator, is a * Qucs, briefly for Quite Universal Circuit Simulator, is a
circuit simulator with graphical user interface. The circuit simulator with graphical user interface. The
software aims to support all kinds of circuit simulation software aims to support all kinds of circuit simulation
types, e.g. DC, AC, S-parameter, harmonic balance analysis, types, e.g. DC, AC, S-parameter, harmonic balance analysis,

View File

@ -11,7 +11,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt Universeller Schaltungssimulator<br> Ziemlich Universeller Schaltungssimulator<br>
</h3> </h3>
<h1> <h1>
Hilfe Index<br><br> Hilfe Index<br><br>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt Universeller Schaltungssimulator<br> Ziemlich Universeller Schaltungssimulator<br>
</h3> </h3>
<h1> <h1>
Kurze Beschreibung der mathematischen Funktionen<br><br> Kurze Beschreibung der mathematischen Funktionen<br><br>
@ -132,6 +132,7 @@ m&ouml;gliche Werte f&uuml;r <tt>von</tt> und <tt>nach</tt> sind "Y", "Z", "H",
<b>Konstanten</b> <b>Konstanten</b>
<table cellspacing=2 cellpadding=2> <table cellspacing=2 cellpadding=2>
<tr><td><tt>j</tt></td><td>imaginäre Einheit ("Quadratwurzel von -1")</td></tr>
<tr><td><tt>pi</tt></td><td>4*atan(1) = 3.14159</td></tr> <tr><td><tt>pi</tt></td><td>4*atan(1) = 3.14159</td></tr>
<tr><td><tt>e</tt></td><td>Eulerzahl = 2.71828</td></tr> <tr><td><tt>e</tt></td><td>Eulerzahl = 2.71828</td></tr>
<tr><td><tt>kB</tt></td><td>Boltzmann-Konstante = 1.38065e-23</td></tr> <tr><td><tt>kB</tt></td><td>Boltzmann-Konstante = 1.38065e-23</td></tr>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt Universeller Schaltungssimulator<br> Ziemlich Universeller Schaltungssimulator<br>
</h3> </h3>
<h1> <h1>
Kurze Beschreibung der Funktionen<br><br> Kurze Beschreibung der Funktionen<br><br>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt Universeller Schaltungssimulator<br> Ziemlich Universeller Schaltungssimulator<br>
</h3> </h3>
<h1> <h1>
Erste Schritte<br><br> Erste Schritte<br><br>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt Universeller Schaltungssimulator<br> Ziemlich Universeller Schaltungssimulator<br>
</h3> </h3>
<h1> <h1>
Arbeiten mit Schaltungshierarchien<br><br> Arbeiten mit Schaltungshierarchien<br><br>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
List of Special Characters<br><br> List of Special Characters<br><br>
@ -94,6 +94,12 @@ depends on the font used by Qucs!
<tr><td><tt>\geq</tt></td><td>0x2265</td><td>greater-equal sign</td></tr> <tr><td><tt>\geq</tt></td><td>0x2265</td><td>greater-equal sign</td></tr>
<tr><td><tt>\sim</tt></td><td>0x223C</td><td>(central european) proportional sign</td></tr> <tr><td><tt>\sim</tt></td><td>0x223C</td><td>(central european) proportional sign</td></tr>
<tr><td><tt>\propto</tt></td><td>0x221D</td><td>(american) proportional sign</td></tr> <tr><td><tt>\propto</tt></td><td>0x221D</td><td>(american) proportional sign</td></tr>
<tr><td><tt>\diameter</tt></td><td>0x00F8</td><td>diameter sign (also sign for average)</td></tr>
<tr><td><tt>\onehalf</tt></td><td>0x00BD</td><td>one half</td></tr>
<tr><td><tt>\onequarter</tt></td><td>0x00BC</td><td>one quarter</td></tr>
<tr><td><tt>\twosuperior</tt></td><td>0x00B2</td><td>square (power of two)</td></tr>
<tr><td><tt>\threesuperior</tt></td><td>0x00B3</td><td>power of three</td></tr>
<tr><td><tt>\ohm</tt></td><td>0x03A9</td><td>unit for resistance (capital Greek omage)</td></tr>
</table> </table>
<br> <br>

View File

@ -11,7 +11,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
Help Index<br><br> Help Index<br><br>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
Schematic File Format<br><br> Schematic File Format<br><br>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
Short Description of mathematical Functions<br><br> Short Description of mathematical Functions<br><br>
@ -133,6 +133,7 @@ possible values for <tt>"from"</tt> and <tt>"to"</tt> are 'Y', 'Z', 'H', 'G',
<b>Constants</b> <b>Constants</b>
<table cellspacing=2 cellpadding=2> <table cellspacing=2 cellpadding=2>
<tr><td><tt>j</tt></td><td>imaginary unit ("square root of -1")</td></tr>
<tr><td><tt>pi</tt></td><td>4*atan(1) = 3.14159</td></tr> <tr><td><tt>pi</tt></td><td>4*atan(1) = 3.14159</td></tr>
<tr><td><tt>e</tt></td><td>Euler = 2.71828</td></tr> <tr><td><tt>e</tt></td><td>Euler = 2.71828</td></tr>
<tr><td><tt>kB</tt></td><td>Boltzmann constant = 1.38065e-23</td></tr> <tr><td><tt>kB</tt></td><td>Boltzmann constant = 1.38065e-23</td></tr>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
Short Description of Actions<br><br> Short Description of Actions<br><br>

View File

@ -13,7 +13,7 @@
<center><h3> <center><h3>
- Qucs -<br> - Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
Getting Started<br><br> Getting Started<br><br>

View File

@ -11,7 +11,7 @@
<center> <center>
<h3>- Qucs -<br> <h3>- Qucs -<br>
<br> <br>
Qt universal circuit simulator</h3> Quite Universal Circuit Simulator</h3>
<h1> <h1>
&Iacute;ndice de la Ayuda<br> &Iacute;ndice de la Ayuda<br>
<br> <br>

View File

@ -10,7 +10,7 @@
<a name="top" id="top"></a> <a name="top" id="top"></a>
<center> <center>
<h3>- Qucs -<br> <h3>- Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
Descripci&oacute;n breve de las Funciones matem&aacute;ticas<br> Descripci&oacute;n breve de las Funciones matem&aacute;ticas<br>

View File

@ -10,7 +10,7 @@
<a name="top" id="top"></a> <a name="top" id="top"></a>
<center> <center>
<h3>- Qucs -<br> <h3>- Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1>&nbsp; <h1>&nbsp;
Descripci&oacute;n breve de las Acciones<br> Descripci&oacute;n breve de las Acciones<br>

View File

@ -10,7 +10,7 @@
<a name="top" id="top"></a> <a name="top" id="top"></a>
<center> <center>
<h3>- Qucs -<br> <h3>- Qucs -<br>
Qt universal circuit simulator<br> Quite Universal Circuit Simulator<br>
</h3> </h3>
<h1> <h1>
Empezando por el principio<br> Empezando por el principio<br>

View File

@ -94,7 +94,7 @@ QucsLib::QucsLib()
Library = new QComboBox (LibGroup); Library = new QComboBox (LibGroup);
connect(Library, SIGNAL(activated(int)), SLOT(slotSelectLibrary(int))); connect(Library, SIGNAL(activated(int)), SLOT(slotSelectLibrary(int)));
CompList = new QListBox(LibGroup); CompList = new QListBox(LibGroup);
connect(CompList, SIGNAL(clicked(QListBoxItem*)), connect(CompList, SIGNAL(highlighted(QListBoxItem*)),
SLOT(slotShowComponent(QListBoxItem*))); SLOT(slotShowComponent(QListBoxItem*)));
QHBox * h1 = new QHBox (LibGroup); QHBox * h1 = new QHBox (LibGroup);
@ -128,8 +128,6 @@ QucsLib::QucsLib()
Library->insertItem((*it).left((*it).length()-4)); Library->insertItem((*it).left((*it).length()-4));
slotSelectLibrary(0); slotSelectLibrary(0);
CompList->setCurrentItem(0);
slotShowComponent(CompList->selectedItem());
} }
/* Destructor destroys the application. */ /* Destructor destroys the application. */
@ -267,6 +265,8 @@ void QucsLib::slotSelectLibrary(int Index)
LibraryComps.append(LibName+'\n'+LibraryString.mid(Start, End-Start)); LibraryComps.append(LibName+'\n'+LibraryString.mid(Start, End-Start));
Start = End; Start = End;
} }
CompList->setSelected(0, true); // select first item
} }
void QucsLib::slotSearchComponent() void QucsLib::slotSearchComponent()

View File

@ -1,3 +1,13 @@
2005-06-25 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* some more LaTeX tags for texts
* simulation warning reset before simulation starts
* save 4 digits for unicode in text painting
* QucsLib: change component with cursor up/down
* repaint after return in property line edit
* fixed bug that erases port names at undo/redo
* fixed bug placing menu on right mouse click during paste
2005-06-09 Michael Margraf <michael.margraf@alumni.tu-berlin.de> 2005-06-09 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* new tool: library manager * new tool: library manager

View File

@ -247,6 +247,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
{ {
Comp->withSim = false; Comp->withSim = false;
if(s.isEmpty()) return false; if(s.isEmpty()) return false;
QFileInfo FileInfo(QucsWorkDir, s);
NodesList->clear(); NodesList->clear();
PortsList->clear(); PortsList->clear();
@ -262,7 +263,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
QucsConv->addArgument("-of"); QucsConv->addArgument("-of");
QucsConv->addArgument("qucs"); QucsConv->addArgument("qucs");
QucsConv->addArgument("-i"); QucsConv->addArgument("-i");
QucsConv->addArgument(s); QucsConv->addArgument(FileInfo.filePath());
connect(QucsConv, SIGNAL(readyReadStdout()), SLOT(slotGetNetlist())); connect(QucsConv, SIGNAL(readyReadStdout()), SLOT(slotGetNetlist()));
connect(QucsConv, SIGNAL(readyReadStderr()), SLOT(slotGetError())); connect(QucsConv, SIGNAL(readyReadStderr()), SLOT(slotGetError()));

View File

@ -89,7 +89,7 @@ void Diagram::paint(ViewPainter *p)
p->drawLine(cx+pl->x1, cy-pl->y1, cx+pl->x2, cy-pl->y2); p->drawLine(cx+pl->x1, cy-pl->y1, cx+pl->x2, cy-pl->y2);
} }
// paint all arcs (1 pixel larger to compensate for strange Qt circles) // paint all arcs (1 pixel larger to compensate for strange circle method)
for(struct Arc *pa = Arcs.first(); pa != 0; pa = Arcs.next()) { for(struct Arc *pa = Arcs.first(); pa != 0; pa = Arcs.next()) {
p->Painter->setPen(pa->style); p->Painter->setPen(pa->style);
p->drawArc(cx+pa->x, cy-pa->y, pa->w+1, pa->h+1, pa->angle, pa->arclen); p->drawArc(cx+pa->x, cy-pa->y, pa->w+1, pa->h+1, pa->angle, pa->arclen);

View File

@ -123,40 +123,20 @@ void Rect3DDiagram::calcCoordinate(double* &xD, double* &zD, double* &yD,
//qDebug("%g, %g, %g -> %d, %d", *(xD-1), *yD, *(zD-2), *px, *py); //qDebug("%g, %g, %g -> %d, %d", *(xD-1), *yD, *(zD-2), *px, *py);
} }
struct tPointData3D {
int x, y;
float z;
int PointNo;
};
/*
// -------------------------------------------------------------- // --------------------------------------------------------------
void Rect3DDiagram::removeLines() // Calculate all 3D points of the line between point "p" and "EndPoint".
void Rect3DDiagram::calcLine(tPointData3D *p, tPointData3D *EndPoint)
{ {
// int Size = ((2*(g->cPointsX.getFirst()->count) + 1) * g->countY) + 8; int x1_ = p->x, y1_ = p->y;
// int *p = (int*)malloc( Size*sizeof(int) ); // create memory for points int x2_ = EndPoint->x, y2_ = EndPoint->y;
/*
for(i=g->countY; i>0; i--) { // every branch of curves
px = g->cPointsX.getFirst()->Points;
calcCoordinate(px, pz, py, p, p+1, pa);
p += 2;
for(z=g->cPointsX.getFirst()->count-1; z>0; z--) { // every point
// FIT_MEMORY_SIZE; // need to enlarge memory block ?
calcCoordinate(px, pz, py, p, p+1, pa);
p += 2;
if(Counter >= 2) // clipping only if an axis is manual
clip(p);
}
if(*(p-3) == -2) p -= 3; // no single point after "no stroke"
*(p++) = -10;
if(py != &Dummy) { // more-dimensional Rect3D
py++;
if(py >= (g->cPointsX.at(1)->Points + g->cPointsX.at(1)->count))
py = g->cPointsX.at(1)->Points;
}
}
*/
/*
// line algorithm
int x1_ = 80, y1_ = 40;
int x2_ = 10, y2_ = 10;
int ax_ = 0, ay_ = 0; int ax_ = 0, ay_ = 0;
int ix_, iy_, dx_, dy_, of_; int ix_, iy_, dx_, dy_, of_;
@ -190,7 +170,9 @@ void Rect3DDiagram::removeLines()
} }
of_ = dx_ >> 1; of_ = dx_ >> 1;
p->drawPoint(x1_, y1_); float z1_ = p->z;
float dz_ = (EndPoint->z - z1_) / float(dx_); // interpolate z coordinate
// first point is already in list !!!
for(int i=dx_; i>0; i--) { for(int i=dx_; i>0; i--) {
x1_ += ix_; x1_ += ix_;
y1_ += ax_; y1_ += ax_;
@ -200,9 +182,44 @@ void Rect3DDiagram::removeLines()
x1_ += ay_; x1_ += ay_;
y1_ += iy_; y1_ += iy_;
} }
p->drawPoint(x1_, y1_); p->x = x1_; // store point coordinate
p->y = y1_;
z1_ += dz_;
p->z = z1_;
p++;
// FIT_MEMORY_SIZE;
} }
}
*/ */
// --------------------------------------------------------------
void Rect3DDiagram::removeLines()
{
// int Size = ((2*(g->cPointsX.getFirst()->count) + 1) * g->countY) + 8;
// int *p = (int*)malloc( Size*sizeof(int) ); // create memory for points
/*
for(i=g->countY; i>0; i--) { // every branch of curves
px = g->cPointsX.getFirst()->Points;
calcCoordinate(px, pz, py, p, p+1, pa);
p += 2;
for(z=g->cPointsX.getFirst()->count-1; z>0; z--) { // every point
// FIT_MEMORY_SIZE; // need to enlarge memory block ?
calcCoordinate(px, pz, py, p, p+1, pa);
p += 2;
if(Counter >= 2) // clipping only if an axis is manual
clip(p);
}
if(*(p-3) == -2) p -= 3; // no single point after "no stroke"
*(p++) = -10;
if(py != &Dummy) { // more-dimensional Rect3D
py++;
if(py >= (g->cPointsX.at(1)->Points + g->cPointsX.at(1)->count))
py = g->cPointsX.at(1)->Points;
}
}
*/
} }
// -------------------------------------------------------------- // --------------------------------------------------------------

View File

@ -75,14 +75,12 @@ SettingsDialog::SettingsDialog(QucsDoc *d, QWidget *parent, const char *name)
gp2->addWidget(l3,1,0); gp2->addWidget(l3,1,0);
Input_GridX = new QLineEdit(Tab2); Input_GridX = new QLineEdit(Tab2);
Input_GridX->setValidator(valExpr); Input_GridX->setValidator(valExpr);
// Input_GridX->setInputMask("000"); // for Qt 3.2
gp2->addWidget(Input_GridX,1,1); gp2->addWidget(Input_GridX,1,1);
QLabel *l4 = new QLabel(tr("vertical Grid:"), Tab2); QLabel *l4 = new QLabel(tr("vertical Grid:"), Tab2);
gp2->addWidget(l4,2,0); gp2->addWidget(l4,2,0);
Input_GridY = new QLineEdit(Tab2); Input_GridY = new QLineEdit(Tab2);
Input_GridY->setValidator(valExpr); Input_GridY->setValidator(valExpr);
// Input_GridY->setInputMask("000"); // for Qt 3.2
gp2->addWidget(Input_GridY,2,1); gp2->addWidget(Input_GridY,2,1);
t->addTab(Tab2, tr("Grid")); t->addTab(Tab2, tr("Grid"));

View File

@ -45,13 +45,15 @@ struct tSpecialChar SpecialChars[] = {
{"nabla", 0x2207}, {"infty", 0x221E}, {"int", 0x222B}, {"nabla", 0x2207}, {"infty", 0x221E}, {"int", 0x222B},
{"approx", 0x2248}, {"neq", 0x2260}, {"in", 0x220A}, {"approx", 0x2248}, {"neq", 0x2260}, {"in", 0x220A},
{"leq", 0x2264}, {"geq", 0x2265}, {"sim", 0x223C}, {"leq", 0x2264}, {"geq", 0x2265}, {"sim", 0x223C},
{"propto", 0x221D}, {"propto", 0x221D}, {"onehalf", 0x00BD}, {"onequarter", 0x00BC},
{"twosuperior", 0x00B2}, {"threesuperior", 0x00B3},
{"diameter", 0x00F8}, {"ohm", 0x03A9},
{"", 0} // end mark {"", 0} // end mark
}; };
// This function replaces the LaTeX commands for special characters // This function replaces the LaTeX tags for special characters
// into its unicode value. // into its unicode value.
void encode_String(const QString& Input, QString& Output) void encode_String(const QString& Input, QString& Output)
{ {
@ -76,7 +78,7 @@ void encode_String(const QString& Input, QString& Output)
} }
// This function replaces the unicode of special characters // This function replaces the unicode of special characters
// into its LaTeX commands. // by its LaTeX tags.
void decode_String(QString& Output) void decode_String(QString& Output)
{ {
struct tSpecialChar *p = SpecialChars; struct tSpecialChar *p = SpecialChars;

View File

@ -157,7 +157,7 @@ bool GraphicText::load(const QString& s)
int i = 0; int i = 0;
unsigned short ch; unsigned short ch;
while((i=Text.find("\\x", i)) >= 0) { while((i=Text.find("\\x", i)) >= 0) {
n = Text.mid(i, 5); n = Text.mid(i, 6);
ch = n.mid(2).toUShort(&ok, 16); ch = n.mid(2).toUShort(&ok, 16);
if(!ok) return false; if(!ok) return false;
Text.replace(n, QChar(ch)); Text.replace(n, QChar(ch));
@ -184,7 +184,7 @@ QString GraphicText::save()
char Str[8]; char Str[8];
while((ch=t.at(i++)) != QChar(0)) { // convert special characters while((ch=t.at(i++)) != QChar(0)) { // convert special characters
if(ch > QChar(0x7F)) { if(ch > QChar(0x7F)) {
sprintf(Str, "\\x%03X", ch.unicode()); sprintf(Str, "\\x%04X", ch.unicode());
t.replace(ch, Str); t.replace(ch, Str);
} }
} }

View File

@ -1103,6 +1103,12 @@ void QucsApp::slotSimulate()
if(view->Docs.current()->DocName.isEmpty()) // if document 'untitled' ... if(view->Docs.current()->DocName.isEmpty()) // if document 'untitled' ...
if(!saveCurrentFile()) return; // ... save schematic before if(!saveCurrentFile()) return; // ... save schematic before
QFont f = Init.WarningLabel->font(); // reset warning label
f.setWeight(QFont::Normal);
Init.WarningLabel->setFont(f);
Init.WarningLabel->setPaletteForegroundColor(Qt::black);
Init.WarningLabel->setText(tr("no warnings"));
SimMessage *sim = new SimMessage(view->Docs.current(), this); SimMessage *sim = new SimMessage(view->Docs.current(), this);
// disconnect is automatically performed, if one of the involved objects // disconnect is automatically performed, if one of the involved objects
// is destroyed ! // is destroyed !
@ -1126,15 +1132,8 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim)
if(Status == 0) { // no errors ocurred ? if(Status == 0) { // no errors ocurred ?
if(sim->ErrText->lines() > 1) if(sim->ErrText->lines() > 1) // were there warnings ?
Init.slotShowWarnings(); Init.slotShowWarnings();
else {
QFont f = Init.WarningLabel->font();
f.setWeight(QFont::Normal);
Init.WarningLabel->setFont(f);
Init.WarningLabel->setPaletteForegroundColor(Qt::black);
Init.WarningLabel->setText(tr("no warnings"));
}
if(view->Docs.current()->SimOpenDpl) { if(view->Docs.current()->SimOpenDpl) {
shouldClosed = true; shouldClosed = true;

View File

@ -4051,10 +4051,10 @@ Wollen Sie die Änderungen vor dem Schließen speichern?</translation>
</message> </message>
<message> <message>
<source> <source>
Qt universal circuit simulator Quite Universal Circuit Simulator
</source> </source>
<translation type="obsolete"> <translation type="obsolete">
Qt universal circuit simulator Quite universal circuit simulator
</translation> </translation>
</message> </message>
<message> <message>
@ -5891,10 +5891,10 @@ About Qt by Trolltech</source>
</message> </message>
<message> <message>
<source> <source>
Qt universal circuit simulator Quite Universal Circuit Simulator
</source> </source>
<translation> <translation type="unfinished">
Qt universal circuit simulator Quite universal circuit simulator
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -4637,14 +4637,6 @@ Acerca de Qt por Trolltech</translation>
<source>Qucs Version </source> <source>Qucs Version </source>
<translation>Versión de Qucs </translation> <translation>Versión de Qucs </translation>
</message> </message>
<message>
<source>
Qt universal circuit simulator
</source>
<translation>
Simulador universal de circuitos Qt
</translation>
</message>
<message> <message>
<source>Copyright (C) 2003,2004 by Michael Margraf <source>Copyright (C) 2003,2004 by Michael Margraf
</source> </source>
@ -4848,6 +4840,12 @@ Starts component library program</source>
<source>Warnings in last simulation! Press F5</source> <source>Warnings in last simulation! Press F5</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>
Quite Universal Circuit Simulator
</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>QucsLib</name> <name>QucsLib</name>

View File

@ -4424,14 +4424,6 @@ Informations sur le toolkit Qt de Trolltech</translation>
<source>Qucs Version </source> <source>Qucs Version </source>
<translation>Qucs version</translation> <translation>Qucs version</translation>
</message> </message>
<message>
<source>
Qt universal circuit simulator
</source>
<translation>
Simulateur universel sous Qt
</translation>
</message>
<message> <message>
<source>Copyright (C) 2003,2004 by Michael Margraf <source>Copyright (C) 2003,2004 by Michael Margraf
</source> </source>
@ -4840,6 +4832,12 @@ Starts component library program</source>
<source>Warnings in last simulation! Press F5</source> <source>Warnings in last simulation! Press F5</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>
Quite Universal Circuit Simulator
</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>QucsLib</name> <name>QucsLib</name>

View File

@ -4534,11 +4534,9 @@ About Qt by Trolltech</source>
</message> </message>
<message> <message>
<source> <source>
Qt universal circuit simulator Quite Universal Circuit Simulator
</source> </source>
<translation> <translation type="unfinished"></translation>
Qt universal circuit simulator
</translation>
</message> </message>
<message> <message>
<source>Copyright (C) 2003, 2004, 2005 by Michael Margraf <source>Copyright (C) 2003, 2004, 2005 by Michael Margraf

View File

@ -4673,14 +4673,6 @@ Qt a Trolltech-től</translation>
<source>Qucs Version </source> <source>Qucs Version </source>
<translation>Qucs verzió </translation> <translation>Qucs verzió </translation>
</message> </message>
<message>
<source>
Qt universal circuit simulator
</source>
<translation>
Qt univerzális áramkör szimuláció
</translation>
</message>
<message> <message>
<source>Copyright (C) 2003,2004 by Michael Margraf <source>Copyright (C) 2003,2004 by Michael Margraf
</source> </source>
@ -4884,6 +4876,12 @@ Starts component library program</source>
<source>Warnings in last simulation! Press F5</source> <source>Warnings in last simulation! Press F5</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>
Quite Universal Circuit Simulator
</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>QucsLib</name> <name>QucsLib</name>

View File

@ -3800,10 +3800,10 @@ Vuoi salvare i cambiamenti prima di chiuderlo?</translation>
</message> </message>
<message> <message>
<source> <source>
Qt universal circuit simulator Quite Universal Circuit Simulator
</source> </source>
<translation type="obsolete"> <translation type="obsolete">
Qt universal circuit simulator Quite Universal Circuit Simulator
</translation> </translation>
</message> </message>
<message> <message>
@ -5424,10 +5424,10 @@ Informazioni su Qt by Trolltech</translation>
</message> </message>
<message> <message>
<source> <source>
Qt universal circuit simulator Quite Universal Circuit Simulator
</source> </source>
<translation> <translation type="unfinished">
Qt universal circuit simulator Quite Universal Circuit Simulator
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -4539,11 +4539,9 @@ About Qt by Trolltech</source>
</message> </message>
<message> <message>
<source> <source>
Qt universal circuit simulator Quite Universal Circuit Simulator
</source> </source>
<translation> <translation type="unfinished"></translation>
Qt universal circuit simulator
</translation>
</message> </message>
<message> <message>
<source>Copyright (C) 2003,2004 by Michael Margraf <source>Copyright (C) 2003,2004 by Michael Margraf

View File

@ -4490,14 +4490,6 @@ O bibliotece QT firmy Trolltech</translation>
<source>Qucs Version </source> <source>Qucs Version </source>
<translation>Wersja programu Qucs</translation> <translation>Wersja programu Qucs</translation>
</message> </message>
<message>
<source>
Qt universal circuit simulator
</source>
<translation>
Qt uniwersalny symulator obwodów
Qt universal circuit simulator</translation>
</message>
<message> <message>
<source>Copyright (C) 2003,2004 by Michael Margraf <source>Copyright (C) 2003,2004 by Michael Margraf
</source> </source>

View File

@ -4526,11 +4526,9 @@ Sobre Qt por Trolltech</translation>
</message> </message>
<message> <message>
<source> <source>
Qt universal circuit simulator Quite Universal Circuit Simulator
</source> </source>
<translation> <translation type="unfinished"></translation>
Qt universal circuit simulator
</translation>
</message> </message>
<message> <message>
<source>Copyright (C) 2003,2004 by Michael Margraf <source>Copyright (C) 2003,2004 by Michael Margraf

View File

@ -4433,12 +4433,6 @@ Despre Qt la Trolltech</translation>
<source>Qucs Version </source> <source>Qucs Version </source>
<translation>Versiunea Qucs </translation> <translation>Versiunea Qucs </translation>
</message> </message>
<message>
<source>
Qt universal circuit simulator
</source>
<translation></translation>
</message>
<message> <message>
<source>Copyright (C) 2003,2004 by Michael Margraf <source>Copyright (C) 2003,2004 by Michael Margraf
</source> </source>
@ -4825,6 +4819,12 @@ Starts component library program</source>
<source>Warnings in last simulation! Press F5</source> <source>Warnings in last simulation! Press F5</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>
Quite Universal Circuit Simulator
</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>QucsLib</name> <name>QucsLib</name>

View File

@ -4146,12 +4146,6 @@ About Qt by Trolltech</source>
<source>Qucs Version </source> <source>Qucs Version </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>
Qt universal circuit simulator
</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Copyright (C) 2003, 2004, 2005 by Michael Margraf <source>Copyright (C) 2003, 2004, 2005 by Michael Margraf
</source> </source>
@ -4303,6 +4297,12 @@ Starts component library program</source>
<source>Warnings in last simulation! Press F5</source> <source>Warnings in last simulation! Press F5</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>
Quite Universal Circuit Simulator
</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>QucsLib</name> <name>QucsLib</name>

View File

@ -201,7 +201,7 @@ void QucsDoc::setChanged(bool c, bool fillStack, char Op)
while(Curr != UndoStack.last()) while(Curr != UndoStack.last())
UndoStack.remove(); // remove "Redo" items UndoStack.remove(); // remove "Redo" items
if((Op == 'm') || (Op == 'p')) // only one for move marker or edit property if(Op == 'm') // only one for move marker
if(UndoStack.current()->at(0) == Op) if(UndoStack.current()->at(0) == Op)
UndoStack.remove(); UndoStack.remove();
@ -2782,6 +2782,7 @@ bool QucsDoc::undo()
if(UndoSymbol.current() == UndoSymbol.getFirst()) return false; if(UndoSymbol.current() == UndoSymbol.getFirst()) return false;
File.rebuildSymbol(UndoSymbol.prev()); File.rebuildSymbol(UndoSymbol.prev());
adjustPortNumbers(); // set port names
QString *ps = UndoSymbol.current(); QString *ps = UndoSymbol.current();
if(ps != UndoSymbol.getFirst()) App->undo->setEnabled(true); if(ps != UndoSymbol.getFirst()) App->undo->setEnabled(true);
@ -2833,6 +2834,7 @@ bool QucsDoc::redo()
if(UndoSymbol.current() == UndoSymbol.getLast()) return false; if(UndoSymbol.current() == UndoSymbol.getLast()) return false;
File.rebuildSymbol(UndoSymbol.next()); File.rebuildSymbol(UndoSymbol.next());
adjustPortNumbers(); // set port names
QString *ps = UndoSymbol.current(); QString *ps = UndoSymbol.current();
if(ps != UndoSymbol.getFirst()) App->undo->setEnabled(true); if(ps != UndoSymbol.getFirst()) App->undo->setEnabled(true);

View File

@ -848,7 +848,7 @@ void QucsInit::slotHelpAbout()
{ {
QMessageBox::about(App, tr("About..."), QMessageBox::about(App, tr("About..."),
tr("Qucs Version ")+PACKAGE_VERSION+ tr("Qucs Version ")+PACKAGE_VERSION+
tr("\nQt universal circuit simulator\n")+ tr("\nQuite Universal Circuit Simulator\n")+
tr("Copyright (C) 2003, 2004, 2005 by Michael Margraf\n")+ tr("Copyright (C) 2003, 2004, 2005 by Michael Margraf\n")+
"\nThis is free software; see the source for copying conditions." "\nThis is free software; see the source for copying conditions."
"\nThere is NO warranty; not even for MERCHANTABILITY or " "\nThere is NO warranty; not even for MERCHANTABILITY or "

View File

@ -1103,6 +1103,8 @@ void QucsView::MMoveZoomIn(QMouseEvent *Event)
void QucsView::contentsMousePressEvent(QMouseEvent *Event) void QucsView::contentsMousePressEvent(QMouseEvent *Event)
{ {
editText->setHidden(true); // disable text edit of component property editText->setHidden(true); // disable text edit of component property
if(MouseReleaseAction == &QucsView::MReleasePaste)
return;
QucsDoc *d = Docs.current(); QucsDoc *d = Docs.current();
int x = int(float(Event->pos().x())/d->Scale) + d->ViewX1; int x = int(float(Event->pos().x())/d->Scale) + d->ViewX1;
@ -2466,7 +2468,7 @@ void QucsView::slotApplyCompText()
break; // found component with the same name ? break; // found component with the same name ?
if(!pc2) { if(!pc2) {
pc->Name = editText->text(); pc->Name = editText->text();
d->setChanged(true, true, 'p'); // only one undo state d->setChanged(true, true); // only one undo state
} }
} }
} }
@ -2474,7 +2476,7 @@ void QucsView::slotApplyCompText()
if(pp->Value != editText->text()) { if(pp->Value != editText->text()) {
pp->Value = editText->text(); pp->Value = editText->text();
if(MAx3 == 1) d->setComponentNumber(pc); // number for sources, ports if(MAx3 == 1) d->setComponentNumber(pc); // number for sources, ports
d->setChanged(true, true, 'p'); // only one undo state d->setChanged(true, true); // only one undo state
} }
} }
@ -2484,6 +2486,8 @@ void QucsView::slotApplyCompText()
if(!pp) { // was already last property ? if(!pp) { // was already last property ?
editText->setHidden(true); editText->setHidden(true);
viewport()->repaint(); // maybe text is now longer
drawn = false;
return; return;
} }
@ -2493,6 +2497,8 @@ void QucsView::slotApplyCompText()
pp = pc->Props.next(); pp = pc->Props.next();
if(!pp) { // was already last property ? if(!pp) { // was already last property ?
editText->setHidden(true); editText->setHidden(true);
viewport()->repaint(); // maybe text is now longer
drawn = false;
return; return;
} }
} }

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
viewpainter.h - description viewpainter.h
------------------- ---------------
begin : Tue Oct 05 2004 begin : Tue Oct 05 2004
copyright : (C) 2004 by Michael Margraf copyright : (C) 2004 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de email : michael.margraf@alumni.tu-berlin.de
@ -20,11 +20,8 @@
#include <qpainter.h> #include <qpainter.h>
/**
*@author Michael Margraf
*/
/* This class is neccessary because Qt scaled Fonts looks very ungly. /* This class is neccessary because scaled fonts looks very ungly.
Avoiding this is unfortunately not easy. Avoiding this is unfortunately not easy.
This class scales the font point size instead of the font glyphes. This class scales the font point size instead of the font glyphes.
But this has the disadvantage, that the text size does not increase But this has the disadvantage, that the text size does not increase
@ -35,7 +32,7 @@
class ViewPainter { class ViewPainter {
public: public:
ViewPainter(QPainter *p=0); ViewPainter(QPainter *p=0);
~ViewPainter(); ~ViewPainter();
void init(QPainter*, float, int, int, int, int); void init(QPainter*, float, int, int, int, int);
void map(int, int, int*, int*); void map(int, int, int*, int*);