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@915 b5b04e8c-4942-46c9-ab4f-83783d557d1c
This commit is contained in:
margraf 2006-07-03 06:02:09 +00:00
parent 6d176429dc
commit c8a4f73890
103 changed files with 1991 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -26,6 +26,13 @@ files.
Version 0.0.10
--------------
* many, many small bug fixes and improvements
* support for nine-valued VHDL logic
* support for user libraries created from subcircuits
* import of Touchstone, CITI and VCD data files
* export data to CSV files
* creation of project package file for data exchange
Version 0.0.9
-------------

3
qucs-help/docs/en/mathfunc.html
View File

@ -200,7 +200,8 @@ possible values for <tt>"from"</tt> and <tt>"to"</tt> are 'Y', 'Z', 'H', 'G',
<tr><td><i>nodename</i><tt>.Vt</tt></td><td>transient voltage at node <i>nodename</i></td></tr>
<tr><td><i>name</i><tt>.It</tt></td><td>transient current through component <i>name</i></td></tr>
</table>
Note: All voltages and currents are peak values.
Note: All voltages and currents are peak values.<br>
Note: Noise voltages are RMS values at 1Hz bandwidth.
<br><br>
<b>Constants</b>

26
qucs-lib/qucslib.cpp
View File

@ -208,7 +208,7 @@ void QucsLib::slotHelp()
{
DisplayDialog *d = new DisplayDialog(this);
d->setCaption("QucsLib Help");
d->resize(250, 300);
d->resize(250, 325);
d->Text->setText(
tr("QucsLib is a program to manage Qucs component libraries. "
"On the left side of the application window the available "
@ -218,7 +218,9 @@ void QucsLib::slotHelp()
"transported to the Qucs application by clicking on the "
"button \"Copy to Clipboard\". Being back in the schematic "
"window the component can be inserted by pressing CTRL-V "
" (paste from clipboard)."));
" (paste from clipboard).") + "\n" +
tr("A more comfortable way: The component can also be placed "
"onto the schematic by using Drag n'Drop."));
d->show();
}
@ -226,15 +228,9 @@ void QucsLib::slotHelp()
void QucsLib::slotCopyToClipBoard()
{
QString s = "<Qucs Schematic " PACKAGE_VERSION ">\n";
s += "<Components>\n ";
if(ModelString.contains('\n') < 2)
s += ModelString;
else
s += "<Lib " + Symbol->Prefix + " 1 0 0 " +
QString::number(Symbol->Text_x) + " " +
QString::number(Symbol->Text_y) + " 0 0 \"" +
Symbol->LibraryName + "\" 0 \"" + Symbol->ComponentName + "\" 0>\n";
s += "</Components>\n";
s += "<Components>\n " +
Symbol->theModel() +
"\n</Components>\n";
// put resulting schematic into clipboard
QClipboard *cb = QApplication::clipboard();
@ -247,7 +243,7 @@ void QucsLib::slotShowModel()
DisplayDialog *d = new DisplayDialog(this);
d->setCaption("Model");
d->resize(500, 150);
d->Text->setText(ModelString);
d->Text->setText(Symbol->ModelString);
d->Text->setWordWrap(QTextEdit::NoWrap);
d->show();
}
@ -373,11 +369,11 @@ void QucsLib::slotShowComponent(QListBoxItem *Item)
QMessageBox::critical(this, tr("Error"), tr("Library is corrupt."));
return;
}
ModelString =
Symbol->ModelString =
(*CompString).mid(Start, End-Start).replace(QRegExp("\\n\\x20+"), "\n").remove(0, 1);
if(ModelString.contains('\n') < 2)
Symbol->createSymbol(ModelString, LibName, Item->text());
if(Symbol->ModelString.contains('\n') < 2)
Symbol->createSymbol(LibName, Item->text());
}

2
qucs-lib/qucslib.h
View File

@ -75,7 +75,7 @@ private:
SymbolWidget *Symbol;
QTextEdit *CompDescr;
QVBoxLayout *all;
QString ModelString, DefaultSymbol;
QString DefaultSymbol;
QDir QucsHomeDir; // Qucs user directory where all projects are located
};

59
qucs-lib/symbolwidget.cpp
View File

@ -19,13 +19,20 @@
#include <limits.h>
#include <qpainter.h>
#include <qdragobject.h>
#include <qtextstream.h>
#include "symbolwidget.h"
#include "qucslib.h"
const char *empty_xpm[] = { // for drag n'drop
"1 1 1 1", " c None", " "};
SymbolWidget::SymbolWidget(QWidget *parent) : QWidget(parent)
{
myDragObject = 0;
Arcs.setAutoDelete(true);
Lines.setAutoDelete(true);
Rects.setAutoDelete(true);
@ -34,10 +41,13 @@ SymbolWidget::SymbolWidget(QWidget *parent) : QWidget(parent)
Text_x = Text_y = 0;
PaintText = tr("Symbol:");
QFont Font(QucsSettings.font);
QFontMetrics metrics(Font);
QFontMetrics metrics(QucsSettings.font);
TextWidth = metrics.width(PaintText) + 4; // get size of text
DragNDropText = tr("! Drag n'Drop me !");
DragNDropWidth = metrics.width(DragNDropText); // get size of text
TextHeight = metrics.lineSpacing();
setPaletteBackgroundColor(Qt::white);
setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
}
@ -46,12 +56,36 @@ SymbolWidget::~SymbolWidget()
{
}
// ************************************************************
QString SymbolWidget::theModel()
{
if(ModelString.contains('\n') < 2)
return ModelString.remove('\n');
return "<Lib " + Prefix + " 1 0 0 " +
QString::number(Text_x) + " " +
QString::number(Text_y) + " 0 0 \"" +
LibraryName + "\" 0 \"" + ComponentName + "\" 0>";
}
// ************************************************************
void SymbolWidget::mouseMoveEvent(QMouseEvent*)
{
myDragObject = new QTextDrag("QucsComponent:"+theModel(), this);
myDragObject->setPixmap( QPixmap(empty_xpm), QPoint(0, 0) );
myDragObject->dragCopy();
}
// ************************************************************
void SymbolWidget::paintEvent(QPaintEvent*)
{
QPainter Painter(this);
Painter.drawText(2, 2, 0, 0, Qt::AlignAuto | Qt::DontClip, PaintText);
int dx = (x2-x1)/2 + TextWidth - DragNDropWidth/2;
if(dx < 2) dx = 2;
Painter.drawText(dx, y2-y1+2, 0, 0, Qt::AlignAuto | Qt::DontClip, DragNDropText);
// paint all lines
for(Line *pl = Lines.first(); pl != 0; pl = Lines.next()) {
Painter.setPen(pl->style);
@ -93,8 +127,7 @@ void SymbolWidget::paintEvent(QPaintEvent*)
// ************************************************************
// Creates a symbol from the model name of a component.
int SymbolWidget::createSymbol(const QString& ModelString,
const QString& Lib_, const QString& Comp_)
int SymbolWidget::createSymbol(const QString& Lib_, const QString& Comp_)
{
Arcs.clear();
Lines.clear();
@ -261,10 +294,15 @@ int SymbolWidget::createSymbol(const QString& ModelString,
y2 += 4;
cx = -x1 + TextWidth;
cy = -y1;
int dx = x2-x1 + TextWidth;
setMinimumSize(dx, y2-y1);
if((x2-x1) < DragNDropWidth)
dx = (x2-x1 + DragNDropWidth)/2 + TextWidth;
if(dx < DragNDropWidth)
dx = DragNDropWidth;
setMinimumSize(dx, y2-y1 + TextHeight+4);
if(width() > dx) dx = width();
resize(dx, y2-y1);
resize(dx, y2-y1 + TextHeight+4);
update();
return PortNo;
}
@ -309,10 +347,15 @@ int SymbolWidget::setSymbol(const QString& SymbolString,
y2 += 4;
cx = -x1 + TextWidth;
cy = -y1;
int dx = x2-x1 + TextWidth;
setMinimumSize(dx, y2-y1);
if((x2-x1) < DragNDropWidth)
dx = (x2-x1 + DragNDropWidth)/2 + TextWidth;
if(dx < DragNDropWidth)
dx = DragNDropWidth;
setMinimumSize(dx, y2-y1 + TextHeight+4);
if(width() > dx) dx = width();
resize(dx, y2-y1);
resize(dx, y2-y1 + TextHeight+4);
update();
return z; // return number of ports
}

16
qucs-lib/symbolwidget.h
View File

@ -26,6 +26,7 @@
#include <qstring.h>
#include <qptrlist.h>
class QDragObject;
class QPaintEvent;
class QSizePolicy;
@ -72,12 +73,16 @@ public:
SymbolWidget(QWidget *parent = 0);
~SymbolWidget();
QString theModel();
int setSymbol(const QString&, const QString&, const QString&);
int createSymbol(const QString&, const QString&, const QString&);
int createSymbol(const QString&, const QString&);
// component properties
int Text_x, Text_y;
QString Prefix, LibraryName, ComponentName;
QString Prefix, LibraryName, ComponentName, ModelString;
protected:
void mouseMoveEvent(QMouseEvent*);
private:
void paintEvent(QPaintEvent*);
@ -88,8 +93,11 @@ private:
bool getPen (const QString&, QPen&, int);
bool getBrush(const QString&, QBrush&, int);
QString PaintText;
int TextWidth, cx, cy, x1, x2, y1, y2;
QDragObject *myDragObject;
QString PaintText, DragNDropText;
int TextWidth, DragNDropWidth, TextHeight;
int cx, cy, x1, x2, y1, y2;
QPtrList<Line> Lines;
QPtrList<struct Arc> Arcs;
QPtrList<Area> Rects, Ellips;

24
qucs/ChangeLog
View File

@ -1,3 +1,27 @@
2006-06-19 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* fixed bug showing no scrollbar
* support file extension "vhd" as VHDL text file
* fixed bug creating wrong version on loading library components
* library components can be placed onto the schematic via drag n'drop
* rework digital diagram data (vector length > 16 now possible)
* digital diagrams can display analog variables
* tabular can display digital data
* fixed bug in y-Smith chart with |r| > 1
* tried to compensate aliasing in round diagrams
* new action: import data file using qucsconv
* mstee and mscross with port numbers (can also be hidden)
* new action: export graph data to CSV file
* user can create project packages for data exchange
* fixed bug corrupting diagram scrollbar
* remembered last directory the same for most dialogs
* fixed bug missing symbol at second SPICE component
* also delete projects if there are subdirectories
* workaround to catch if SPICE file doesn't exit
* new function: print fit to page
* new print scaling (maybe print problems under MacOS are fixed ???)
* colours for VHDL syntax highlighting changeable in settings dialog
2006-06-10 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* row and column in VHDL editor start with one

BIN
qucs/bitmaps/mscorner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 253 B

BIN
qucs/bitmaps/mscross.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 296 B

BIN
qucs/bitmaps/msmbend.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 272 B

BIN
qucs/bitmaps/mstee.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 286 B

5
qucs/components/ac_sim.cpp
View File

@ -32,8 +32,9 @@ AC_Sim::AC_Sim()
if (a < 8 || s.length() - b < 8) b = -1;
if (b != -1) s[b] = '\n';
Texts.append(new Text(0, 0, s.left(b)));
if (b != -1) Texts.append(new Text(0, 0, s.mid(b+1)));
Texts.append(new Text(0, 0, s.left(b), QPen::darkBlue, QucsSettings.largeFontSize));
if (b != -1)
Texts.append(new Text(0, 0, s.mid(b+1), QPen::darkBlue, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+128; y2 = y1+41;

6
qucs/components/am_modulator.cpp
View File

@ -22,9 +22,9 @@ 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)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -7, -4, 7, 7, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 0, -4, 7, 7,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)));

6
qucs/components/ampere_ac.cpp
View File

@ -22,14 +22,14 @@ Ampere_ac::Ampere_ac()
{
Description = QObject::tr("ideal ac current source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -7, 0, 7, 0,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 6, 0, 0, -4,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 6, 0, 0, 4,QPen(QPen::darkBlue,3)));
Arcs.append(new Arc( 12, 5, 7, 7,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 12, 11, 7, 7, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 12, 5, 6, 6,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 12, 11, 6, 6, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Ports.append(new Port( 30, 0));
Ports.append(new Port(-30, 0));

2
qucs/components/ampere_dc.cpp
View File

@ -22,7 +22,7 @@ Ampere_dc::Ampere_dc()
{
Description = QObject::tr("ideal dc current source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -7, 0, 7, 0,QPen(QPen::darkBlue,3)));

2
qucs/components/ampere_noise.cpp
View File

@ -22,7 +22,7 @@ Ampere_noise::Ampere_noise()
{
Description = QObject::tr("noise current source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -7, 0, 7, 0,QPen(QPen::darkBlue,3)));

6
qucs/components/biast.cpp
View File

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

2
qucs/components/cccs.cpp
View File

@ -22,7 +22,7 @@ CCCS::CCCS()
{
Description = QObject::tr("current controlled current source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(0,-11, 22, 22, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 11, -7, 11, 7,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 11, 6, 15, 1,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 11, 6, 7, 1,QPen(QPen::darkBlue,3)));

2
qucs/components/ccvs.cpp
View File

@ -22,7 +22,7 @@ CCVS::CCVS()
{
Description = QObject::tr("current controlled voltage source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(0,-11, 22, 22, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-12,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-12, 30,QPen(QPen::darkBlue,2)));

4
qucs/components/circulator.cpp
View File

@ -23,12 +23,12 @@ Circulator::Circulator()
{
Description = QObject::tr("circulator");
Arcs.append(new Arc(-14,-14, 29, 29, 0,16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-14,-14, 28, 28, 0,16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-14, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 14, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 14, 0, 30,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -8, -6, 17, 17,16*20,16*150,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -8, -6, 16, 16,16*20,16*150,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 8, 0, 9, -7,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 8, 0, 2, -1,QPen(QPen::darkBlue,2)));

8
qucs/components/coaxialline.cpp
View File

@ -22,14 +22,14 @@ CoaxialLine::CoaxialLine()
{
Description = QObject::tr("coaxial transmission line");
Arcs.append(new Arc(-20, -9, 9, 19, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 11, -9, 9, 19,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-20, -9, 8, 18, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 11, -9, 8, 18,16*270, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-16, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 19, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-16, -9, 16, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-16, 9, 16, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-11, 0, 18, 0,QPen(QPen::darkBlue,1,Qt::DotLine)));
Lines.append(new Line(-11, 0, 19, 0,QPen(QPen::darkBlue,1,Qt::DotLine)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));

26
qucs/components/component.cpp
View File

@ -187,7 +187,7 @@ void Component::paint(ViewPainter *p)
QFont newFont = f;
if(Model.at(0) == '.') { // is simulation component (dc, ac, ...)
newFont.setPointSizeFloat(float(p->Scale) * QucsSettings.largeFontSize);
newFont.setPointSizeFloat(p->Scale * Texts.getFirst()->Size);
newFont.setWeight(QFont::DemiBold);
p->Painter->setFont(newFont);
p->map(cx, cy, x, y);
@ -351,20 +351,16 @@ void Component::paintScheme(QPainter *p)
// -------------------------------------------------------
// For output on a printer device.
void Component::print(ViewPainter *p)
void Component::print(ViewPainter *p, float FontScale)
{
Arc *pa;
for(pa = Arcs.first(); pa != 0; pa = Arcs.next()) {
pa->w -= 1; // to look nice after printing, arcs have to be
pa->h -= 1; // made smaller
}
Text *pt;
for(pt = Texts.first(); pt != 0; pt = Texts.next())
pt->Size *= FontScale;
paint(p);
for(pa = Arcs.first(); pa != 0; pa = Arcs.next()) {
pa->w += 1; // back to old size
pa->h += 1;
}
for(pt = Texts.first(); pt != 0; pt = Texts.next())
pt->Size /= FontScale;
}
// -------------------------------------------------------
@ -395,7 +391,7 @@ void Component::rotate()
for(Arc *p3 = Arcs.first(); p3 != 0; p3 = Arcs.next()) {
tmp = -p3->x;
p3->x = p3->y;
p3->y = tmp - p3->w +1; // +1 is beauty correction
p3->y = tmp - p3->w;
tmp = p3->w;
p3->w = p3->h;
p3->h = tmp;
@ -483,7 +479,7 @@ void Component::mirrorX()
// mirror all arcs
for(Arc *p3 = Arcs.first(); p3 != 0; p3 = Arcs.next()) {
p3->y = -p3->y - p3->h + 1; // +1 is beauty correction
p3->y = -p3->y - p3->h;
if(p3->angle > 16*180) p3->angle -= 16*360;
p3->angle = -p3->angle; // mirror
p3->angle -= p3->arclen; // go back to end of arc
@ -543,7 +539,7 @@ void Component::mirrorY()
// mirror all arcs
for(Arc *p3 = Arcs.first(); p3 != 0; p3 = Arcs.next()) {
p3->x = -p3->x - p3->w + 1; // +1 is beauty correction
p3->x = -p3->x - p3->w;
p3->angle = 16*180 - p3->angle - p3->arclen; // mirror
if(p3->angle < 0) p3->angle += 16*360; // angle has to be > 0
}
@ -1208,7 +1204,7 @@ void GateComponent::createSymbol()
Lines.append(new Line(-5, 3, 5, 3,QPen(QPen::darkBlue,1)));
}
else {
Arcs.append(new Arc(-6,-6, 12, 12, 0, 16*360,QPen(QPen::darkBlue,1)));
Arcs.append(new Arc(-5,-5, 10, 10, 0, 16*360,QPen(QPen::darkBlue,1)));
Lines.append(new Line( 0,-5, 0, 5,QPen(QPen::darkBlue,1)));
}
}

2
qucs/components/component.h
View File

@ -43,7 +43,7 @@ public:
QString getShortenVHDL();
void paint(ViewPainter*);
void paintScheme(QPainter*);
void print(ViewPainter*);
void print(ViewPainter*, float);
void setCenter(int, int, bool relative=false);
void getCenter(int&, int&);
int textSize(int&, int&);

5
qucs/components/dc_sim.cpp
View File

@ -32,8 +32,9 @@ DC_Sim::DC_Sim()
if (a < 8 || s.length() - b < 8) b = -1;
if (b != -1) s[b] = '\n';
Texts.append(new Text(0, 0, s.left(b)));
if (b != -1) Texts.append(new Text(0, 0, s.mid(b+1)));
Texts.append(new Text(0, 0, s.left(b), QPen::darkBlue, QucsSettings.largeFontSize));
if (b != -1)
Texts.append(new Text(0, 0, s.mid(b+1), QPen::darkBlue, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+128; y2 = y1+41;

6
qucs/components/dcfeed.cpp
View File

@ -22,9 +22,9 @@ dcFeed::dcFeed()
{
Description = QObject::tr("dc feed");
Arcs.append(new Arc(-17, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -6, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 5, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-17, -6, 12, 12, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -6, -6, 12, 12, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 5, -6, 12, 12, 0, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-17, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 17, 0, 30, 0,QPen(QPen::darkBlue,2)));

5
qucs/components/digi_sim.cpp
View File

@ -28,8 +28,9 @@ Digi_Sim::Digi_Sim()
int a = s.find(" ");
if (a != -1) s[a] = '\n'; // break line before the word "simulation"
Texts.append(new Text(0, 0, s.left(a)));
if (a != -1) Texts.append(new Text(0, 0, s.mid(a+1)));
Texts.append(new Text(0, 0, s.left(a), QPen::darkBlue, QucsSettings.largeFontSize));
if (a != -1)
Texts.append(new Text(0, 0, s.mid(a+1), QPen::darkBlue, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+120; y2 = y1+59;

4
qucs/components/gyrator.cpp
View File

@ -22,8 +22,8 @@ Gyrator::Gyrator()
{
Description = QObject::tr("gyrator (impedance inverter)");
Arcs.append(new Arc( 2, -9, 19, 19, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21, -9, 19, 19,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 3, -9, 18, 18, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21, -9, 18, 18,16*270, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-12,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-12, 30,QPen(QPen::darkBlue,2)));

5
qucs/components/hb_sim.cpp
View File

@ -27,8 +27,9 @@ HB_Sim::HB_Sim()
int a = s.findRev(" ");
if (a != -1) s[a] = '\n'; // break line before the word "simulation"
Texts.append(new Text(0, 0, s.left(a)));
if (a != -1) Texts.append(new Text(0, 0, s.mid(a+1)));
Texts.append(new Text(0, 0, s.left(a), QPen::darkBlue, QucsSettings.largeFontSize));
if (a != -1)
Texts.append(new Text(0, 0, s.mid(a+1), QPen::darkBlue, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+163; y2 = y1+59;

6
qucs/components/inductor.cpp
View File

@ -22,9 +22,9 @@ Inductor::Inductor()
{
Description = QObject::tr("inductor");
Arcs.append(new Arc(-18, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -6, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 6, -6, 13, 13, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-18, -6, 12, 12, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -6, -6, 12, 12, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 6, -6, 12, 12, 0, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));

2
qucs/components/iprobe.cpp
View File

@ -38,7 +38,7 @@ iProbe::iProbe()
Lines.append(new Line(-16,-27,-16, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 16,-27, 16, -9,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-20,-23, 40, 40, 16*50, 16*80,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-20,-23, 39, 39, 16*50, 16*80,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-11,-24, -2, -9,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));

2
qucs/components/ipulse.cpp
View File

@ -22,7 +22,7 @@ iPulse::iPulse()
{
Description = QObject::tr("ideal current pulse source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -7, 0, 7, 0,QPen(QPen::darkBlue,3)));

2
qucs/components/irect.cpp
View File

@ -22,7 +22,7 @@ iRect::iRect()
{
Description = QObject::tr("ideal rectangle current source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -7, 0, 7, 0,QPen(QPen::darkBlue,3)));

5
qucs/components/libcomp.cpp
View File

@ -102,11 +102,12 @@ int LibComp::loadSection(const QString& Name, QString& Section)
if(Section.left(14) != "<Qucs Library ") // wrong file type ?
return -2;
QString Line = Section.mid(14, Line.length()-15);
int Start, End = Section.find(' ', 14);
if(End < 15) return -3;
QString Line = Section.mid(14, End-14);
if(!checkVersion(Line)) // wrong version number ?
return -3;
int Start, End;
if(Name == "Symbol") {
Start = Section.find("\n<", 14); // if library has default symbol, take it
if(Start > 0)

2
qucs/components/mscorner.cpp
View File

@ -31,8 +31,6 @@ MScorner::MScorner()
Lines.append(new Line( 8, -8, 8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -8, 18, 8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-22, -4,-26, 4,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 0,30));

2
qucs/components/mscoupled.cpp
View File

@ -40,8 +40,6 @@ MScoupled::MScoupled()
Lines.append(new Line(-15, 4,-25, 20,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 21, 4, 11, 20,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-22,-16,-26, -8,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30,-30));
Ports.append(new Port( 30,-30));
Ports.append(new Port( 30, 30));

78
qucs/components/mscross.cpp
View File

@ -22,6 +22,46 @@ MScross::MScross()
{
Description = QObject::tr("microstrip cross");
Model = "MCROSS";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true,
QObject::tr("substrate")));
Props.append(new Property("W1", "1 mm", true,
QObject::tr("width of line 1")));
Props.append(new Property("W2", "2 mm", true,
QObject::tr("width of line 2")));
Props.append(new Property("W3", "1 mm", true,
QObject::tr("width of line 3")));
Props.append(new Property("W4", "2 mm", true,
QObject::tr("width of line 4")));
Props.append(new Property("Symbol", "showNumbers", false,
QObject::tr("show port numbers in symbol or not")+
" [showNumbers, noNumbers]"));
createSymbol();
}
MScross::~MScross()
{
}
Component* MScross::newOne()
{
return new MScross();
}
Element* MScross::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Microstrip Cross");
BitmapFile = "mscross";
if(getNewOne) return new MScross();
return 0;
}
void MScross::createSymbol()
{
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 18, 0, 30,QPen(QPen::darkBlue,2)));
@ -43,7 +83,12 @@ MScross::MScross()
Lines.append(new Line( 8,-18, 8, -8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -8,-18, 8,-18,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-22, -4,-26, 4,QPen(QPen::darkBlue,2)));
if(Props.getLast()->Value.at(0) != 'n') {
Texts.append(new Text(-26, 3, "1"));
Texts.append(new Text(-10,-30, "2"));
Texts.append(new Text( 21,-13, "3"));
Texts.append(new Text( 4, 18, "4"));
}
Ports.append(new Port(-30, 0));
Ports.append(new Port( 0,-30));
@ -55,35 +100,4 @@ MScross::MScross()
tx = x1+4;
ty = y2+4;
Model = "MCROSS";
Name = "MS";
Props.append(new Property("Subst", "Subst1", true,
QObject::tr("substrate")));
Props.append(new Property("W1", "1 mm", true,
QObject::tr("width of line 1")));
Props.append(new Property("W2", "2 mm", true,
QObject::tr("width of line 2")));
Props.append(new Property("W3", "1 mm", true,
QObject::tr("width of line 3")));
Props.append(new Property("W4", "2 mm", true,
QObject::tr("width of line 4")));
}
MScross::~MScross()
{
}
Component* MScross::newOne()
{
return new MScross();
}
Element* MScross::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Microstrip Cross");
BitmapFile = "mscross";
if(getNewOne) return new MScross();
return 0;
}

11
qucs/components/mscross.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
mscross.h - description
-------------------
mscross.h
-----------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -21,12 +21,15 @@
#include "component.h"
class MScross : public Component {
class MScross : public MultiViewComponent {
public:
MScross();
~MScross();
~MScross();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
protected:
void createSymbol();
};
#endif

2
qucs/components/msline.cpp
View File

@ -29,8 +29,6 @@ MSline::MSline()
Lines.append(new Line(-13, -8,-23, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 23, -8, 13, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-22, -4,-26, 4,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));

2
qucs/components/msmbend.cpp
View File

@ -32,8 +32,6 @@ MSmbend::MSmbend()
Lines.append(new Line( 8, 8, 8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -8, 18, 8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-22, -4,-26, 4,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 0,30));

2
qucs/components/msopen.cpp
View File

@ -28,8 +28,6 @@ MSopen::MSopen()
Lines.append(new Line(-13, -8,-23, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 13, -8, 3, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-22, -4,-26, 4,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));
x1 = -30; y1 =-11;

50
qucs/components/mstee.cpp
View File

@ -22,28 +22,10 @@ MStee::MStee()
{
Description = QObject::tr("microstrip tee");
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 18, 0, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, -8, 18, -8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 8, -8, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 8, 8, 18, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, -8,-18, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, -8, 18, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -8, 8, -8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 8, 8, 8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -8, 18, 8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-22, -4,-26, 4,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
Ports.append(new Port( 0,30));
x1 = -30; y1 = -11;
x2 = 30; y2 = 30;
QFontMetrics metrics(QucsSettings.font); // get size of text
QFontMetrics metrics(QucsSettings.font); // get size of text
tx = x1+4;
ty = y1 - 5*metrics.lineSpacing() - 4;
Model = "MTEE";
@ -65,6 +47,11 @@ MStee::MStee()
"Yamashita, Hammerstad, Getsinger, Schneider, Pramanick]"));
Props.append(new Property("Temp", "26.85", false,
QObject::tr("temperature in degree Celsius")));
Props.append(new Property("Symbol", "showNumbers", false,
QObject::tr("show port numbers in symbol or not")+
" [showNumbers, noNumbers]"));
createSymbol();
}
MStee::~MStee()
@ -84,3 +71,28 @@ Element* MStee::info(QString& Name, char* &BitmapFile, bool getNewOne)
if(getNewOne) return new MStee();
return 0;
}
void MStee::createSymbol()
{
Lines.append(new Line(-30, 0,-18, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 0, 18, 0, 30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, -8, 18, -8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, 8, -8, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 8, 8, 18, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-18, -8,-18, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, -8, 18, 8,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -8, 8, -8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 8, 8, 8, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -8, 18, 8, 18,QPen(QPen::darkBlue,2)));
if(Props.getLast()->Value.at(0) != 'n') {
Texts.append(new Text(-26, 3, "1"));
Texts.append(new Text( 21, 3, "2"));
Texts.append(new Text( 4,18, "3"));
}
Ports.append(new Port(-30, 0));
Ports.append(new Port( 30, 0));
Ports.append(new Port( 0,30));
}

11
qucs/components/mstee.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
mstee.h - description
-------------------
mstee.h
---------
begin : Sat Aug 23 2003
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -21,12 +21,15 @@
#include "component.h"
class MStee : public Component {
class MStee : public MultiViewComponent {
public:
MStee();
~MStee();
~MStee();
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
protected:
void createSymbol();
};
#endif

2
qucs/components/msvia.cpp
View File

@ -22,7 +22,7 @@ MSvia::MSvia()
{
Description = QObject::tr("microstrip via");
Arcs.append(new Arc(-5,-4, 10, 8, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-5,-4, 10, 7, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-20, 0, -5, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -5, 0, -5, 14,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 5, 0, 5, 14,QPen(QPen::darkBlue,2)));

12
qucs/components/mutual.cpp
View File

@ -22,12 +22,12 @@ Mutual::Mutual()
{
Description = QObject::tr("two mutual inductors");
Arcs.append(new Arc(-16,-18,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, -6,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 6,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-18,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, -6,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 6,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-18,-10,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-30,-30,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-18, 10,-30,QPen(QPen::darkBlue,2)));

18
qucs/components/mutual2.cpp
View File

@ -22,15 +22,15 @@ Mutual2::Mutual2()
{
Description = QObject::tr("three mutual inductors");
Arcs.append(new Arc(-16,-58,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-46,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-34,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 46,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 34,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 22,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-58,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-46,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-34,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 46,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 34,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 22,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-58,-10,-70,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-70,-30,-70,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-18, 10,-30,QPen(QPen::darkBlue,2)));

4
qucs/components/noise_ii.cpp
View File

@ -23,7 +23,7 @@ Noise_ii::Noise_ii()
Description = QObject::tr("correlated current sources");
// left noise source
Arcs.append(new Arc(-42,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-42,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 7,-30, -7,QPen(QPen::darkBlue,3)));
@ -38,7 +38,7 @@ Noise_ii::Noise_ii()
Lines.append(new Line(-18, 1,-31,-12,QPen(QPen::darkBlue,2)));
// right noise source
Arcs.append(new Arc( 18,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 18,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 30, 30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30,-30, 30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 7, 30, -7,QPen(QPen::darkBlue,3)));

4
qucs/components/noise_iv.cpp
View File

@ -23,7 +23,7 @@ Noise_iv::Noise_iv()
Description = QObject::tr("correlated current sources");
// left noise source
Arcs.append(new Arc(-42,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-42,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-30,-12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 7,-30, -7,QPen(QPen::darkBlue,3)));
@ -38,7 +38,7 @@ Noise_iv::Noise_iv()
Lines.append(new Line(-18, 1,-31,-12,QPen(QPen::darkBlue,2)));
// right noise source
Arcs.append(new Arc( 18,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 18,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 30, 30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30,-30, 30,-12,QPen(QPen::darkBlue,2)));

4
qucs/components/noise_vv.cpp
View File

@ -23,7 +23,7 @@ Noise_vv::Noise_vv()
Description = QObject::tr("correlated current sources");
// left noise source
Arcs.append(new Arc(-42,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-42,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-30,-12,QPen(QPen::darkBlue,2)));
@ -33,7 +33,7 @@ Noise_vv::Noise_vv()
Lines.append(new Line(-18, 2,-32,-12,QPen(QPen::darkBlue,2)));
// right noise source
Arcs.append(new Arc( 18,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 18,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 30, 30, 12,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30,-30, 30,-12,QPen(QPen::darkBlue,2)));

5
qucs/components/param_sweep.cpp
View File

@ -27,8 +27,9 @@ Param_Sweep::Param_Sweep()
int a = s.findRev(" ");
if (a != -1) s[a] = '\n'; // break line
Texts.append(new Text(0, 0, s.left(a)));
if (a != -1) Texts.append(new Text(0, 0, s.mid(a+1)));
Texts.append(new Text(0, 0, s.left(a), QPen::darkBlue, QucsSettings.largeFontSize));
if (a != -1)
Texts.append(new Text(0, 0, s.mid(a+1), QPen::darkBlue, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+104; y2 = y1+59;

2
qucs/components/phaseshifter.cpp
View File

@ -26,7 +26,7 @@ Phaseshifter::Phaseshifter()
Lines.append(new Line(-14, 14, 14, 14,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-14,-14,-14, 14,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 14,-14, 14, 14,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -9, -9, 18, 18, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -9, -9, 17, 17, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 10, 10,-10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-14, 0,QPen(QPen::darkBlue,2)));

6
qucs/components/pm_modulator.cpp
View File

@ -22,9 +22,9 @@ 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)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -7, -4, 7, 7, 0, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 0, -4, 7, 7,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)));

2
qucs/components/relais.cpp
View File

@ -35,7 +35,7 @@ Relais::Relais()
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)));
Arcs.append(new Arc( 27,-18, 5, 5, 0, 16*360,QPen(QPen::darkBlue,2)));
Ellips.append(new Area( 27, 12, 6, 6, QPen(QPen::darkBlue,2),
QBrush(Qt::darkBlue, Qt::SolidPattern)));

6
qucs/components/source_ac.cpp
View File

@ -27,9 +27,9 @@ Source_ac::Source_ac()
Lines.append(new Line(-22,-11,-22, 11,QPen(QPen::darkGray,0)));
Lines.append(new Line( 22,-11, 22, 11,QPen(QPen::darkGray,0)));
Arcs.append(new Arc(-19, -9, 19, 19, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-13, -6, 7, 7,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-13, 0, 7, 7, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-19, -9, 18, 18, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-13, -6, 6, 6,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-13, 0, 6, 6, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-19, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 19, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( -1, 0, 3, 0,QPen(QPen::darkBlue,2)));

5
qucs/components/sp_sim.cpp
View File

@ -31,8 +31,9 @@ SP_Sim::SP_Sim()
}
if (b != -1) s[b] = '\n';
Texts.append(new Text(0, 0, s.left(b)));
if (b != -1) Texts.append(new Text(0, 0, s.mid(b+1)));
Texts.append(new Text(0, 0, s.left(b), QPen::darkBlue, QucsSettings.largeFontSize));
if (b != -1)
Texts.append(new Text(0, 0, s.mid(b+1), QPen::darkBlue, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+121; y2 = y1+59;

9
qucs/components/spicedialog.cpp
View File

@ -217,7 +217,6 @@ void SpiceDialog::slotButtApply()
}
}
static QString lastDir; // to remember last directory and file
// -------------------------------------------------------------------------
void SpiceDialog::slotButtBrowse()
{
@ -227,12 +226,12 @@ void SpiceDialog::slotButtBrowse()
this, "", tr("Select a file"));
if(s.isEmpty()) return;
lastDir = s; // remember last directory and file
QFileInfo Info(s);
lastDir = Info.dirPath(true); // remember last directory
// snip path if file in current directory
QFileInfo FileInfo(s);
if(QucsWorkDir.exists(FileInfo.fileName()) &&
QucsWorkDir.absPath() == FileInfo.dirPath(true)) s = FileInfo.fileName();
if(QucsWorkDir.exists(Info.fileName()) &&
QucsWorkDir.absPath() == Info.dirPath(true)) s = Info.fileName();
FileEdit->setText(s);
Comp->Props.at(1)->Value = "";

4
qucs/components/spicefile.cpp
View File

@ -50,7 +50,9 @@ SpiceFile::SpiceFile()
// -------------------------------------------------------
Component* SpiceFile::newOne()
{
return new SpiceFile();
SpiceFile *p = new SpiceFile();
p->recreate(0); // createSymbol() is NOT called in constructor !!!
return p;
}
// -------------------------------------------------------

4
qucs/components/subcirport.cpp
View File

@ -47,8 +47,8 @@ void SubCirPort::createSymbol()
x2 = 0; y2 = 8;
if(Props.at(1)->Value.at(0) == 'a') {
Arcs.append(new Arc(-25, -6, 13, 13, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-14, 0, 0, 0,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-25, -6, 12, 12, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-13, 0, 0, 0,QPen(QPen::darkBlue,2)));
}
else {
Lines.append(new Line( -9, 0, 0, 0,QPen(QPen::darkBlue,2)));

2
qucs/components/switch.cpp
View File

@ -95,7 +95,7 @@ void Switch::createSymbol()
Lines.append(new Line(-30, 0,-15, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 17, 0, 30, 0,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 12, -3, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 12, -3, 5, 5, 0, 16*360,QPen(QPen::darkBlue,2)));
Ellips.append(new Area(-18, -3, 6, 6, QPen(QPen::darkBlue,2),
QBrush(Qt::darkBlue, Qt::SolidPattern)));

24
qucs/components/symtrafo.cpp
View File

@ -22,15 +22,15 @@ symTrafo::symTrafo()
{
Description = QObject::tr("ideal symmetrical transformer");
Arcs.append(new Arc(-16,-58,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-46,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-34,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 46,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 34,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 22,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-58,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-46,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-34,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 46,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 34,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 22,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-58,-10,-70,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-70,-30,-70,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-18, 10,-30,QPen(QPen::darkBlue,2)));
@ -52,9 +52,9 @@ symTrafo::symTrafo()
Texts.append(new Text(-23, 22,"T2"));
// mark the turn direction
Arcs.append(new Arc(-21,-64, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21, 15, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 15,-24, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21,-64, 5, 5, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21, 15, 5, 5, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 15,-24, 5, 5, 0, 16*360,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30,-70));
Ports.append(new Port( 30,-30));

6
qucs/components/tline.cpp
View File

@ -22,11 +22,11 @@ TLine::TLine()
{
Description = QObject::tr("ideal transmission line");
Arcs.append(new Arc(-20, -9, 9, 19, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 11, -9, 9, 19,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-20, -9, 8, 18, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 11, -9, 8, 18,16*270, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-16, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 19, 0, 30, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-16, -9, 16, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-16, 9, 16, 9,QPen(QPen::darkBlue,2)));

5
qucs/components/tr_sim.cpp
View File

@ -27,8 +27,9 @@ TR_Sim::TR_Sim()
int a = s.find(" ");
if (a != -1) s[a] = '\n';
Texts.append(new Text(0, 0, s.left(a)));
if (a != -1) Texts.append(new Text(0, 0, s.mid(a+1)));
Texts.append(new Text(0, 0, s.left(a), QPen::darkBlue, QucsSettings.largeFontSize));
if (a != -1)
Texts.append(new Text(0, 0, s.mid(a+1), QPen::darkBlue, QucsSettings.largeFontSize));
x1 = -10; y1 = -9;
x2 = x1+104; y2 = y1+59;

16
qucs/components/transformer.cpp
View File

@ -22,12 +22,12 @@ Transformer::Transformer()
{
Description = QObject::tr("ideal transformer");
Arcs.append(new Arc(-16,-18,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, -6,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 6,13,13, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,13,13, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16,-18,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, -6,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-16, 6,12,12, 16*270,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4,-18,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, -6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 4, 6,12,12, 16*90,16*180, QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-18,-10,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10,-30,-30,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 10,-18, 10,-30,QPen(QPen::darkBlue,2)));
@ -40,8 +40,8 @@ Transformer::Transformer()
Lines.append(new Line( 1,-20, 1, 20,QPen(QPen::darkBlue,1)));
Texts.append(new Text(-21, -18,"T"));
Arcs.append(new Arc(-21,-24, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 15,-24, 6, 6, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-21,-24, 5, 5, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( 15,-24, 5, 5, 0, 16*360,QPen(QPen::darkBlue,2)));
Ports.append(new Port(-30,-30));

8
qucs/components/vccs.cpp
View File

@ -22,7 +22,7 @@ VCCS::VCCS()
{
Description = QObject::tr("voltage controlled current source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(0,-11, 22, 22, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 11, -7, 11, 7,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 11, 6, 15, 1,QPen(QPen::darkBlue,3)));
Lines.append(new Line( 11, 6, 7, 1,QPen(QPen::darkBlue,3)));
@ -37,9 +37,9 @@ VCCS::VCCS()
Lines.append(new Line( 11,-30, 11,-11,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 11, 30, 11, 11,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12,-18,-12, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 18,-17, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 18, -8, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12,-18,-12, 18,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-12, 18,-17, 9,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-12, 18, -7, 9,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-25,-27, 25,-27,QPen(QPen::darkGray,1)));
Lines.append(new Line( 25,-27, 25, 27,QPen(QPen::darkGray,1)));

8
qucs/components/vcvs.cpp
View File

@ -22,7 +22,7 @@ VCVS::VCVS()
{
Description = QObject::tr("voltage controlled voltage source");
Arcs.append(new Arc(0,-11, 23, 23, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(0,-11, 22, 22, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30,-30,-12,-30,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-12, 30,QPen(QPen::darkBlue,2)));
@ -34,9 +34,9 @@ VCVS::VCVS()
Lines.append(new Line( 11,-30, 11,-11,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 11, 30, 11, 11,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12,-18,-12, 18,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 18,-17, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12, 18, -8, 9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-12,-18,-12, 18,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-12, 18,-17, 9,QPen(QPen::darkBlue,1)));
Lines.append(new Line(-12, 18, -7, 9,QPen(QPen::darkBlue,1)));
Lines.append(new Line( 19,-21, 19,-15,QPen(QPen::red,1)));
Lines.append(new Line( 16,-18, 22,-18,QPen(QPen::red,1)));

6
qucs/components/volt_ac.cpp
View File

@ -22,9 +22,9 @@ Volt_ac::Volt_ac()
{
Description = QObject::tr("ideal ac voltage source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -3, -7, 8, 8,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -3, 0, 8, 8, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -3, -7, 7, 7,16*270, 16*180,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc( -3, 0, 7, 7, 16*90, 16*180,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 5, 18, 11,QPen(QPen::red,1)));

2
qucs/components/volt_noise.cpp
View File

@ -22,7 +22,7 @@ Volt_noise::Volt_noise()
{
Description = QObject::tr("noise voltage source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));

2
qucs/components/vprobe.cpp
View File

@ -32,7 +32,7 @@ vProbe::vProbe()
Lines.append(new Line(-16,-27,-16, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 16,-27, 16, -9,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-20,-23, 40, 40, 16*50, 16*80,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-20,-23, 39, 39, 16*50, 16*80,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-11,-24, -2, -9,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-10, 0,-10, 6,QPen(QPen::red,2)));

2
qucs/components/vpulse.cpp
View File

@ -22,7 +22,7 @@ vPulse::vPulse()
{
Description = QObject::tr("ideal voltage pulse source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 5, 18, 11,QPen(QPen::red,1)));

2
qucs/components/vrect.cpp
View File

@ -22,7 +22,7 @@ vRect::vRect()
{
Description = QObject::tr("ideal rectangle voltage source");
Arcs.append(new Arc(-12,-12, 25, 25, 0, 16*360,QPen(QPen::darkBlue,2)));
Arcs.append(new Arc(-12,-12, 24, 24, 0, 16*360,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 0,-12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 30, 0, 12, 0,QPen(QPen::darkBlue,2)));
Lines.append(new Line( 18, 5, 18, 11,QPen(QPen::red,1)));

137
qucs/diagrams/diagram.cpp
View File

@ -115,7 +115,7 @@ void Diagram::paint(ViewPainter *p)
// paint all arcs (1 pixel larger to compensate for strange circle method)
for(struct Arc *pa = Arcs.first(); pa != 0; pa = Arcs.next()) {
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, pa->h, pa->angle, pa->arclen);
}
Graph *pg;
@ -660,19 +660,24 @@ bool Diagram::ResizeTouched(int x, int y)
// --------------------------------------------------------------------------
void Diagram::loadGraphData(const QString& defaultDataSet)
{
int yNum = yAxis.numGraphs;
int zNum = zAxis.numGraphs;
yAxis.numGraphs = zAxis.numGraphs = 0;
yAxis.min = zAxis.min = xAxis.min = DBL_MAX;
yAxis.max = zAxis.max = xAxis.max = -DBL_MAX;
int No = 0;
int No=0;
for(Graph *pg = Graphs.first(); pg != 0; pg = Graphs.next()) {
if(loadVarData(defaultDataSet, pg) != 1) // load data, determine max/min values
if(loadVarData(defaultDataSet, pg) == 1) // load data, determine max/min values
No++;
pg->lastLoaded = QDateTime::currentDateTime();
}
if(No < 1) // Are dataset files unchanged ?
if(No > 0) { // Are dataset files unchanged ?
yAxis.numGraphs = yNum; // rebuild scrollbar position
zAxis.numGraphs = zNum;
return; // -> no update neccessary
}
if(xAxis.min > xAxis.max)
xAxis.min = xAxis.max = 0.0;
@ -800,9 +805,9 @@ int Diagram::loadVarData(const QString& fileName, Graph *g)
QFileInfo Info(fileName);
int pos = g->Var.find(':');
if(g->Var.right(3) == "].X") // e.g. stdl[8:0].X
if(pos > g->Var.find('['))
pos = -1;
// if(g->Var.right(3) == "].X") // e.g. stdl[8:0].X
// if(pos > g->Var.find('['))
// pos = -1;
if(pos <= 0) {
file.setName(fileName);
@ -816,12 +821,16 @@ int Diagram::loadVarData(const QString& fileName, Graph *g)
Info.setFile(file);
if(g->lastLoaded.isValid())
if(g->lastLoaded > Info.lastModified())
return 1;
return 1; // dataset unchanged -> no update neccessary
g->countY = 0;
g->cPointsX.clear();
if(g->cPointsY) { delete[] g->cPointsY; g->cPointsY = 0; }
if(g->Var.isEmpty()) return 0;
if(Variable.isEmpty()) return 0;
if(Variable.right(2) == ".X")
if(Name.at(0) != 'T')
return 0; // digital variables only for tabulars and ziming diagram
if(!file.open(IO_ReadOnly)) return 0;
@ -974,40 +983,28 @@ if(Variable.right(3) != ".X ")
else { // of "if not digital"
char *pc = (char*)p;
pEnd = pc + 2*(counting-1)*sizeof(double);
// for digital variables (e.g. 100ZX0):
long long lx;
for(int z=counting; z>0; z--) {
while((*pPos) && (*pPos <= ' ')) pPos++; // find start of next number
while((*pPos) && (*pPos <= ' ')) pPos++; // find start of next bit vector
if(*pPos == 0) {
delete[] g->cPointsY; g->cPointsY = 0;
return 0;
}
pEnd = pPos;
while(*pEnd > ' ') pEnd++; // find end of number
lx = 0;
while(pPos < pEnd) {
lx <<= 4;
switch(*pPos) {
case '0': lx |= 1; break;
case '1': lx |= 2; break;
case 'Z': lx |= 3; break;
case 'X': lx |= 4; break;
case 'U': lx |= 5; break;
case 'W': lx |= 6; break;
case 'L': lx |= 7; break;
case 'H': lx |= 8; break;
case '-': lx |= 9; break;
default:
delete[] g->cPointsY; g->cPointsY = 0;
return 0;
while(*pPos > ' ') { // copy bit vector
*(pc++) = *(pPos++);
if(pEnd <= pc) {
counting = pc - (char*)g->cPointsY;
pEnd = pc = (char*)g->cPointsY =
(char*)realloc(g->cPointsY, counting+1024);
pc += counting;
pEnd += counting+1020;
}
pPos++;
}
*((long long*)(p++)) = lx;
*((long long*)(p++)) = 0;
*(pc++) = 0; // terminate each vector with NULL
}
} // of "if not digital"
@ -1396,44 +1393,43 @@ void Diagram::createSmithChart(Axis *Axis, int Mode)
double rMAXq = Axis->up*Axis->up;
int theta, beta, phi, len, m, x, y;
int R1 = int(x2/Axis->up + 0.5);
// ....................................................
// draw arcs with im(z)=const
for(m=1; m<GridY; m++) {
n_sin = M_PI*double(m)/double(GridY);
n_cos = cos(n_sin);
n_sin = sin(n_sin);
im = (1-n_cos)/n_sin * pow(Axis->up,0.7); // up^0.7 is beauty correction
x = int((1-im)/Axis->up*dx2);
y = int(im/Axis->up*x2);
im = (1.0-n_cos)/n_sin * pow(Axis->up,0.7); // up^0.7 is beauty correction
y = int(im/Axis->up*x2 + 0.5); // diameter
if(Axis->up <= 1.0) { // Smith chart with |r|=1
beta = int(16.0*180.0*atan2(n_sin-im,n_cos-1)/M_PI - 0.5);
beta = int(16.0*180.0*atan2(n_sin-im,n_cos-1.0)/M_PI - 0.5);
if(beta<0) beta += 16*360;
theta = 16*270-beta;
}
else { // Smith chart with |r|>1
im = 1/im;
real = (rMAXq+1)/(rMAXq-1);
root = real*real - im*im-1;
if(root<0) { // circle lies completely within the Smith chart ?
beta = 0; // yes, ...
theta = 16*360; // ... draw whole circle
im = 1.0/im;
real = (rMAXq+1.0)/(rMAXq-1.0);
root = real*real - im*im - 1.0;
if(root < 0.0) { // circle lies completely within the Smith chart ?
beta = 0; // yes, ...
theta = 16*360; // ... draw whole circle
}
else {
// calculate both intersections with most outer circle
real1 = sqrt(root)-real;
real2 = -sqrt(root)-real;
root = (real1+1)*(real1+1) + im*im;
n_cos = (real1*real1 + im*im - 1) / root;
n_sin = 2*im / root;
beta = int(16.0*180.0*atan2(n_sin-1/im,n_cos-1)/M_PI);
root = (real1+1.0)*(real1+1.0) + im*im;
n_cos = (real1*real1 + im*im - 1.0) / root;
n_sin = 2.0*im / root;
beta = int(16.0*180.0*atan2(n_sin-1.0/im,n_cos-1.0)/M_PI);
if(beta<0) beta += 16*360;
root = (real2+1)*(real2+1) + im*im;
n_cos = (real2*real2 + im*im - 1) / root;
n_sin = 2*im / root;
root = (real2+1.0)*(real2+1.0) + im*im;
n_cos = (real2*real2 + im*im - 1.0) / root;
n_sin = 2.0*im / root;
theta = int(16.0*180.0*atan2(n_sin-1/im,n_cos-1)/M_PI);
if(theta<0) theta += 16*360;
theta = theta - beta; // arc length
@ -1442,9 +1438,9 @@ void Diagram::createSmithChart(Axis *Axis, int Mode)
}
if(Zplane)
x += dx2;
x = (x2 + R1 - y) >> 1;
else {
x -= dx2;
x = (x2 - R1 - y) >> 1;
beta = 16*180 - beta - theta; // mirror
if(beta < 0) beta += 16*360; // angle has to be > 0
}
@ -1464,13 +1460,14 @@ void Diagram::createSmithChart(Axis *Axis, int Mode)
for(m=1; m<GridX; m++) {
im = m*(Axis->up+1.0)/GridX - Axis->up;
x = int(im/Axis->up*double(dx2) + 0.5); // center
y = int((1.0-im)/Axis->up*double(dx2)); // diameter
y = int((1.0-im)/Axis->up*double(dx2) + 0.5); // diameter
if(Zplane) x += dx2;
else x = 0;
if(Zplane)
x = ((x2+R1)>>1) - y;
else
x = (x2-R1)>>1;
if(fabs(fabs(im)-1.0) > 0.2) // if too near to |r|=1, it looks ugly
Arcs.append(new struct Arc(x, dx2+(y>>1), y, y, beta, theta, GridPen));
Arcs.append(new struct Arc(x, (x2+y)>>1, y, y, beta, theta, GridPen));
if(Axis->up > 1.0) { // draw arcs on the rigth-handed side ?
im = 1.0-im;
@ -1478,14 +1475,14 @@ void Diagram::createSmithChart(Axis *Axis, int Mode)
if(Zplane) x += y;
else x -= y;
if(im >= 1.0)
Arcs.append(new struct Arc(x, dx2+(y>>1), y, y, beta, theta, GridPen));
Arcs.append(new struct Arc(x, (x2+y)>>1, y, y, beta, theta, GridPen));
else {
phi = int(16.0*180.0/M_PI*acos(im));
len = 16*180-phi;
if(Above && Below) len += len;
else if(Below) phi = 16*180;
if(!Zplane) phi += 16*180;
Arcs.append(new struct Arc(x, dx2+(y>>1), y, y, phi, len, GridPen));
phi = int(16.0*180.0/M_PI*acos(im));
len = 16*180-phi;
if(Above && Below) len += len;
else if(Below) phi = 16*180;
if(!Zplane) phi += 16*180;
Arcs.append(new struct Arc(x, (x2+y)>>1, y, y, phi, len, GridPen));
}
}
}
@ -1493,15 +1490,13 @@ void Diagram::createSmithChart(Axis *Axis, int Mode)
// ....................................................
if(Axis->up > 1.0) { // draw circle with |r|=1 ?
x = int(x2/Axis->up + 0.5);
Arcs.append(new struct Arc(dx2-(x>>1), dx2+(x>>1), x, x, beta, theta,
QPen(QPen::black,0)));
x = (x2-R1) >> 1;
y = (x2+R1) >> 1;
Arcs.append(new struct Arc(x, y, R1, R1, beta, theta, QPen(QPen::black,0)));
// vertical line Re(r)=1 (visible only if |r|>1)
x = int(x2/Axis->up + 0.5) >> 1;
if(Zplane) x = y;
y = int(sqrt(rMAXq-1)/Axis->up*dx2 + 0.5);
if(Zplane) x += dx2;
else x = dx2 - x;
if(Above) m = y;
else m = 0;
if(!Below) y = 0;

3
qucs/diagrams/marker.cpp
View File

@ -36,7 +36,6 @@ Marker::Marker(Diagram *Diag_, Graph *pg_, int _nn, int cx_, int cy_)
Diag = Diag_;
pGraph = pg_;
Precision = 3; // before createText()
lookNfeel = 1;
numMode = nVarPos = 0;
cx = cx_; cy = -cy_;
@ -518,9 +517,7 @@ Marker* Marker::sameNewOne(Graph *pGraph_)
pm->VarPos[z] = VarPos[z];
pm->Text = Text;
pm->lookNfeel = lookNfeel;
pm->transparent = transparent;
pm->Precision = Precision;
pm->numMode = numMode;

11
qucs/diagrams/marker.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
marker.h - description
-------------------
marker.h
----------
begin : Sat Apr 10 2004
copyright : (C) 2003 by Michael Margraf
email : michael.margraf@alumni.tu-berlin.de
@ -25,18 +25,14 @@
#include <qpainter.h>
#include <qvaluelist.h>
class Diagram;
class Graph;
/**
*@author Michael Margraf
*/
class Marker : public Element {
public:
Marker(Diagram *Diag_, Graph *pg_=0, int _nn=0, int cx_=0, int cy_=0);
~Marker();
~Marker();
void initText(int);
void createText();
@ -60,7 +56,6 @@ public:
double VarPos[256]; // values the marker is pointing to
QString Text; // the string to be displayed in the marker text
int lookNfeel; // different marker designs possible
bool transparent; // background shines through marker body
int Precision; // number of digits to show

4
qucs/diagrams/polardiagram.cpp
View File

@ -44,8 +44,8 @@ void PolarDiagram::calcCoordinate(double* &, double* &yD, double* &,
{
double yr = *(yD++);
double yi = *(yD++);
*px = (x2>>1)+int(yr/yAxis.up*double(x2)/2.0 + 0.5);
*py = (y2>>1)+int(yi/yAxis.up*double(y2)/2.0 + 0.5);
*px = int((yr/yAxis.up + 1.0)*double(x2)/2.0 + 0.5);
*py = int((yi/yAxis.up + 1.0)*double(y2)/2.0 + 0.5);
}
// --------------------------------------------------------------

4
qucs/diagrams/psdiagram.cpp
View File

@ -46,8 +46,8 @@ void PSDiagram::calcCoordinate(double* &, double* &yD, double* &,
{
double yr = *(yD++);
double yi = *(yD++);
*px = (x2>>1)+int(yr/pa->up*double(x2)/2.0 + 0.5);
*py = (y2>>1)+int(yi/pa->up*double(y2)/2.0 + 0.5);
*px = int((yr/pa->up + 1.0)*double(x2)/2.0 + 0.5);
*py = int((yi/pa->up + 1.0)*double(y2)/2.0 + 0.5);
}
// --------------------------------------------------------------

4
qucs/diagrams/smithdiagram.cpp
View File

@ -47,8 +47,8 @@ void SmithDiagram::calcCoordinate(double* &, double* &yD, double* &,
{
double yr = *(yD++);
double yi = *(yD++);
*px = (x2>>1)+int(yr/yAxis.up*double(x2)/2.0 + 0.5);
*py = (y2>>1)+int(yi/yAxis.up*double(y2)/2.0 + 0.5);
*px = int((yr/yAxis.up + 1.0)*double(x2)/2.0 + 0.5);
*py = int((yi/yAxis.up + 1.0)*double(y2)/2.0 + 0.5);
}
// ------------------------------------------------------------

55
qucs/diagrams/tabdiagram.cpp
View File

@ -75,7 +75,7 @@ void TabDiagram::paint(ViewPainter *p)
Points.setPoints(3, x, dy, (x+dx)>>1, y, dx, dy);
p->Painter->drawConvexPolygon(Points);
p->Painter->setPen(QColor(224, 224, 224));
p->drawLine(x, dy, (x+dx)>>1, y);
p->Painter->drawLine(x, dy, (x+dx)>>1, y);
p->drawLine(cx-15, by, cx-2, by);
p->drawLine(cx-15, by, cx-15, by + zAxis.numGraphs);
@ -85,9 +85,9 @@ void TabDiagram::paint(ViewPainter *p)
Points.setPoints(3, x, y-dy, (x+dx)>>1, y, dx, y-dy);
p->Painter->drawConvexPolygon(Points);
p->Painter->setPen(QColor(208, 208, 208));
p->drawLine(x, y-dy, (x+dx)>>1, y);
p->Painter->drawLine(x, y-dy, (x+dx)>>1, y);
p->Painter->setPen(QColor(224, 224, 224));
p->drawLine(x, y-dy, dx, y-dy);
p->Painter->drawLine(x, y-dy, dx, y-dy);
p->Painter->setBrush(QBrush(Qt::NoBrush));
}
@ -211,7 +211,8 @@ if(g) if(!g->cPointsX.isEmpty()) {
firstGraph = g;
// ................................................
for(g = Graphs.first(); g!=0; g = Graphs.next()) {// all dependent variables
// all dependent variables
for(g = Graphs.first(); g!=0; g = Graphs.next()) {
y = y2-tHeight-5;
colWidth = 0;
@ -228,22 +229,44 @@ if(g) if(!g->cPointsX.isEmpty()) {
if(sameDependencies(g, firstGraph)) {
int z=g->cPointsX.getFirst()->count * g->countY;
if(z > NumAll) NumAll = z;
for(; z>0; z--) {
py += 2;
if(startWriting-- > 0) continue; // reached visible area ?
if(y < tHeight) break; // no room for more rows ?
switch(g->numMode) {
case 0: Str = complexRect(*py, *(py+1), g->Precision); break;
case 1: Str = complexDeg (*py, *(py+1), g->Precision); break;
case 2: Str = complexRad (*py, *(py+1), g->Precision); break;
if(g->Var.right(2) != ".X")
for(; z>0; z--) {
py += 2;
if(startWriting-- > 0) continue; // reached visible area ?
if(y < tHeight) break; // no room for more rows ?
switch(g->numMode) {
case 0: Str = complexRect(*py, *(py+1), g->Precision); break;
case 1: Str = complexDeg (*py, *(py+1), g->Precision); break;
case 2: Str = complexRad (*py, *(py+1), g->Precision); break;
}
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) goto funcEnd;
Texts.append(new Text(x, y, Str));
y -= tHeight;
}
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) goto funcEnd;
else { // digital data
char *pcy = (char*)g->cPointsY;
for(; z>0; z--) {
if(startWriting-- > 0) { // reached visible area ?
pcy += strlen(pcy) + 1;
continue;
}
if(y < tHeight) break; // no room for more rows ?
Str = QString(pcy);
Texts.append(new Text(x, y, Str));
y -= tHeight;
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) goto funcEnd;
Texts.append(new Text(x, y, Str));
pcy += strlen(pcy) + 1;
y -= tHeight;
}
}
if(z > NumLeft) NumLeft = z;
} // of "if(sameDeps)"
else {

271
qucs/diagrams/timingdiagram.cpp
View File

@ -78,7 +78,7 @@ void TimingDiagram::paint(ViewPainter *p)
Points.setPoints(3, x, (y+dy)>>1, dx, y, dx, dy);
p->Painter->drawConvexPolygon(Points);
p->Painter->setPen(QColor(224, 224, 224));
p->drawLine(x, (y+dy)>>1, dx, y);
p->Painter->drawLine(x, (y+dy)>>1, dx, y);
p->drawLine(cx+yAxis.numGraphs, cy+2, bx, cy+2);
p->drawLine(cx+yAxis.numGraphs, cy+2, cx+yAxis.numGraphs, cy+15);
@ -88,9 +88,9 @@ void TimingDiagram::paint(ViewPainter *p)
Points.setPoints(3, x, (y+dy)>>1, x-dx, y, x-dx, dy);
p->Painter->drawConvexPolygon(Points);
p->Painter->setPen(QColor(208, 208, 208));
p->drawLine(x-dx, y, x, (y+dy)>>1);
p->Painter->drawLine(x-dx, y, x, (y+dy)>>1);
p->Painter->setPen(QColor(224, 224, 224));
p->drawLine(x-dx, y, x-dx, dy);
p->Painter->drawLine(x-dx, y, x-dx, dy);
p->Painter->setBrush(QBrush(Qt::NoBrush));
}
@ -159,23 +159,24 @@ int TimingDiagram::calcDiagram()
// First check the maximum bit number of all vectors.
colWidth = 0;
long long Value;
for(g = Graphs.first(); g!=0; g = Graphs.next())
if(g->cPointsY) {
z = 0;
Value = *((long long*)g->cPointsY);
while((Value & 15) != 0) {
z++; // count number of "bits"
Value >>= 4;
if(g->cPointsY)
if(g->Var.right(2) == ".X") {
z = strlen((char*)g->cPointsY);
if(z > colWidth)
colWidth = z;
}
else {
z = 8;
if(z > colWidth)
colWidth = z;
}
if(z > colWidth)
colWidth = z;
}
int TimeStepWidth = colWidth * metrics.width("X") + 8;
if(TimeStepWidth < 40)
TimeStepWidth = 40;
colWidth = 0;
if(!firstGraph->cPointsX.isEmpty()) {
// ................................................
if(firstGraph->cPointsX.count() > 1) {
@ -196,7 +197,7 @@ if(!firstGraph->cPointsX.isEmpty()) {
Texts.append(new Text(x, y2-2, Str));
y -= 3;
y -= 5;
// write all dependent variable names to get width of first column
for(g = Graphs.first(); g!=0; g = Graphs.next()) {
if(y < tHeight) break;
@ -204,7 +205,7 @@ if(!firstGraph->cPointsX.isEmpty()) {
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) return 1;
Texts.append(new Text(x, y, Str)); // dependent variable
y -= tHeight;
y -= tHeight + 2;
}
x += colWidth + 13;
xAxis.numGraphs = x -6;
@ -258,130 +259,134 @@ if(!firstGraph->cPointsX.isEmpty()) {
x = xStart + 5;
colWidth = 0;
if(g->cPointsY) {
px = g->cPointsY;
if(sameDependencies(g, firstGraph)) {
Pen = QPen(g->Color, g->Thick); // default is solid line
switch(g->Style) {
case 1: Pen.setStyle(Qt::DashLine); break;
case 2: Pen.setStyle(Qt::DotLine); break;
}
z = int(xAxis.limit_min);
px += 2*z;
if(g->Var.right(3) != "].X") { // vector or single bit ?
// It is single "bit".
yLast = 0;
if(z > 0) yLast += 2; // vertical line before first value ?
switch(*((long long*)(px-yLast)) & 15) { // high or low ?
case 1: // low
yLast = tHeight - 5;
break;
case 2: // high
yLast = 1;
break;
default:
yLast = 1 + ((tHeight - 6) >> 1);
}
z = g->cPointsX.getFirst()->count - z;
for( ; z>0; z--) {
Value = *((long long*)px) & 15;
yNow = 1 + ((tHeight - 6) >> 1);
switch(Value) {
case 1: // low
yNow = tHeight - 5;
break;
case 2: // high
yNow = 1;
break;
case 3: Str = "Z"; break;
case 4: Str = "X"; break;
case 5: Str = "U"; break;
case 6: Str = "W"; break;
case 7: Str = "L"; break;
case 8: Str = "H"; break;
case 9: Str = "-"; break;
default: Str = "*";
}
if(yLast != yNow)
Lines.append(new Line(x, y-yLast, x, y-yNow, Pen));
if(x+TimeStepWidth >= x2) break;
if(Value < 3)
Lines.append(new Line(x, y-yNow, x+TimeStepWidth, y-yNow, Pen));
else {
Texts.append(new Text(x+(TimeStepWidth>>1)-3, y, Str));
Lines.append(new Line(x+3, y-1, x+TimeStepWidth-3, y-1, Pen));
Lines.append(new Line(x+3, y-tHeight+5, x+TimeStepWidth-3, y-tHeight+5, Pen));
Lines.append(new Line(x, y-yNow, x+3, y-1, Pen));
Lines.append(new Line(x, y-yNow, x+3, y-tHeight+5, Pen));
Lines.append(new Line(x+TimeStepWidth-3, y-1, x+TimeStepWidth, y-yNow, Pen));
Lines.append(new Line(x+TimeStepWidth-3, y-tHeight+5, x+TimeStepWidth, y-yNow, Pen));
}
yLast = yNow;
x += TimeStepWidth;
px += 2;
}
}
else { // It is a bit vector.
z = g->cPointsX.getFirst()->count - z;
yNow = 1 + ((tHeight - 6) >> 1);
Lines.append(new Line(x, y-yNow, x+2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x, y-yNow, Pen));
for( ; z>0; z--) {
if(x+TimeStepWidth >= x2) break;
Lines.append(new Line(x+2, y-1, x+TimeStepWidth-2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x+TimeStepWidth-2, y-tHeight+5, Pen));
Str = "";
Value = *((long long*)px);
while((Value & 15) != 0) {
switch(Value & 15) {
case 1: Str = "0" + Str; break;
case 2: Str = "1" + Str; break;
case 3: Str = "Z" + Str; break;
case 4: Str = "X" + Str; break;
case 5: Str = "U" + Str; break;
case 6: Str = "W" + Str; break;
case 7: Str = "L" + Str; break;
case 8: Str = "H" + Str; break;
case 9: Str = "-" + Str; break;
default: Str = "*" + Str;
}
Value >>= 4;
}
Texts.append(new Text(x+3, y, Str));
x += TimeStepWidth;
px += 2;
Lines.append(new Line(x-2, y-tHeight+5, x+2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x-2, y-1, Pen));
}
}
} // of "if(sameDeps)"
else {
Str = QObject::tr("wrong dependency");
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) goto funcEnd;
Texts.append(new Text(x, y, Str));
}
}
else { // no data in graph
if(g->cPointsY == 0) {
Str = QObject::tr("no data");
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) goto funcEnd;
Texts.append(new Text(x, y, Str));
y -= tHeight;
continue;
}
if(!sameDependencies(g, firstGraph)) {
Str = QObject::tr("wrong dependency");
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) goto funcEnd;
Texts.append(new Text(x, y, Str));
y -= tHeight;
continue;
}
Pen = QPen(g->Color, g->Thick); // default is solid line
switch(g->Style) {
case 1: Pen.setStyle(Qt::DashLine); break;
case 2: Pen.setStyle(Qt::DotLine); break;
}
z = int(xAxis.limit_min);
if(g->Var.right(2) != ".X") { // not digital variable ?
px = g->cPointsY;
px += 2 * z;
z = g->cPointsX.getFirst()->count - z;
yNow = 1 + ((tHeight - 6) >> 1);
Lines.append(new Line(x, y-yNow, x+2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x, y-yNow, Pen));
for( ; z>0; z--) {
if(x+TimeStepWidth >= x2) break;
Lines.append(new Line(x+2, y-1, x+TimeStepWidth-2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x+TimeStepWidth-2, y-tHeight+5, Pen));
// output magnitude of (complex) number
Texts.append(new Text(x+3, y,
QString::number(sqrt((*px)*(*px) + (*(px+1))*(*(px+1))))));
px += 2;
x += TimeStepWidth;
Lines.append(new Line(x-2, y-tHeight+5, x+2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x-2, y-1, Pen));
}
y -= tHeight;
continue;
}
// digital variable !!!
char *pcx = (char*)g->cPointsY;
pcx += z * (strlen(pcx)+1);
if(strlen(pcx) < 2) { // vector or single bit ?
// It is single "bit".
yLast = 0;
if(z > 0) yLast += 2; // vertical line before first value ?
switch(*(pcx-yLast)) { // high or low ?
case '0': // low
yLast = tHeight - 5;
break;
case '1': // high
yLast = 1;
break;
default:
yLast = 1 + ((tHeight - 6) >> 1);
}
z = g->cPointsX.getFirst()->count - z;
for( ; z>0; z--) {
switch(*pcx) {
case '0': // low
yNow = tHeight - 5;
break;
case '1': // high
yNow = 1;
break;
default:
yNow = 1 + ((tHeight - 6) >> 1);
}
if(yLast != yNow)
Lines.append(new Line(x, y-yLast, x, y-yNow, Pen));
if(x+TimeStepWidth >= x2) break;
if((*pcx & 254) == '0')
Lines.append(new Line(x, y-yNow, x+TimeStepWidth, y-yNow, Pen));
else {
Texts.append(new Text(x+(TimeStepWidth>>1)-3, y, QString(pcx)));
Lines.append(new Line(x+3, y-1, x+TimeStepWidth-3, y-1, Pen));
Lines.append(new Line(x+3, y-tHeight+5, x+TimeStepWidth-3, y-tHeight+5, Pen));
Lines.append(new Line(x, y-yNow, x+3, y-1, Pen));
Lines.append(new Line(x, y-yNow, x+3, y-tHeight+5, Pen));
Lines.append(new Line(x+TimeStepWidth-3, y-1, x+TimeStepWidth, y-yNow, Pen));
Lines.append(new Line(x+TimeStepWidth-3, y-tHeight+5, x+TimeStepWidth, y-yNow, Pen));
}
yLast = yNow;
x += TimeStepWidth;
pcx += 2;
}
}
else { // It is a bit vector !!!
z = g->cPointsX.getFirst()->count - z;
yNow = 1 + ((tHeight - 6) >> 1);
Lines.append(new Line(x, y-yNow, x+2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x, y-yNow, Pen));
for( ; z>0; z--) {
if(x+TimeStepWidth >= x2) break;
Lines.append(new Line(x+2, y-1, x+TimeStepWidth-2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x+TimeStepWidth-2, y-tHeight+5, Pen));
Texts.append(new Text(x+3, y, QString(pcx)));
x += TimeStepWidth;
pcx += strlen(pcx) + 1;
Lines.append(new Line(x-2, y-tHeight+5, x+2, y-1, Pen));
Lines.append(new Line(x+2, y-tHeight+5, x-2, y-1, Pen));
}
}
y -= tHeight;
}
} // of "for(Graphs...)"
funcEnd:

85
qucs/diagrams/truthdiagram.cpp
View File

@ -73,7 +73,7 @@ int TruthDiagram::calcDiagram()
int NumAll=0; // how many numbers per column
int NumLeft=0; // how many numbers could not be written
double *py;
char *py;
int counting, invisibleCount=0;
int startWriting, z;
@ -128,7 +128,7 @@ if(g) if(!g->cPointsX.isEmpty()) {
} // of "if no data in graphs"
int digitWidth;
int zi, digitWidth;
firstGraph = g;
// ................................................
// all dependent variables
@ -142,51 +142,58 @@ if(g) if(!g->cPointsX.isEmpty()) {
startWriting = int(xAxis.limit_min); // when to reach visible area
py = g->cPointsY - 2;
if(g->cPointsX.getFirst()) {
if(sameDependencies(g, firstGraph)) {
counting = 0;
long long Value = *((long long*)(py+2));
while((Value & 15) != 0) {
counting++; // count number of "bits"
Value >>= 4;
}
digitWidth = metrics.width("X") + 2;
if((x+digitWidth*counting) >= x2) { // enough space for "bit vector" ?
checkColumnWidth("0", metrics, 0, x2, y);
goto funcEnd;
}
if(g->Var.right(2) != ".X") { // not a digital variable ?
double *pdy = g->cPointsY - 2;
for(z = NumAll; z>0; z--) {
pdy += 2;
if(startWriting-- > 0) continue; // reached visible area ?
if(y < tHeight) break; // no room for more rows ?
Str = QString::number(sqrt((*pdy)*(*pdy) + (*(pdy+1))*(*(pdy+1))));
for(z = NumAll; z>0; z--) {
py += 2;
if(startWriting-- > 0) continue; // reached visible area ?
if(y < tHeight) break; // no room for more rows ?
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
if(colWidth < 0) goto funcEnd;
Value = *((long long*)py);
for(int zi=counting-1; zi>=0; zi--) {
switch(Value & 15) {
case 1: Str = "0"; break;
case 2: Str = "1"; break;
case 3: Str = "Z"; break;
case 4: Str = "X"; break;
case 5: Str = "U"; break;
case 6: Str = "W"; break;
case 7: Str = "L"; break;
case 8: Str = "H"; break;
case 9: Str = "-"; break;
default: Str = "*";
}
Texts.append(new Text( x + zi*digitWidth, y, Str));
Value >>= 4;
Texts.append(new Text(x, y, Str));
y -= tHeight;
}
y -= tHeight;
}
digitWidth *= counting;
if(colWidth < digitWidth)
colWidth = digitWidth;
// if(z > NumLeft) NumLeft = z;
else { // digital variable !!!
py = (char*)g->cPointsY;
counting = strlen((char*)py); // count number of "bits"
digitWidth = metrics.width("X") + 2;
if((x+digitWidth*counting) >= x2) { // enough space for "bit vector" ?
checkColumnWidth("0", metrics, 0, x2, y);
goto funcEnd;
}
for(z = NumAll; z>0; z--) {
if(startWriting-- > 0) { // reached visible area ?
py += counting + 1;
continue;
}
if(y < tHeight) break; // no room for more rows ?
zi = 0;
while(*py) {
Str = *(py++);
Texts.append(new Text(x + zi, y, Str));
zi += digitWidth;
}
py++;
y -= tHeight;
}
digitWidth *= counting;
if(colWidth < digitWidth)
colWidth = digitWidth;
}
} // of "if(sameDeps)"
else {
Str = QObject::tr("wrong dependency");

5
qucs/dialogs/Makefile.am
View File

@ -26,14 +26,15 @@ noinst_LIBRARIES = libdialogs.a
MOCHEADERS = messagebox.h settingsdialog.h simmessage.h qucssettingsdialog.h \
labeldialog.h changedialog.h matchdialog.h digisettingsdialog.h \
sweepdialog.h searchdialog.h librarydialog.h
sweepdialog.h searchdialog.h librarydialog.h importdialog.h \
packagedialog.h
MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
libdialogs_a_SOURCES = messagebox.cpp settingsdialog.cpp newprojdialog.cpp \
simmessage.cpp qucssettingsdialog.cpp labeldialog.cpp changedialog.cpp \
matchdialog.cpp sweepdialog.cpp digisettingsdialog.cpp searchdialog.cpp \
librarydialog.cpp
librarydialog.cpp importdialog.cpp packagedialog.cpp
nodist_libdialogs_a_SOURCES = $(MOCFILES)

182
qucs/dialogs/importdialog.cpp Normal file
View File

@ -0,0 +1,182 @@
/***************************************************************************
importdialog.cpp
------------------
begin : Fri Jun 23 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 <qhbox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qtextedit.h>
#include <qvgroupbox.h>
#include <qfiledialog.h>
#include <qpushbutton.h>
#include <qmessagebox.h>
#include "importdialog.h"
#include "main.h"
#include "qucs.h"
ImportDialog::ImportDialog(QWidget *parent)
: QDialog(parent, 0, FALSE, Qt::WDestructiveClose)
{
setCaption(tr("Import Data File..."));
all = new QGridLayout(this, 4, 3, 5, 3);
all->addWidget(new QLabel(tr("Import File:"), this), 0, 0);
ImportEdit = new QLineEdit(this);
all->addWidget(ImportEdit, 0, 1);
QPushButton *BrowseButt = new QPushButton(tr("Browse"), this);
all->addWidget(BrowseButt, 0, 2);
connect(BrowseButt, SIGNAL(clicked()), SLOT(slotBrowse()));
all->addWidget(new QLabel(tr("Output File:"), this), 1, 0);
OutputEdit = new QLineEdit(this);
all->addWidget(OutputEdit, 1, 1);
QVGroupBox *Group1 = new QVGroupBox(tr("Messages"),this);
all->addMultiCellWidget(Group1, 2,2, 0,2);
MsgText = new QTextEdit(Group1);
MsgText->setTextFormat(Qt::PlainText);
MsgText->setReadOnly(true);
MsgText->setWordWrap(QTextEdit::NoWrap);
MsgText->setMinimumSize(250, 60);
QHBox *Butts = new QHBox(this);
all->addMultiCellWidget(Butts, 3,3, 0,2);
Butts->setStretchFactor(new QWidget(Butts), 5); // stretchable placeholder
ImportButt = new QPushButton(tr("Import"), Butts);
connect(ImportButt, SIGNAL(clicked()), SLOT(slotImport()));
CancelButt = new QPushButton(tr("Cancel"), Butts);
connect(CancelButt, SIGNAL(clicked()), SLOT(reject()));
}
ImportDialog::~ImportDialog()
{
if(Process.isRunning()) Process.kill();
delete all;
}
// ------------------------------------------------------------------------
void ImportDialog::slotBrowse()
{
QString s = QFileDialog::getOpenFileName(
lastDir.isEmpty() ? QString(".") : lastDir,
tr("All known")+" (*.s?p *.citi *.cit *.vcd);;"+
tr("Touchstone")+" (*.s?p);;"+
tr("CITI")+" (*.citi *.cit);;"+
tr("VCD")+" (*.vcd);;"+
tr("Any File")+" (*)",
this, 0, tr("Enter a Data File Name"));
if(!s.isEmpty()) {
QFileInfo Info(s);
lastDir = Info.dirPath(true); // remember last directory
ImportEdit->setText(s);
if(OutputEdit->text().isEmpty())
OutputEdit->setText(Info.baseName()+".dat");
}
}
// ------------------------------------------------------------------------
void ImportDialog::slotImport()
{
MsgText->clear();
QFile File(QucsWorkDir.filePath(OutputEdit->text()));
if(File.exists())
if(QMessageBox::information(this, tr("Info"),
tr("Output file already exists!")+"\n"+tr("Overwrite it?"),
tr("&Yes"), tr("&No"), 0,1,1))
return;
QFileInfo Info(ImportEdit->text());
QString Prefix = Info.extension();
QStringList CommandLine;
CommandLine << QucsSettings.BinDir + "qucsconv" << "-if";
if((Prefix == "citi") || (Prefix == "cit"))
CommandLine << "citi";
else if(Prefix == "vcd")
CommandLine << "vcd";
else for(;;) {
if(Prefix.at(0) == 's')
if(Prefix.at(2) == 'p')
if(Prefix.length() == 3)
if(Prefix.at(1).isDigit()) {
CommandLine << "touchstone";
break;
}
MsgText->append(tr("ERROR: Unknown file format! Please check file name extension!"));
return;
}
CommandLine << "-of" << "qucsdata" << "-i" << ImportEdit->text()
<< "-o" << QucsWorkDir.filePath(OutputEdit->text());
Process.setArguments(CommandLine);
disconnect(&Process, 0, 0, 0);
connect(&Process, SIGNAL(readyReadStderr()), SLOT(slotDisplayErr()));
connect(&Process, SIGNAL(readyReadStdout()), SLOT(slotDisplayMsg()));
connect(&Process, SIGNAL(processExited()), SLOT(slotProcessEnded()));
if(!Process.start())
MsgText->append(tr("ERROR: Cannot start simulator!"));
}
// ------------------------------------------------------------------------
// Is called when the process sends an output to stdout.
void ImportDialog::slotDisplayMsg()
{
int par = MsgText->paragraphs();
int idx = MsgText->paragraphLength(par-1);
MsgText->setCursorPosition(par-1,idx);
MsgText->insert(QString(Process.readStdout()));
}
// ------------------------------------------------------------------------
// Is called when the process sends an output to stderr.
void ImportDialog::slotDisplayErr()
{
int par = MsgText->paragraphs();
int idx = MsgText->paragraphLength(par-1);
MsgText->setCursorPosition(par-1,idx);
MsgText->insert(QString(Process.readStderr()));
}
// ------------------------------------------------------------------------
// Is called when the simulation process terminates.
void ImportDialog::slotProcessEnded()
{
MsgText->append(" ");
if(Process.normalExit()) {
MsgText->append(tr("Successfully imported file!"));
ImportButt->setDisabled(true);
CancelButt->setText(tr("Close"));
disconnect(CancelButt, SIGNAL(clicked()), 0, 0);
connect(CancelButt, SIGNAL(clicked()), SLOT(accept()));
}
else
MsgText->append(tr("Converter ended with errors!"));
}

55
qucs/dialogs/importdialog.h Normal file
View File

@ -0,0 +1,55 @@
/***************************************************************************
importdialog.h
----------------
begin : Fri Jun 23 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 IMPORTDIALOG_H
#define IMPORTDIALOG_H
#include <qdialog.h>
#include <qprocess.h>
class QTextEdit;
class QLineEdit;
class QGridLayout;
class QPushButton;
class ImportDialog : public QDialog {
Q_OBJECT
public:
ImportDialog(QWidget*);
~ImportDialog();
private slots:
void slotDisplayMsg();
void slotDisplayErr();
void slotProcessEnded();
void slotImport();
void slotBrowse();
private:
void startSimulator();
public:
QGridLayout *all;
QProcess Process;
QTextEdit *MsgText;
QLineEdit *ImportEdit, *OutputEdit;
QPushButton *ImportButt, *CancelButt;
};
#endif

9
qucs/dialogs/librarydialog.cpp
View File

@ -49,7 +49,7 @@ LibraryDialog::LibraryDialog(QucsApp *App_, QListViewItem *SchematicList)
Validator = new QRegExpValidator(Expr, this);
// ...........................................................
QVBoxLayout *all = new QVBoxLayout(this);
all = new QVBoxLayout(this);
all->setMargin(5);
all->setSpacing(6);
@ -106,6 +106,7 @@ LibraryDialog::LibraryDialog(QucsApp *App_, QListViewItem *SchematicList)
LibraryDialog::~LibraryDialog()
{
delete all;
delete Validator;
}
@ -194,7 +195,7 @@ void LibraryDialog::slotNext()
connect(ButtCreate, SIGNAL(clicked()), SLOT(accept()));
if(!LibFile.open(IO_WriteOnly)) {
ErrText->insert(tr("Error: Cannot create library!"));
ErrText->append(tr("Error: Cannot create library!"));
return;
}
QTextStream Stream;
@ -217,7 +218,7 @@ void LibraryDialog::slotNext()
Schematic *Doc = new Schematic(0, QucsWorkDir.filePath(p->text()));
if(!Doc->loadDocument()) { // load document if possible
delete Doc;
ErrText->insert(tr("Error: Cannot load subcircuit \"%1\".").arg(p->text()));
ErrText->append(tr("Error: Cannot load subcircuit \"%1\".").arg(p->text()));
break;
}
Doc->DocName = NameEdit->text() + "_" + p->text();
@ -244,5 +245,5 @@ void LibraryDialog::slotNext()
return;
}
ErrText->insert(tr("\nSuccessfully created library."));
ErrText->append(tr("\nSuccessfully created library."));
}

466
qucs/dialogs/packagedialog.cpp Normal file
View File

@ -0,0 +1,466 @@
/***************************************************************************
packagedialog.cpp
-------------------
begin : Sun Jun 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. *
* *
***************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "packagedialog.h"
#include "qucs.h"
#include "main.h"
#include <qhbox.h>
#include <qvbox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qtextedit.h>
#include <qcheckbox.h>
#include <qfiledialog.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
#include <qscrollview.h>
#include <qdatastream.h>
#include <qvbuttongroup.h>
#define HEADER_LENGTH 32
#define CODE_ERROR 0x0000
#define CODE_DIR 0x0010
#define CODE_DIR_END 0x0018
#define CODE_FILE 0x0020
#define CODE_LIBRARY 0x0040
PackageDialog::PackageDialog(QWidget *parent_, bool create_)
: QDialog(parent_, 0, TRUE, Qt::WDestructiveClose)
{
all = new QVBoxLayout(this);
all->setMargin(5);
all->setSpacing(6);
QHBox *h2 = new QHBox(this);
if(create_) { // create or extract package ?
setCaption(tr("Create Project Package"));
QHBox *h1 = new QHBox(this);
all->addWidget(h1);
new QLabel(tr("Package:"), h1);
NameEdit = new QLineEdit(h1);
QPushButton *ButtBrowse = new QPushButton(tr("Browse"), h1);
connect(ButtBrowse, SIGNAL(clicked()), SLOT(slotBrowse()));
LibraryCheck = new QCheckBox(tr("include user libraries"), this);
all->addWidget(LibraryCheck);
Group = new QVButtonGroup(tr("Choose projects:"), this);
all->addWidget(Group);
QScrollView *Dia_Scroll = new QScrollView(Group);
Dia_Scroll->setMargin(5);
QVBox *Dia_Box = new QVBox(Dia_Scroll->viewport());
Dia_Scroll->addChild(Dia_Box);
// ...........................................................
all->addWidget(h2);
QPushButton *ButtCreate = new QPushButton(tr("Create"), h2);
connect(ButtCreate, SIGNAL(clicked()), SLOT(slotCreate()));
QPushButton *ButtCancel = new QPushButton(tr("Cancel"), h2);
connect(ButtCancel, SIGNAL(clicked()), SLOT(reject()));
// ...........................................................
// insert all projects
QStringList PrDirs = QucsHomeDir.entryList("*", QDir::Dirs, QDir::Name);
QStringList::iterator it;
for(it = PrDirs.begin(); it != PrDirs.end(); it++)
if((*it).right(4) == "_prj") // project directories end with "_prj"
BoxList.append(new QCheckBox((*it).left((*it).length()-4), Dia_Box));
QColor theColor;
if(BoxList.isEmpty()) {
ButtCreate->setEnabled(false);
theColor =
(new QLabel(tr("No projects!"), Dia_Box))->paletteBackgroundColor();
}
else
theColor = BoxList.current()->paletteBackgroundColor();
Dia_Scroll->viewport()->setPaletteBackgroundColor(theColor);
}
else { // of "if(create_)"
setCaption(tr("Extract Project Package"));
MsgText = new QTextEdit(this);
MsgText->setTextFormat(Qt::PlainText);
MsgText->setWordWrap(QTextEdit::NoWrap);
MsgText->setReadOnly(true);
all->addWidget(MsgText);
all->addWidget(h2);
h2->setStretchFactor(new QWidget(h2), 5); // stretchable placeholder
ButtClose = new QPushButton(tr("Close"), h2);
ButtClose->setDisabled(true);
connect(ButtClose, SIGNAL(clicked()), SLOT(accept()));
resize(400, 250);
}
}
PackageDialog::~PackageDialog()
{
delete all;
}
// ---------------------------------------------------------------
void PackageDialog::slotBrowse()
{
QString s = QFileDialog::getSaveFileName(
lastDir.isEmpty() ? QString(".") : lastDir,
tr("Qucs Packages")+" (*.qucs);;"+
tr("Any File")+" (*)",
this, 0, tr("Enter a Package File Name"));
if(s.isEmpty()) return;
QFileInfo Info(s);
lastDir = Info.dirPath(true); // remember last directory
if(Info.extension().isEmpty())
s += ".qucs";
NameEdit->setText(s);
}
// ***************************************************************
// ***** Functions for creating package *****
// ***************************************************************
int PackageDialog::insertFile(const QString& FileName, QFile& File,
QDataStream& Stream)
{
QByteArray FileContent;
if(!File.open(IO_ReadOnly)) {
QMessageBox::critical(this, tr("Error"),
tr("Cannot open \"%1\"!").arg(FileName));
return -1;
}
Q_ULONG Count = File.size();
char *p = (char*)malloc(Count+FileName.length()+2);
strcpy(p, FileName.latin1());
File.readBlock(p+FileName.length()+1, Count);
File.close();
Count += FileName.length()+1;
FileContent = qCompress((unsigned char*)p, Count);
free(p);
Stream.writeBytes(FileContent.data(), FileContent.size());
return 0;
}
// ---------------------------------------------------------------
int PackageDialog::insertDirectory(const QString& DirName,
QDataStream& Stream)
{
QFile File;
QDir myDir(DirName);
// Put all files of this directory into the package.
QStringList Entries = myDir.entryList("*", QDir::Files, QDir::Name);
QStringList::iterator it;
for(it = Entries.begin(); it != Entries.end(); ++it) {
File.setName(myDir.absFilePath(*it));
Stream << Q_UINT32(CODE_FILE);
if(insertFile(*it, File, Stream) < 0)
return -1;
}
// Put all subdirectories into the package.
Entries = myDir.entryList("*", QDir::Dirs, QDir::Name);
Entries.pop_front(); // delete "." from list
Entries.pop_front(); // delete ".." from list
for(it = Entries.begin(); it != Entries.end(); ++it) {
Stream << Q_UINT32(CODE_DIR) << (*it).latin1();
if(insertDirectory(myDir.absPath()+QDir::separator()+(*it), Stream) < 0)
return -1;
Stream << Q_UINT32(CODE_DIR_END) << Q_UINT32(0);
}
return 0;
}
// ---------------------------------------------------------------
int PackageDialog::insertLibraries(QDataStream& Stream)
{
QFile File;
QDir myDir(QucsHomeDir.absPath() + QDir::separator() + "user_lib");
QStringList Entries = myDir.entryList("*", QDir::Files, QDir::Name);
QStringList::iterator it;
for(it = Entries.begin(); it != Entries.end(); ++it) {
File.setName(myDir.absFilePath(*it));
Stream << Q_UINT32(CODE_LIBRARY);
if(insertFile(*it, File, Stream) < 0)
return -1;
}
return 0;
}
// ---------------------------------------------------------------
void PackageDialog::slotCreate()
{
if(NameEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Error"), tr("Please insert a package name!"));
return;
}
QCheckBox *p;
if(!LibraryCheck->isChecked()) {
int count=0;
for(p = BoxList.first(); p != 0; p = BoxList.next())
if(p->isChecked())
count++;
if(count < 1) {
QMessageBox::critical(this, tr("Error"), tr("Please choose at least one project!"));
return;
}
}
QFile PkgFile(NameEdit->text());
if(PkgFile.exists())
if(QMessageBox::information(this, tr("Info"),
tr("Output file already exists!")+"\n"+tr("Overwrite it?"),
tr("&Yes"), tr("&No"), 0,1,1))
return;
if(!PkgFile.open(IO_ReadWrite)) {
QMessageBox::critical(this, tr("Error"), tr("Cannot create package!"));
return;
}
QDataStream Stream(&PkgFile);
// First write header.
char Header[HEADER_LENGTH];
memset(Header, 0, HEADER_LENGTH);
strcpy(Header, "Qucs package " PACKAGE_VERSION);
PkgFile.writeBlock(Header, HEADER_LENGTH);
// Write project files to package.
QString s;
for(p = BoxList.first(); p != 0; p = BoxList.next())
if(p->isChecked()) {
s = p->text() + "_prj";
Stream << Q_UINT32(CODE_DIR) << s.latin1();
s = QucsHomeDir.absPath() + QDir::separator() + s;
if(insertDirectory(s, Stream) < 0) {
PkgFile.close();
PkgFile.remove();
return;
}
Stream << Q_UINT32(CODE_DIR_END) << Q_UINT32(0);
}
// Write user libraries to package if desired.
if(LibraryCheck->isChecked())
if(insertLibraries(Stream) < 0) {
PkgFile.close();
PkgFile.remove();
return;
}
// Calculate checksum and write it to package file.
PkgFile.at(0);
QByteArray Content = PkgFile.readAll();
Q_UINT16 Checksum = qChecksum(Content.data(), Content.size());
PkgFile.at(HEADER_LENGTH-sizeof(Q_UINT16));
Stream << Checksum;
PkgFile.close();
QMessageBox::information(this, tr("Info"),
tr("Successfully created Qucs package!"));
accept();
}
// ***************************************************************
// ***** Functions for extracting package *****
// ***************************************************************
void PackageDialog::extractPackage()
{
QString s = QFileDialog::getOpenFileName(
lastDir.isEmpty() ? QString(".") : lastDir,
tr("Qucs Packages")+" (*.qucs);;"+
tr("Any File")+" (*)",
this, 0, tr("Enter a Package File Name"));
if(s.isEmpty()) {
reject();
return;
}
QFileInfo Info(s);
lastDir = Info.dirPath(true); // remember last directory
if(Info.extension().isEmpty())
s += ".qucs";
QDir currDir = QucsHomeDir;
QString Version;
Q_UINT16 Checksum;
Q_UINT32 Code, Length;
QFile PkgFile(s);
if(!PkgFile.open(IO_ReadOnly)) {
MsgText->append(tr("ERROR: Cannot open package!"));
ButtClose->setDisabled(false);
return;
}
QDataStream Stream(&PkgFile);
// First read and check header.
QByteArray Content = PkgFile.readAll();
if(strncmp(Content.data(), "Qucs package ", 13) != 0) {
MsgText->append(tr("ERROR: File contains wrong header!"));
goto ErrorEnd;
}
Version = QString(Content.data()+13);
if(!checkVersion(Version)) {
MsgText->append(tr("ERROR: Wrong version number!"));
goto ErrorEnd;
}
// checksum correct ?
PkgFile.at(HEADER_LENGTH-2);
Stream >> Checksum;
*((Q_UINT16*)(Content.data()+HEADER_LENGTH-2)) = 0;
if(Checksum != qChecksum(Content.data(), Content.size())) {
MsgText->append(tr("ERROR: Checksum mismatch!"));
goto ErrorEnd;
}
Content.resize(0); // dispose memory
// work on all files and directories in the package
for(;;) {
if(PkgFile.atEnd()) break;
Stream >> Code >> Length;
switch(Code) {
case CODE_DIR:
if(extractDirectory(PkgFile, Length, currDir) > 0)
break;
goto ErrorEnd;
case CODE_DIR_END:
MsgText->append(tr("Leave directory \"%1\"").arg(currDir.absPath()));
currDir.cdUp();
break;
case CODE_FILE:
if(extractFile(PkgFile, Length, currDir) > 0)
break;
goto ErrorEnd;
case CODE_LIBRARY:
if(extractLibrary(PkgFile, Length) > 0)
break;
goto ErrorEnd;
default:
MsgText->append(tr("ERROR: Package is corrupt!"));
goto ErrorEnd;
}
}
MsgText->append(" ");
MsgText->append(tr("Successfully extracted package!"));
ErrorEnd:
MsgText->append(" ");
ButtClose->setDisabled(false);
PkgFile.close();
}
// ---------------------------------------------------------------
int PackageDialog::extractDirectory(QFile& PkgFile, Q_UINT32 Count, QDir& currDir)
{
char *p = (char*)malloc(Count);
PkgFile.readBlock(p, Count);
if(currDir.cd(QString(p))) { // directory exists ?
MsgText->append(tr("ERROR: Project directory \"%1\" already exists!").arg(QString(p)));
return -1;
}
if(!currDir.mkdir(QString(p))) {
MsgText->append(tr("ERROR: Cannot create directory \"%1\"!").arg(QString(p)));
return -2;
}
currDir.cd(QString(p));
MsgText->append(tr("Create and enter directory \"%1\"").arg(currDir.absPath()));
free(p);
return 1;
}
// ---------------------------------------------------------------
int PackageDialog::extractFile(QFile& PkgFile, Q_UINT32 Count, QDir& currDir)
{
char *p = (char*)malloc(Count);
PkgFile.readBlock(p, Count);
QByteArray Content = qUncompress((unsigned char*)p, Count);
free(p);
p = Content.data();
QFile File(currDir.absFilePath(QString(p)));
if(!File.open(IO_WriteOnly)) {
MsgText->append(tr("ERROR: Cannot create file \"%1\"!").arg(QString(p)));
return -1;
}
File.writeBlock(p+strlen(p)+1, Content.size()-strlen(p)-1);
File.close();
MsgText->append(tr("Create file \"%1\"").arg(QString(p)));
return 1;
}
// ---------------------------------------------------------------
int PackageDialog::extractLibrary(QFile& PkgFile, Q_UINT32 Count)
{
char *p = (char*)malloc(Count);
PkgFile.readBlock(p, Count);
QByteArray Content = qUncompress((unsigned char*)p, Count);
free(p);
p = Content.data();
QFile File(QucsHomeDir.absPath() +
QDir::convertSeparators("/user_lib/") + QString(p));
if(File.exists()) {
MsgText->append(tr("ERROR: User library \"%1\" already exists!").arg(QString(p)));
return -1;
}
if(!File.open(IO_WriteOnly)) {
MsgText->append(tr("ERROR: Cannot create library \"%1\"!").arg(QString(p)));
return -1;
}
File.writeBlock(p+strlen(p)+1, Content.size()-strlen(p)-1);
File.close();
MsgText->append(tr("Create library \"%1\"").arg(QString(p)));
return 1;
}

69
qucs/dialogs/packagedialog.h Normal file
View File

@ -0,0 +1,69 @@
/***************************************************************************
packagedialog.h
-----------------
begin : Sun Jun 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 PACKAGEDIALOG_H
#define PACKAGEDIALOG_H
#include <qfile.h>
#include <qdialog.h>
#include <qptrlist.h>
#include <qstringlist.h>
class QucsApp;
class QString;
class QLineEdit;
class QTextEdit;
class QCheckBox;
class QVBoxLayout;
class QDataStream;
class QPushButton;
class QListViewItem;
class QVButtonGroup;
class PackageDialog : public QDialog {
Q_OBJECT
public:
PackageDialog(QWidget*, bool);
~PackageDialog();
void extractPackage();
private slots:
void slotCreate();
void slotBrowse();
private:
int insertFile(const QString&, QFile&, QDataStream&);
int insertDirectory(const QString&, QDataStream&);
int insertLibraries(QDataStream&);
int extractFile(QFile&, Q_UINT32, QDir&);
int extractDirectory(QFile&, Q_UINT32, QDir&);
int extractLibrary(QFile&, Q_UINT32);
QVBoxLayout *all; // the mother of all widgets
QLineEdit *NameEdit;
QTextEdit *MsgText;
QCheckBox *LibraryCheck;
QVButtonGroup *Group;
QPtrList<QCheckBox> BoxList;
QPushButton *ButtClose;
};
#endif

153
qucs/dialogs/qucssettingsdialog.cpp
View File

@ -99,6 +99,57 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent, const char *name)
t->addTab(Tab1, tr("Settings"));
// ...........................................................
QWidget *Tab3 = new QWidget(t);
QGridLayout *gp3 = new QGridLayout(Tab3,5,2,5,5);
gp3->addMultiCellWidget(new QLabel(tr("Colors for Syntax Highlighting:"), Tab3), 0,0,0,1);
ColorComment = new QPushButton(tr("Comment"), Tab3);
ColorComment->setPaletteForegroundColor(QucsSettings.VHDL_Comment);
ColorComment->setPaletteBackgroundColor(QucsSettings.BGColor);
connect(ColorComment, SIGNAL(clicked()), SLOT(slotColorComment()));
gp3->addWidget(ColorComment,1,0);
ColorString = new QPushButton(tr("String"), Tab3);
ColorString->setPaletteForegroundColor(QucsSettings.VHDL_String);
ColorString->setPaletteBackgroundColor(QucsSettings.BGColor);
connect(ColorString, SIGNAL(clicked()), SLOT(slotColorString()));
gp3->addWidget(ColorString,1,1);
ColorInteger = new QPushButton(tr("Integer Number"), Tab3);
ColorInteger->setPaletteForegroundColor(QucsSettings.VHDL_Integer);
ColorInteger->setPaletteBackgroundColor(QucsSettings.BGColor);
connect(ColorInteger, SIGNAL(clicked()), SLOT(slotColorInteger()));
gp3->addWidget(ColorInteger,2,0);
ColorReal = new QPushButton(tr("Real Number"), Tab3);
ColorReal->setPaletteForegroundColor(QucsSettings.VHDL_Real);
ColorReal->setPaletteBackgroundColor(QucsSettings.BGColor);
connect(ColorReal, SIGNAL(clicked()), SLOT(slotColorReal()));
gp3->addWidget(ColorReal,2,1);
ColorCharacter = new QPushButton(tr("Character"), Tab3);
ColorCharacter->setPaletteForegroundColor(QucsSettings.VHDL_Character);
ColorCharacter->setPaletteBackgroundColor(QucsSettings.BGColor);
connect(ColorCharacter, SIGNAL(clicked()), SLOT(slotColorCharacter()));
gp3->addWidget(ColorCharacter,3,0);
ColorDataType = new QPushButton(tr("Data Type"), Tab3);
ColorDataType->setPaletteForegroundColor(QucsSettings.VHDL_Types);
ColorDataType->setPaletteBackgroundColor(QucsSettings.BGColor);
connect(ColorDataType, SIGNAL(clicked()), SLOT(slotColorDataType()));
gp3->addWidget(ColorDataType,3,1);
ColorAttributes = new QPushButton(tr("Attribute"), Tab3);
ColorAttributes->setPaletteForegroundColor(QucsSettings.VHDL_Attributes);
ColorAttributes->setPaletteBackgroundColor(QucsSettings.BGColor);
connect(ColorAttributes, SIGNAL(clicked()), SLOT(slotColorAttributes()));
gp3->addWidget(ColorAttributes,4,0);
t->addTab(Tab3, tr("VHDL Editor"));
// ...........................................................
QWidget *Tab2 = new QWidget(t);
QGridLayout *gp2 = new QGridLayout(Tab2,5,3,3,3);
@ -270,14 +321,41 @@ void QucsSettingsDialog::slotApply()
if(savingFont != Font) {
savingFont = Font;
// App->setFont(Font);
// App->ContentMenu->setFont(Font);
changed = true;
}
QucsSettings.Language =
LanguageCombo->currentText().section('(',1,1).remove(')');
if(QucsSettings.VHDL_Comment != ColorComment->paletteForegroundColor()) {
QucsSettings.VHDL_Comment = ColorComment->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_String != ColorString->paletteForegroundColor()) {
QucsSettings.VHDL_String = ColorString->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Integer != ColorInteger->paletteForegroundColor()) {
QucsSettings.VHDL_Integer = ColorInteger->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Real != ColorReal->paletteForegroundColor()) {
QucsSettings.VHDL_Real = ColorReal->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Character != ColorCharacter->paletteForegroundColor()) {
QucsSettings.VHDL_Character = ColorCharacter->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Types != ColorDataType->paletteForegroundColor()) {
QucsSettings.VHDL_Types = ColorDataType->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Attributes != ColorAttributes->paletteForegroundColor()) {
QucsSettings.VHDL_Attributes = ColorAttributes->paletteForegroundColor();
changed = true;
}
bool ok;
if(QucsSettings.maxUndo != undoNumEdit->text().toUInt(&ok)) {
QucsSettings.maxUndo = undoNumEdit->text().toInt(&ok);
@ -327,6 +405,77 @@ void QucsSettingsDialog::slotDefaultValues()
LanguageCombo->setCurrentItem(0);
BGColorButton->setPaletteBackgroundColor(QColor(255,250,225));
ColorComment->setPaletteForegroundColor(Qt::gray);
ColorString->setPaletteForegroundColor(Qt::red);
ColorInteger->setPaletteForegroundColor(Qt::blue);
ColorReal->setPaletteForegroundColor(Qt::darkMagenta);
ColorCharacter->setPaletteForegroundColor(Qt::magenta);
ColorDataType->setPaletteForegroundColor(Qt::darkRed);
ColorAttributes->setPaletteForegroundColor(Qt::darkCyan);
undoNumEdit->setText("20");
editorEdit->setText(QucsSettings.BinDir + "qucsedit");
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotColorComment()
{
QColor c = QColorDialog::getColor(
ColorComment->paletteForegroundColor(), this);
if(c.isValid())
ColorComment->setPaletteForegroundColor(c);
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotColorString()
{
QColor c = QColorDialog::getColor(
ColorString->paletteForegroundColor(), this);
if(c.isValid())
ColorString->setPaletteForegroundColor(c);
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotColorInteger()
{
QColor c = QColorDialog::getColor(
ColorInteger->paletteForegroundColor(), this);
if(c.isValid())
ColorInteger->setPaletteForegroundColor(c);
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotColorReal()
{
QColor c = QColorDialog::getColor(
ColorReal->paletteForegroundColor(), this);
if(c.isValid())
ColorReal->setPaletteForegroundColor(c);
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotColorCharacter()
{
QColor c = QColorDialog::getColor(
ColorCharacter->paletteForegroundColor(), this);
if(c.isValid())
ColorCharacter->setPaletteForegroundColor(c);
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotColorDataType()
{
QColor c = QColorDialog::getColor(
ColorDataType->paletteForegroundColor(), this);
if(c.isValid())
ColorDataType->setPaletteForegroundColor(c);
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotColorAttributes()
{
QColor c = QColorDialog::getColor(
ColorAttributes->paletteForegroundColor(), this);
if(c.isValid())
ColorAttributes->setPaletteForegroundColor(c);
}

9
qucs/dialogs/qucssettingsdialog.h
View File

@ -49,6 +49,13 @@ private slots:
void slotAdd();
void slotRemove();
void slotEditSuffix(QListViewItem*);
void slotColorComment();
void slotColorString();
void slotColorInteger();
void slotColorReal();
void slotColorCharacter();
void slotColorDataType();
void slotColorAttributes();
public:
QucsApp *App;
@ -58,6 +65,8 @@ public:
QPushButton *FontButton, *BGColorButton;
QLineEdit *undoNumEdit, *editorEdit, *Input_Suffix, *Input_Program;
QListView *List_Suffix;
QPushButton *ColorComment, *ColorString, *ColorInteger,
*ColorReal, *ColorCharacter, *ColorDataType, *ColorAttributes;
QVBoxLayout *all;
QIntValidator *val200;

28
qucs/dialogs/simmessage.cpp
View File

@ -185,13 +185,20 @@ void SimMessage::nextSPICE()
com << (QucsSettings.BinDir + "qucsconv");
if(makeSubcircuit)
com << "-g" << "_ref";
com << "-if" << "spice" << "-of" << "qucs" << "-i";
if(FileName.find(QDir::separator()) < 0) // add path ?
com << QucsWorkDir.path() + QDir::separator() + FileName;
else
com << FileName;
com << "-if" << "spice" << "-of" << "qucs";
SimProcess.setArguments(com);
QFile SpiceFile;
if(FileName.find(QDir::separator()) < 0) // add path ?
SpiceFile.setName(QucsWorkDir.path() + QDir::separator() + FileName);
else
SpiceFile.setName(FileName);
if(!SpiceFile.open(IO_ReadOnly)) {
ErrText->insert(tr("ERROR: Cannot open SPICE file \"%1\".").arg(FileName));
FinishSimulation(-1);
return;
}
if(makeSubcircuit) {
Stream << "\n.Def:" << properName(FileName) << " ";
@ -209,7 +216,18 @@ void SimMessage::nextSPICE()
FinishSimulation(-1);
return;
}
QByteArray SpiceContent = SpiceFile.readAll();
SimProcess.writeToStdin(SpiceContent);
connect(&SimProcess, SIGNAL(wroteToStdin()), SLOT(slotCloseStdin()));
SpiceFile.close();
}
// ------------------------------------------------------------------------
void SimMessage::slotCloseStdin()
{
SimProcess.closeStdin();
disconnect(&SimProcess, SIGNAL(wroteToStdin()), 0, 0);
}
// ------------------------------------------------------------------------

1
qucs/dialogs/simmessage.h
View File

@ -49,6 +49,7 @@ public slots:
private slots:
void slotDisplayMsg();
void slotDisplayErr();
void slotCloseStdin();
void slotSimEnded();
void slotDisplayButton();

58
qucs/main.cpp
View File

@ -40,7 +40,8 @@ tQucsSettings QucsSettings;
QFont savingFont; // to remember which font to save in "qucsrc"
QucsApp *QucsMain; // the Qucs application itself
QucsApp *QucsMain; // the Qucs application itself
QString lastDir; // to remember last directory for several dialogs
// #########################################################################
// Loads the settings file and stores the settings.
@ -71,9 +72,7 @@ bool loadSettings()
= floor(4.0/3.0 * QucsSettings.font.pointSize());
}
else if(Setting == "BGColor") {
QucsSettings.BGColor.setNamedColor(Line);
if(!QucsSettings.BGColor.isValid())
QucsSettings.BGColor.setRgb(255, 250, 225); }
QucsSettings.BGColor.setNamedColor(Line); }
else if(Setting == "maxUndo") {
QucsSettings.maxUndo = Line.toInt(&ok); }
else if(Setting == "Editor") {
@ -82,6 +81,15 @@ bool loadSettings()
QucsSettings.FileTypes.append(Line); }
else if(Setting == "Language") {
QucsSettings.Language = Line; }
else if(Setting == "SyntaxColor") {
QucsSettings.VHDL_Comment.setNamedColor(Line.section(",", 0,0));
QucsSettings.VHDL_String.setNamedColor(Line.section(",", 1,1));
QucsSettings.VHDL_Integer.setNamedColor(Line.section(",", 2,2));
QucsSettings.VHDL_Real.setNamedColor(Line.section(",", 3,3));
QucsSettings.VHDL_Character.setNamedColor(Line.section(",", 4,4));
QucsSettings.VHDL_Types.setNamedColor(Line.section(",", 5,5));
QucsSettings.VHDL_Attributes.setNamedColor(Line.section(",", 6,6));
}
}
file.close();
@ -109,7 +117,15 @@ bool saveApplSettings(QucsApp *qucs)
<< "Language=" << QucsSettings.Language << "\n"
<< "BGColor=" << QucsSettings.BGColor.name() << "\n"
<< "maxUndo=" << QucsSettings.maxUndo << "\n"
<< "Editor=" << QucsSettings.Editor << "\n";
<< "Editor=" << QucsSettings.Editor << "\n"
<< "SyntaxColor="
<< QucsSettings.VHDL_Comment.name() << ","
<< QucsSettings.VHDL_String.name() << ","
<< QucsSettings.VHDL_Integer.name() << ","
<< QucsSettings.VHDL_Real.name() << ","
<< QucsSettings.VHDL_Character.name() << ","
<< QucsSettings.VHDL_Types.name() << ","
<< QucsSettings.VHDL_Attributes.name() << "\n";
QStringList::Iterator it = QucsSettings.FileTypes.begin();
while(it != QucsSettings.FileTypes.end())
@ -391,17 +407,6 @@ bool checkVersion(QString& Line)
int main(int argc, char *argv[])
{
/*double xyz = 0.0;
long long *p = (long long*)(&xyz);
qDebug("Zahl: %g -> %0llx", xyz, *p);
xyz = -2.0;
qDebug("Zahl: %g -> %0llx", xyz, *p);
xyz = -2.0e1;
qDebug("Zahl: %g -> %0llx", xyz, *p);
xyz = -2.0e-1;
qDebug("Zahl: %g -> %0llx", xyz, *p);
return 0;*/
// apply default settings
QucsSettings.x = 0;
QucsSettings.y = 0;
@ -409,7 +414,6 @@ return 0;*/
QucsSettings.dy = 400;
QucsSettings.font = QFont("Helvetica", 12);
QucsSettings.largeFontSize = 16.0;
QucsSettings.BGColor = QColor(255, 250, 225);
QucsSettings.maxUndo = 20;
// is application relocated?
@ -437,6 +441,26 @@ return 0;*/
QucsHomeDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
loadSettings();
if(!QucsSettings.BGColor.isValid())
QucsSettings.BGColor.setRgb(255, 250, 225);
// VHDL syntax highlighting
if(!QucsSettings.VHDL_Comment.isValid())
QucsSettings.VHDL_Comment = Qt::gray;
if(!QucsSettings.VHDL_String.isValid())
QucsSettings.VHDL_String = Qt::red;
if(!QucsSettings.VHDL_Integer.isValid())
QucsSettings.VHDL_Integer = Qt::blue;
if(!QucsSettings.VHDL_Real.isValid())
QucsSettings.VHDL_Real = Qt::darkMagenta;
if(!QucsSettings.VHDL_Character.isValid())
QucsSettings.VHDL_Character = Qt::magenta;
if(!QucsSettings.VHDL_Types.isValid())
QucsSettings.VHDL_Types = Qt::darkRed;
if(!QucsSettings.VHDL_Attributes.isValid())
QucsSettings.VHDL_Attributes = Qt::darkCyan;
QApplication a(argc, argv);
a.setFont(QucsSettings.font);

7
qucs/main.h
View File

@ -43,6 +43,10 @@ struct tQucsSettings {
QColor BGColor; // background color of view area
QString Language;
// VHDL syntax highlighting
QColor VHDL_Comment, VHDL_String, VHDL_Integer, VHDL_Real,
VHDL_Character, VHDL_Types, VHDL_Attributes;
unsigned int maxUndo; // size of undo stack
QString Editor;
QString BinDir;
@ -57,7 +61,8 @@ struct tQucsSettings {
extern tQucsSettings QucsSettings; // extern because nearly everywhere used
extern QFont savingFont; // to remember which font to save in "qucsrc"
extern QucsApp *QucsMain; // the Qucs application itself
extern QucsApp *QucsMain; // the Qucs application itself
extern QString lastDir; // to remember last directory for several dialogs
bool saveApplSettings(QucsApp*);

21
qucs/mouseactions.cpp
View File

@ -828,10 +828,13 @@ void MouseActions::rightPressMenu(Schematic *Doc, QMouseEvent *Event, int x, int
ComponentMenu->insertItem(QObject::tr("2-port matching"), QucsMain,
SLOT(slot2PortMatching()));
}
while(true) {
do {
if(focusElement) {
if(focusElement->Type == isDiagram) break;
if(focusElement->Type == isGraph) break;
if(focusElement->Type == isGraph) {
QucsMain->graph2csv->addTo(ComponentMenu);
break;
}
}
ComponentMenu->insertSeparator();
if(focusElement) if(focusElement->Type & isComponent)
@ -843,9 +846,7 @@ void MouseActions::rightPressMenu(Schematic *Doc, QMouseEvent *Event, int x, int
QucsMain->editMirror->addTo(ComponentMenu);
if(!QucsMain->editMirrorY->isOn())
QucsMain->editMirrorY->addTo(ComponentMenu);
break;
}
} while(false);
*focusMEvent = *Event; // remember event for "edit component" action
ComponentMenu->popup(Event->globalPos());
@ -1814,8 +1815,8 @@ void MouseActions::editElement(Schematic *Doc, QMouseEvent *Event)
case isNodeLabel:
case isHWireLabel:
case isVWireLabel:
editLabel(Doc, (WireLabel*)focusElement);
break;
editLabel(Doc, (WireLabel*)focusElement);
break;
case isPainting:
if( ((Painting*)focusElement)->Dialog() )
@ -1829,6 +1830,12 @@ void MouseActions::editElement(Schematic *Doc, QMouseEvent *Event)
break;
}
// Very strange: Now an open VHDL editor gets all the keyboard input !?!
// I don't know why it only happens here, nor am I sure whether it only
// happens here. Anyway, I hope the best and give the focus back to the
// current document.
Doc->setFocus();
Doc->viewport()->update();
drawn = false;
}

118
qucs/qucs.cpp
View File

@ -139,9 +139,9 @@ QucsApp::QucsApp()
HierarchyHistory.setAutoDelete(true);
// default settings of the printer
Printer = new QPrinter(QPrinter::PrinterResolution);
// Printer->setOrientation(QPrinter::Landscape);
Printer = new QPrinter(QPrinter::HighResolution);
#if defined (QT_VERSION) && QT_VERSION > 0x030200
Printer->setOptionEnabled(QPrinter::PrintSelection, true);
Printer->setOptionEnabled(QPrinter::PrintPageRange, false);
#endif
Printer->setColorMode(QPrinter::Color);
@ -559,6 +559,7 @@ void QucsApp::slotCMenuDelGroup()
QString NameDPL = QucsWorkDir.filePath(s+".dpl");
QString NameDAT = QucsWorkDir.filePath(s+".dat");
QString NameDIG = QucsWorkDir.filePath(s+".vhdl");
QString NameVHD = QucsWorkDir.filePath(s+".vhd");
int No=0;
QucsDoc *d; // search, if files are open
@ -578,6 +579,11 @@ void QucsApp::slotCMenuDelGroup()
tr("Cannot delete the open file: ")+NameDIG);
return;
}
if(d->DocName == NameVHD) {
QMessageBox::critical(this, tr("Error"),
tr("Cannot delete the open file: ")+NameVHD);
return;
}
}
@ -585,12 +591,14 @@ void QucsApp::slotCMenuDelGroup()
bool DPL_exists = QFile::exists(NameDPL);
bool DAT_exists = QFile::exists(NameDAT);
bool DIG_exists = QFile::exists(NameDIG);
bool VHD_exists = QFile::exists(NameVHD);
QString Str;
if(SCH_exists) Str += s+".sch\n";
if(DPL_exists) Str += s+".dpl\n";
if(DAT_exists) Str += s+".dat\n";
if(DIG_exists) Str += s+".vhdl\n";
if(VHD_exists) Str += s+".vhd\n";
No = QMessageBox::warning(this, tr("Warning"),
tr("This will delete the files\n")+Str+tr("permanently! Continue ?"),
@ -622,6 +630,12 @@ void QucsApp::slotCMenuDelGroup()
tr("Cannot delete VHDL source: ")+s+".vhdl");
return;
}
if(VHD_exists)
if(!QFile::remove(NameVHD)) {
QMessageBox::critical(this, tr("Error"),
tr("Cannot delete VHDL source: ")+s+".vhd");
return;
}
// remove items from listview ........
if(SCH_exists) {
@ -652,6 +666,13 @@ void QucsApp::slotCMenuDelGroup()
delete item;
}
}
if(VHD_exists) {
item = Content->findItem(s+".vhd", 0);
if(item) {
item->parent()->takeItem(item);
delete item;
}
}
}
@ -794,7 +815,7 @@ void QucsApp::readProjectFiles()
new QListViewItem(ConDisplays, (*it).ascii());
else if(Str == "dat")
new QListViewItem(ConDatasets, (*it).ascii());
else if(Str == "vhdl")
else if((Str == "vhdl") || (Str == "vhd"))
new QListViewItem(ConSources, (*it).ascii());
else
new QListViewItem(ConOthers, (*it).ascii());
@ -805,7 +826,7 @@ void QucsApp::readProjectFiles()
// ----------------------------------------------------------
// Opens an existing project.
void QucsApp::OpenProject(const QString& Path, const QString& Name)
void QucsApp::openProject(const QString& Path, const QString& Name)
{
editText->setHidden(true); // disable text edit of component property
@ -850,7 +871,7 @@ void QucsApp::slotMenuOpenProject()
int i = s.findRev('/');
if(i > 0) s = s.mid(i+1); // cut out the last subdirectory
s.remove("_prj");
OpenProject(d->selectedFile(), s);
openProject(d->selectedFile(), s);
}
// ----------------------------------------------------------
@ -869,7 +890,7 @@ void QucsApp::slotProjOpenButt()
// Is called when project is double-clicked to open it.
void QucsApp::slotOpenProject(QListBoxItem *item)
{
OpenProject(QucsHomeDir.filePath(item->text()+"_prj"), item->text());
openProject(QucsHomeDir.filePath(item->text()+"_prj"), item->text());
}
// ----------------------------------------------------------
@ -894,7 +915,40 @@ void QucsApp::slotMenuCloseProject()
}
// ----------------------------------------------------------
bool QucsApp::DeleteProject(const QString& Path, const QString& Name)
bool QucsApp::deleteDirectoryContent(QDir& Dir)
{
// removes every file, remove("*") does not work
QStringList Files = Dir.entryList("*", QDir::Files); // all files
QStringList::iterator it;
for(it = Files.begin(); it != Files.end(); it++) {
if(!Dir.remove(*it)) {
QMessageBox::information(this, tr("Info"),
tr("Cannot delete file: ")+(*it));
return false;
}
}
QDir myDir(Dir);
// Remove all directories recursively.
Files = Dir.entryList("*", QDir::Dirs);
Files.pop_front(); // delete "." from list
Files.pop_front(); // delete ".." from list
for(it = Files.begin(); it != Files.end(); it++) {
myDir.cd(*it);
if(!deleteDirectoryContent(myDir))
return false;
myDir.cdUp();
if(!myDir.rmdir(*it)) {
QMessageBox::information(this, tr("Info"),
tr("Cannot remove directory: ")+(*it));
return false;
}
}
return true;
}
// ----------------------------------------------------------
bool QucsApp::deleteProject(const QString& Path, const QString& Name)
{
editText->setHidden(true); // disable text edit of component property
@ -910,17 +964,8 @@ bool QucsApp::DeleteProject(const QString& Path, const QString& Name)
tr("&Yes"), tr("&No"), 0,1,1)) return false;
QDir projDir = QDir(Path);
QStringList ProjFiles = projDir.entryList("*", QDir::Files); // all files
// removes every file, remove("*") does not work
QStringList::iterator it;
for(it = ProjFiles.begin(); it != ProjFiles.end(); it++) {
if(!projDir.remove(*it)) {
QMessageBox::information(this, tr("Info"),
tr("Cannot remove project file: ")+(*it));
return false;
}
}
if(!deleteDirectoryContent(projDir))
return false;
projDir.cdUp(); // leave project directory for deleting
if(!projDir.rmdir(Name+"_prj")) {
@ -949,7 +994,7 @@ void QucsApp::slotMenuDelProject()
int i = s.findRev('/');
if(i > 0) s = s.mid(i+1); // cut out the last subdirectory
s = s.left(s.length()-4); // remove "_prj" from name
DeleteProject(d->selectedFile(), s);
deleteProject(d->selectedFile(), s);
readProjects(); // re-reads all projects and inserts them into the ListBox
}
@ -964,7 +1009,7 @@ void QucsApp::slotProjDelButt()
return;
}
if(!DeleteProject(QucsHomeDir.filePath(item->text()+"_prj"),
if(!deleteProject(QucsHomeDir.filePath(item->text()+"_prj"),
item->text())) return;
Projects->removeItem(Projects->currentItem()); // remove from project list
}
@ -1169,7 +1214,7 @@ bool QucsApp::saveAs()
Content->setSelected(new QListViewItem(ConDisplays, s), true);
else if(Info.extension(false) == "dat")
Content->setSelected(new QListViewItem(ConDatasets, s), true);
else if(Info.extension(false) == "vhdl")
else if((Info.extension(false) == "vhdl") || (Info.extension(false) == "vhd"))
Content->setSelected(new QListViewItem(ConSources, s), true);
else
Content->setSelected(new QListViewItem(ConOthers, s), true);
@ -1421,27 +1466,33 @@ void QucsApp::updatePortNumber(QucsDoc *currDoc, int No)
// --------------------------------------------------------------
void QucsApp::slotFilePrint()
void QucsApp::printCurrentDocument(bool fitToPage)
{
statusBar()->message(tr("Printing..."));
editText->setHidden(true); // disable text edit of component property
if(DocumentTab->currentPage()->inherits("QTextEdit"))
Printer->setOrientation(QPrinter::Portrait);
else
Printer->setOrientation(QPrinter::Landscape);
if(Printer->setup(this)) // printer dialog
getDoc()->print(Printer, true);
getDoc()->print(Printer, Printer->printRange() == QPrinter::AllPages, fitToPage);
statusBar()->message(tr("Ready."));
}
// --------------------------------------------------------------
void QucsApp::slotFilePrintSelected()
void QucsApp::slotFilePrint()
{
statusBar()->message(tr("Printing selected..."));
editText->setHidden(true); // disable text edit of component property
printCurrentDocument(false);
}
if(Printer->setup(this)) // printer dialog
getDoc()->print(Printer, false);
statusBar()->message(tr("Ready."));
// --------------------------------------------------------------
// Fit printed content to page size.
void QucsApp::slotFilePrintFit()
{
printCurrentDocument(true);
}
// --------------------------------------------------------------------
@ -1706,7 +1757,7 @@ void QucsApp::slotChangePage(QString& DocName, QString& DataDisplay)
if(d)
DocumentTab->setCurrentPage(z-1);
else { // no open page found ?
if(DataDisplay.section('.',1) != "vhdl")
if(DataDisplay.section('.',1).left(3) != "vhd")
d = new Schematic(this, Name);
else
d = new TextDoc(this, Name);
@ -1783,11 +1834,11 @@ void QucsApp::slotOpenContent(QListViewItem *item)
QFileInfo Info(QucsWorkDir.filePath(item->text(0)));
QString Suffix = Info.extension(false);
if((Suffix == "sch") || (Suffix == "dpl") || (Suffix == "vhdl")) {
if((Suffix == "sch") || (Suffix == "dpl") || (Suffix.left(3) == "vhd")) {
gotoPage(Info.absFilePath());
if(item->text(1).isEmpty()) // is subcircuit ?
if(Suffix != "vhdl") return; // is VHDL subcircuit ?
if(Suffix.left(3) != "vhd") return; // is VHDL subcircuit ?
select->blockSignals(true); // switch on the 'select' action ...
select->setOn(true);
@ -1918,6 +1969,7 @@ void QucsApp::switchSchematicDoc(bool SchematicMode)
distrVert->setEnabled(SchematicMode);
onGrid->setEnabled(SchematicMode);
moveText->setEnabled(SchematicMode);
filePrintFit->setEnabled(SchematicMode);
editFind->setEnabled(!SchematicMode);
editFindAgain->setEnabled(!SchematicMode);
editRotate->setEnabled(SchematicMode);

25
qucs/qucs.h
View File

@ -83,10 +83,10 @@ public slots:
void slotFileSaveAs(); // save a document under a different filename
void slotFileSaveAll(); // save all open documents
void slotFileClose(); // close the actual file
void slotSymbolEdit(); // edit the symbol for the schematic
void slotSymbolEdit(); // edit the symbol for the schematic
void slotFileSettings();// open dialog to change file settings
void slotFilePrint(); // print the current file
void slotFilePrintSelected(); // Print selected elements
void slotFilePrintFit();// Print and fit to page
void slotFileQuit(); // exits the application
void slotEditCut(); // put marked object into clipboard and delete it
void slotEditCopy(); // put the marked object into the clipboard
@ -146,7 +146,7 @@ public:
QAction *fileNew, *textNew, *fileNewDpl, *fileOpen, *fileSave, *fileSaveAs,
*fileSaveAll, *fileClose, *fileSettings, *filePrint, *fileQuit,
*projNew, *projOpen, *projDel, *projClose, *applSettings,
*editCut, *editCopy, *magAll, *magOne, *magMinus, *filePrintSel,
*editCut, *editCopy, *magAll, *magOne, *magMinus, *filePrintFit,
*symEdit, *intoH, *popH, *simulate, *dpl_sch, *undo, *redo, *dcbias;
QAction *activeAction; // pointer to the action selected by the user
@ -173,17 +173,19 @@ private:
void initCursorMenu();
void initContentListView();
void printCurrentDocument(bool);
bool saveFile(QucsDoc *Doc=0);
bool saveAs();
void readProjects();
void readProjectFiles();
void OpenProject(const QString&, const QString&);
bool DeleteProject(const QString&, const QString&);
void openProject(const QString&, const QString&);
bool deleteProject(const QString&, const QString&);
void updatePortNumber(QucsDoc*, int);
void fillComboBox(bool);
void switchSchematicDoc(bool);
void switchEditMode(bool);
void changeSchematicSymbolMode(Schematic*);
bool deleteDirectoryContent(QDir& Dir);
@ -196,13 +198,14 @@ public slots:
void slotViewToolBar(bool toggle); // toggle the toolbar
void slotViewStatusBar(bool toggle); // toggle the statusbar
void slotHelpAbout(); // shows an about dialog
void slotHelpAboutQt(); // shows the standard about dialog for Qt
void slotShowWarnings();
void slotResetWarnings();
void printCursorPosition(int, int);
private slots:
void slotHelpAbout(); // shows an about dialog
void slotHelpAboutQt(); // shows the standard about dialog for Qt
private:
void initActions(); // initializes all QActions of the application
void initMenuBar(); // creates the menu_bar and inserts the menuitems
@ -237,7 +240,7 @@ public:
*showMsg, *showNet, *alignTop, *alignBottom, *alignLeft, *alignRight,
*distrHor, *distrVert, *selectAll, *callLib, *callMatch, *changeProps,
*addToProj, *editFind, *editFindAgain, *insEntity, *selectMarker,
*createLib;
*createLib, *importData, *graph2csv, *createPkg, *extractPkg;
public slots:
void slotEditRotate(bool); // rotate the selected items
@ -289,6 +292,10 @@ private slots:
void slotCursorDown();
void slotResizePropEdit(const QString&);
void slotCreateLib();
void slotImportData();
void slotExportGraphAsCsv();
void slotCreatePackage();
void slotExtractPackage();
private:
void showHTML(const QString&);

109
qucs/qucs_actions.cpp
View File

@ -40,6 +40,8 @@
#include "dialogs/changedialog.h"
#include "dialogs/searchdialog.h"
#include "dialogs/librarydialog.h"
#include "dialogs/importdialog.h"
#include "dialogs/packagedialog.h"
// for editing component name on schematic
QRegExp Expr_CompProp;
@ -695,7 +697,6 @@ void QucsApp::slotChangeProps()
// --------------------------------------------------------------
void QucsApp::slotAddToProject()
{
static QString lastDir; // to remember last directory and file
editText->setHidden(true); // disable text edit of component property
if(ProjName.isEmpty()) {
@ -719,11 +720,11 @@ void QucsApp::slotAddToProject()
QStringList FileList = List; // make a copy as recommended by Qt
QStringList::Iterator it = FileList.begin();
lastDir = (*it); // remember last directory and file
QFileInfo Info(*it);
lastDir = Info.dirPath(true); // remember last directory
// copy all files to project directory
int Num;
QFileInfo Info;
QFile origFile, destFile;
while(it != FileList.end()) {
Info.setFile(*it);
@ -1056,6 +1057,8 @@ void QucsApp::slotResizePropEdit(const QString& t)
// -----------------------------------------------------------
void QucsApp::slotCreateLib()
{
editText->setHidden(true); // disable text edit of component property
if(ProjName.isEmpty()) {
QMessageBox::critical(this, tr("Error"), tr("Please open project with subcircuits!"));
return;
@ -1063,3 +1066,103 @@ void QucsApp::slotCreateLib()
(new LibraryDialog(this, ConSchematics))->exec();
}
// -----------------------------------------------------------
void QucsApp::slotImportData()
{
editText->setHidden(true); // disable text edit of component property
if(ProjName.isEmpty()) {
QMessageBox::critical(this, tr("Error"), tr("Please open project first!"));
return;
}
ImportDialog *d = new ImportDialog(this);
if(d->exec() == QDialog::Accepted)
readProjectFiles(); // re-read all project files
}
// -----------------------------------------------------------
void QucsApp::slotExportGraphAsCsv()
{
editText->setHidden(true); // disable text edit of component property
for(;;) {
if(view->focusElement)
if(view->focusElement->Type == isGraph)
break;
QMessageBox::critical(this, tr("Error"), tr("Please select a diagram graph!"));
return;
}
QString s = QFileDialog::getSaveFileName(
lastDir.isEmpty() ? QString(".") : lastDir,
tr("CSV file")+" (*.csv);;" + tr("Any File")+" (*)",
this, 0, tr("Enter an Output File Name"));
if(s.isEmpty())
return;
QFileInfo Info(s);
lastDir = Info.dirPath(true); // remember last directory
if(Info.extension().isEmpty())
s += ".csv";
QFile File(s);
if(File.exists())
if(QMessageBox::information(this, tr("Info"),
tr("Output file already exists!")+"\n"+tr("Overwrite it?"),
tr("&Yes"), tr("&No"), 0,1,1))
return;
if(!File.open(IO_WriteOnly)) {
QMessageBox::critical(this, QObject::tr("Error"),
QObject::tr("Cannot create output file!"));
return;
}
QTextStream Stream(&File);
DataX *pD;
Graph *g = (Graph*)view->focusElement;
// First output the names of independent and dependent variables.
for(pD = g->cPointsX.first(); pD!=0; pD = g->cPointsX.next())
Stream << '\"' << pD->Var << "\";";
Stream << "\"" << g->Var << " (real)\";\"" << g->Var << " (imag)\"\n";
int n, m;
double *py = g->cPointsY;
int Count = g->countY * g->cPointsX.getFirst()->count;
for(n = 0; n < Count; n++) {
m = n;
for(pD = g->cPointsX.first(); pD!=0; pD = g->cPointsX.next()) {
Stream << *(pD->Points + m%pD->count) << ';';
m /= pD->count;
}
Stream << *(py++) << ';' << *(py++) << '\n';
}
File.close();
}
// ----------------------------------------------------------
void QucsApp::slotCreatePackage()
{
editText->setHidden(true); // disable text edit of component property
PackageDialog *d = new PackageDialog(this, true);
d->exec();
}
// ----------------------------------------------------------
void QucsApp::slotExtractPackage()
{
editText->setHidden(true); // disable text edit of component property
PackageDialog *d = new PackageDialog(this, false);
d->show();
d->extractPackage();
readProjects();
}

46
qucs/qucs_init.cpp
View File

@ -118,12 +118,12 @@ void QucsApp::initActions()
tr("Print File\n\nPrints the current document"));
connect(filePrint, SIGNAL(activated()), SLOT(slotFilePrint()));
filePrintSel = new QAction("Print Selection...",
tr("Print Selection..."), CTRL+SHIFT+Key_P, this);
filePrintSel->setWhatsThis(
tr("Print Selected Elements\n\n"
"Prints selected elements of the current document"));
connect(filePrintSel, SIGNAL(activated()), SLOT(slotFilePrintSelected()));
filePrintFit = new QAction("Print Fit to Page...",
tr("Print Fit to Page..."), CTRL+SHIFT+Key_P, this);
filePrintFit->setWhatsThis(
tr("Print Fit to Page\n\n"
"Print and fit content to the page size"));
connect(filePrintFit, SIGNAL(activated()), SLOT(slotFilePrintFit()));
fileQuit = new QAction("Exit", tr("E&xit"), CTRL+Key_Q, this);
fileQuit->setStatusTip(tr("Quits the application"));
@ -310,6 +310,34 @@ void QucsApp::initActions()
tr("Create Library\n\nCreate Library from Subcircuits"));
connect(createLib, SIGNAL(activated()), SLOT(slotCreateLib()));
createPkg = new QAction("Create Package...",
tr("Create &Package..."), CTRL+SHIFT+Key_Z, this);
createPkg->setStatusTip(tr("Create compressed Package from Projects"));
createPkg->setWhatsThis(
tr("Create Package\n\nCreate compressed Package from complete Projects"));
connect(createPkg, SIGNAL(activated()), SLOT(slotCreatePackage()));
extractPkg = new QAction("Extract Package...",
tr("E&xtract Package..."), CTRL+SHIFT+Key_X, this);
extractPkg->setStatusTip(tr("Install Content of a Package"));
extractPkg->setWhatsThis(
tr("Extract Package\n\nInstall Content of a Package"));
connect(extractPkg, SIGNAL(activated()), SLOT(slotExtractPackage()));
importData = new QAction("Import Data...",
tr("&Import Data..."), CTRL+SHIFT+Key_I, this);
importData->setStatusTip(tr("Convert file to Qucs data file"));
importData->setWhatsThis(
tr("Import Data\n\nConvert data file to Qucs data file"));
connect(importData, SIGNAL(activated()), SLOT(slotImportData()));
graph2csv = new QAction("Export to CSV...",
tr("Export to &CSV..."), CTRL+SHIFT+Key_C, this);
graph2csv->setStatusTip(tr("Convert graph data to CSV file"));
graph2csv->setWhatsThis(
tr("Export to CSV\n\nConvert graph data to CSV file"));
connect(graph2csv, SIGNAL(activated()), SLOT(slotExportGraphAsCsv()));
magAll = new QAction("View All",
QIconSet(QImage(QucsSettings.BitmapDir + "viewmagfit.png")),
tr("View All"), Key_0, this);
@ -587,7 +615,7 @@ void QucsApp::initMenuBar()
fileSaveAll->addTo(fileMenu);
fileSaveAs->addTo(fileMenu);
filePrint->addTo(fileMenu);
filePrintSel->addTo(fileMenu);
filePrintFit->addTo(fileMenu);
fileMenu->insertSeparator();
fileSettings->addTo(fileMenu);
symEdit->addTo(fileMenu);
@ -648,6 +676,10 @@ void QucsApp::initMenuBar()
projDel->addTo(projMenu);
projMenu->insertSeparator();
createLib->addTo(projMenu);
createPkg->addTo(projMenu);
extractPkg->addTo(projMenu);
importData->addTo(projMenu);
graph2csv->addTo(projMenu);
toolMenu = new QPopupMenu(); // menuBar entry toolMenu
callEditor->addTo(toolMenu);

2
qucs/qucsdoc.h
View File

@ -36,7 +36,7 @@ public:
virtual void setName(const QString&) {};
virtual bool load() { return true; };
virtual int save() { return 0; };
virtual void print(QPrinter*, bool) {};
virtual void print(QPrinter*, bool, bool) {};
virtual void becomeCurrent(bool) {};
virtual float zoom(float) { return 1.0; };
virtual void showAll() {};

69
qucs/schematic.cpp
View File

@ -32,15 +32,16 @@
#include <qiconview.h>
#include <qtabwidget.h>
#include <qdragobject.h>
#include <qpaintdevicemetrics.h>
#include "qucs.h"
#include "schematic.h"
#include "mouseactions.h"
#include "viewpainter.h"
#include "diagrams/diagrams.h"
#include "paintings/paintings.h"
#include "main.h"
#include "node.h"
#include "schematic.h"
#include "viewpainter.h"
#include "mouseactions.h"
#include "diagrams/diagrams.h"
#include "paintings/paintings.h"
// just dummies for empty lists
QPtrList<Wire> SymbolWires;
@ -381,21 +382,40 @@ void Schematic::contentsMouseDoubleClickEvent(QMouseEvent *Event)
}
// -----------------------------------------------------------
void Schematic::print(QPrinter *Printer, bool printAll)
void Schematic::print(QPrinter *Printer, bool printAll, bool fitToPage)
{
QPainter painter(Printer);
if(!painter.device()) // valid device available ?
return;
QPaintDeviceMetrics metrics(painter.device());
float PrintScale = 0.5;
sizeOfAll(UsedX1, UsedY1, UsedX2, UsedY2);
int marginX = 40 * metrics.logicalDpiX() / 72;
int marginY = 40 * metrics.logicalDpiY() / 72;
if(fitToPage) {
float ScaleX = float(metrics.width() - 2*marginX) /
float((UsedX2-UsedX1) * metrics.logicalDpiX()) * 72.0;
float ScaleY = float(metrics.height() - 2*marginY) /
float((UsedY2-UsedY1) * metrics.logicalDpiY()) * 72.0;
if(ScaleX > ScaleY)
PrintScale = ScaleY;
else
PrintScale = ScaleX;
}
bool selected;
ViewPainter p;
p.init(&painter, 1.0, 0, 0, UsedX1-20, UsedY1-20);
p.init(&painter, PrintScale * float(metrics.logicalDpiX()) / 72.0,
-UsedX1, -UsedY1, -marginX, -marginY, PrintScale);
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
if(pc->isSelected || printAll) {
selected = pc->isSelected;
pc->isSelected = false;
pc->print(&p); // paint all selected components
pc->print(&p, 72.0 / float(metrics.logicalDpiX()));
pc->isSelected = selected;
}
@ -1593,20 +1613,39 @@ void Schematic::contentsDragEnterEvent(QDragEnterEvent *Event)
return;
}
// drag library component
if(Event->provides("text/plain")) {
QString s;
if(QTextDrag::decode(Event, s))
if(s.left(15) == "QucsComponent:<") {
s = s.mid(14);
App->view->selElem = getComponentFromName(s);
if(App->view->selElem) {
Event->accept();
return;
}
}
Event->ignore();
return;
}
if(Event->format(1) == 0) // only one MIME type ?
if(Event->format(1) == 0) { // only one MIME type ?
// drag component from listview
if(Event->provides("application/x-qiconlist")) {
QIconViewItem *Item = App->CompComps->currentItem();
if(Item) {
App->view->labeledWire = (Wire*)App->activeAction; // misuse variable
App->slotSelectComponent(Item); // also sets drawn=false
App->MouseMoveAction = 0;
App->MousePressAction = 0;
App->view->labeledWire = (Wire*)App->activeAction; // misuse variable
App->slotSelectComponent(Item); // also sets drawn=false
App->MouseMoveAction = 0;
App->MousePressAction = 0;
Event->accept();
return;
Event->accept();
return;
}
}
}
Event->ignore();
}

2
qucs/schematic.h
View File

@ -44,7 +44,7 @@ public:
void setName(const QString&);
void setChanged(bool, bool fillStack=false, char Op='*');
void paintGrid(ViewPainter*, int, int, int, int);
void print(QPrinter*, bool);
void print(QPrinter*, bool, bool);
float textCorr();
void sizeOfAll(int&, int&, int&, int&);

22
qucs/textdoc.cpp
View File

@ -162,7 +162,7 @@ int TextDoc::save()
}
// -----------------------------------------------------------
void TextDoc::print(QPrinter *Printer, bool printAll)
void TextDoc::print(QPrinter *Printer, bool printAll, bool)
{
QPainter p(Printer);
if(!p.device()) // valid device available ?
@ -179,7 +179,7 @@ void TextDoc::print(QPrinter *Printer, bool printAll)
marginX, marginY, metrics.width() - 2*marginX,
metrics.height() - 2*marginY - p.fontMetrics().lineSpacing());
int linesPerPage =printArea.height() / p.fontMetrics().lineSpacing();
int linesPerPage = printArea.height() / p.fontMetrics().lineSpacing();
int PageCount, PageNo = 1;
QString s, printText;
@ -306,7 +306,7 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int)
for(c = text.at(i); !c.isNull(); c = text.at(++i)) {
if(iString >= 0) {
setFormat(iString, i-iString+1, Qt::red);
setFormat(iString, i-iString+1, QucsSettings.VHDL_String);
if(c == '"')
iString = -1;
continue;
@ -357,9 +357,9 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int)
if(c != '_')
if(!c.isLetter()) {
if(isFloat)
setFormat(iNumber, i-iNumber, Qt::darkMagenta);
setFormat(iNumber, i-iNumber, QucsSettings.VHDL_Real);
else
setFormat(iNumber, i-iNumber, Qt::blue);
setFormat(iNumber, i-iNumber, QucsSettings.VHDL_Integer);
}
iNumber = -1;
}
@ -367,7 +367,7 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int)
else if(c == '-') {
if(i > 0)
if(text.at(i-1) == '-') { // VHDL comment starts with --
setFormat(i-1, text.length()-i, Qt::gray);
setFormat(i-1, text.length()-i, QucsSettings.VHDL_Comment);
return 0;
}
continue;
@ -389,7 +389,7 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int)
if(c == '\'') {
if(i > 1)
if(text.at(i-2) == '\'')
setFormat(i-2, 3, Qt::magenta);
setFormat(i-2, 3, QucsSettings.VHDL_Character);
}
else if(c == '"')
iString = i;
@ -464,14 +464,14 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len)
for(List = List_DataTypes; *List != 0; List++)
if(Word == *List) {
setFormat(start, len, newFont, Qt::darkRed);
setFormat(start, len, QucsSettings.VHDL_Types);
return;
}
for(List = List_Units; *List != 0; List++)
if(Word == *List) {
newFont.setWeight(QFont::Bold);
setFormat(start, len, newFont, Qt::darkMagenta);
setFormat(start, len, newFont, QucsSettings.VHDL_Real);
return;
}
}
@ -510,9 +510,7 @@ void SyntaxHighlighter::markAttribute(const QString& text, int start, int len)
if(List)
for(; *List != 0; List++)
if(Word == *List) {
QFont newFont = QucsSettings.font;
newFont.setPointSize((int)Doc->Scale);
setFormat(start-1, len+1, newFont, Qt::darkCyan);
setFormat(start-1, len+1, QucsSettings.VHDL_Attributes);
return;
}
}

2
qucs/textdoc.h
View File

@ -38,7 +38,7 @@ public:
void setName(const QString&);
bool load();
int save();
void print(QPrinter*, bool);
void print(QPrinter*, bool, bool);
float zoom(float);
void showAll();
void showNoZoom();

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