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

*** empty log message ***

Browse Source
This commit is contained in:
margraf 2004-05-20 17:27:41 +00:00
parent c2692e870f
commit d2b9e65295
26 changed files with 2021 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qucs/ChangeLog
View File

@ -1,7 +1,12 @@
2004-05-19 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* fixed many small bugs in the view area handling
* filled rectangle and filled ellipse as paintings
2004-05-19 Stefan Jahn <stefan@lkcc.org>
* diagrams/tabdiagram.cpp (calcDiagram): Yet another bug fix
causing segfaulting the tabdiagram when an graph input has
causing segfaulting the tabdiagram when an graph input has
disappered after a new simulation.
2004-05-19 Stefan Jahn <jahn@mwt.ee.tu-berlin.de>
@ -10,7 +15,7 @@
loop bug when trying to calculate grid properties for zero
ymax and ymin.
* qucsfile.cpp (simpleInsertWire): Fixed segfault bug when
* qucsfile.cpp (simpleInsertWire): Fixed segfault bug when
accessing null pointer.
* qucsview.cpp (MPressRotate): Fixed possible cause of

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

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

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

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

4
qucs/components/componentdialog.cpp
View File

@ -17,6 +17,8 @@
#include "componentdialog.h"
#include "../qucsview.h"
#include <qlayout.h>
#include <qhbox.h>
#include <qmessagebox.h>
@ -319,6 +321,8 @@ void ComponentDialog::slotApplyInput()
Property(item->text(0), item->text(1), display, item->text(3)));
}
transfered = true; // applied changed to the component itself
if(changed) ((QucsView*)parent())->viewport()->repaint();
}
// -------------------------------------------------------------------------

21
qucs/diagrams/diagramdialog.cpp
View File

@ -17,6 +17,8 @@
#include "diagramdialog.h"
#include "../qucsview.h"
#include <qvbox.h>
#include <qlayout.h>
#include <qvbuttongroup.h>
@ -46,7 +48,7 @@ DiagramDialog::DiagramDialog(Diagram *d, const QString& _DataSet,
defaultDataSet = _DataSet;
setCaption(tr("Edit Diagram Properties"));
changed = false;
toTake = false; // should double-clicked variable be inserted immediately into the graph list ?
toTake = false; // double-clicked variable be inserted into graph list ?
// setFixedSize(QSize(400, 400));
// setMinimumSize(QSize(400, 400));
@ -219,9 +221,10 @@ void DiagramDialog::slotReadVars(int)
} while(i > 0);
}
// --------------------------------------------------------------------------
// Inserts the double-clicked variable into the Graph Input Line at the cursor position.
// If the Graph Input is empty, then the variable is also inserted as graph.
// ------------------------------------------------------------------------
// Inserts the double-clicked variable into the Graph Input Line at the
// cursor position. If the Graph Input is empty, then the variable is
// also inserted as graph.
void DiagramDialog::slotTakeVar(QListViewItem *Item)
{
GraphInput->blockSignals(true);
@ -240,7 +243,8 @@ void DiagramDialog::slotTakeVar(QListViewItem *Item)
g->Thick = GraphThick->text().toInt();
Diag->Graphs.append(g);
ColorButt->setPaletteBackgroundColor(QColor(DefaultColors[GraphList->count()]));
ColorButt->setPaletteBackgroundColor(
QColor(DefaultColors[GraphList->count()]));
changed = true;
toTake = true;
}
@ -302,6 +306,7 @@ void DiagramDialog::slotNewGraph()
}
// --------------------------------------------------------------------------
// Is called if "Ok" button is pressed.
void DiagramDialog::slotOK()
{
slotApply();
@ -310,15 +315,16 @@ void DiagramDialog::slotOK()
}
// --------------------------------------------------------------------------
// Is called if "Apply" button is pressed.
void DiagramDialog::slotApply()
{
if(Diag->xLabel.isEmpty()) Diag->xLabel = ""; // QString can be non-Null and empty !!!
if(Diag->xLabel.isEmpty()) Diag->xLabel = ""; // can be non-Null and empty!
if(xLabel->text().isEmpty()) xLabel->setText("");
if(Diag->xLabel != xLabel->text()) {
Diag->xLabel = xLabel->text();
changed = true;
}
if(Diag->yLabel.isEmpty()) Diag->yLabel = ""; // QString can be non-Null and empty !!!
if(Diag->yLabel.isEmpty()) Diag->yLabel = ""; // can be non-Null and empty!
if(yLabel->text().isEmpty()) yLabel->setText("");
if(Diag->yLabel != yLabel->text()) {
Diag->yLabel = yLabel->text();
@ -330,6 +336,7 @@ void DiagramDialog::slotApply()
}
Diag->loadGraphData(defaultDataSet);
((QucsView*)parent())->viewport()->repaint();
}
// --------------------------------------------------------------------------

17
qucs/diagrams/marker.cpp
View File

@ -317,13 +317,20 @@ void Marker::setCenter(int x, int y, bool relative)
}
// -------------------------------------------------------
// Provides the coordinates relative to the diagram !!!
void Marker::Bounding(int& _x1, int& _y1, int& _x2, int& _y2)
{
_x1 = x1;
_y1 = y1;
_x2 = x1+x2;
_y2 = y1-y2;
if(Diag) {
_x1 = Diag->cx + x1;
_y1 = Diag->cy - y1-y2;
_x2 = Diag->cx + x1+x2;
_y2 = Diag->cy - y1;
}
else {
_x1 = x1;
_y1 = y1+y2;
_x2 = x1+x2;
_y2 = y1;
}
}
// ---------------------------------------------------------------------

2
qucs/dialogs/settingsdialog.cpp
View File

@ -27,7 +27,7 @@
SettingsDialog::SettingsDialog(QucsDoc *d, QWidget *parent, const char *name)
: QDialog(parent, name, TRUE, Qt::WDestructiveClose)
: QDialog(parent, name, TRUE, Qt::WDestructiveClose)
{
Doc = d;
setCaption(tr("Edit File Properties"));

6
qucs/paintings/Makefile.am
View File

@ -24,15 +24,15 @@
noinst_LIBRARIES = libpaintings.a
MOCHEADERS = arrowdialog.h graphictextdialog.h linedialog.h
MOCHEADERS = arrowdialog.h graphictextdialog.h linedialog.h filldialog.h
MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
libpaintings_a_SOURCES = rectangle.cpp painting.cpp linedialog.cpp arrow.cpp \
graphictextdialog.cpp graphictext.cpp graphicline.cpp ellipse.cpp \
arrowdialog.cpp $(MOCFILES)
arrowdialog.cpp filledrect.cpp filledellipse.cpp filldialog.cpp $(MOCFILES)
noinst_HEADERS = $(MOCHEADERS) arrow.h ellipse.h graphicline.h graphictext.h \
painting.h paintings.h rectangle.h
painting.h paintings.h rectangle.h filledrect.h filledellipse.h
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES)

16
qucs/paintings/ellipse.cpp
View File

@ -37,19 +37,19 @@ void Ellipse::paint(QPainter *p)
{
if(isSelected) {
p->setPen(QPen(QPen::darkGray,Pen.width()+5));
p->drawArc(cx, cy, x2, y2, 0, 16*360);
p->drawEllipse(cx, cy, x2, y2);
p->setPen(QPen(QPen::white, Pen.width(), Pen.style()));
p->drawArc(cx, cy, x2, y2, 0, 16*360);
p->drawEllipse(cx, cy, x2, y2);
return;
}
p->setPen(Pen);
p->drawArc(cx, cy, x2, y2, 0, 16*360);
p->drawEllipse(cx, cy, x2, y2);
}
// --------------------------------------------------------------------------
void Ellipse::paintScheme(QPainter *p)
{
p->drawArc(cx, cy, x2, y2, 0, 16*360);
p->drawEllipse(cx, cy, x2, y2);
}
// --------------------------------------------------------------------------
@ -131,20 +131,20 @@ QString Ellipse::save()
void Ellipse::MouseMoving(int x, int y, int gx, int gy, QPainter *p, bool drawn)
{
if(State > 0) {
if(State > 1) p->drawArc(x1, y1, x2-x1, y2-y1, 0, 16*360); // erase old painting
if(State > 1) p->drawEllipse(x1, y1, x2-x1, y2-y1); // erase old painting
State++;
x2 = gx;
y2 = gy;
p->drawArc(x1, y1, x2-x1, y2-y1, 0, 16*360); // paint new painting
p->drawEllipse(x1, y1, x2-x1, y2-y1); // paint new painting
}
else { x2 = gx; y2 = gy; }
p->setPen(Qt::SolidLine);
if(drawn) p->drawArc(cx+13, cy, 18, 12, 0, 16*360); // erase old cursor symbol
if(drawn) p->drawEllipse(cx+13, cy, 18, 12); // erase old cursor symbol
cx = x;
cy = y;
p->drawArc(cx+13, cy, 18, 12, 0, 16*360); // paint new cursor symbol
p->drawEllipse(cx+13, cy, 18, 12); // paint new cursor symbol
}
// --------------------------------------------------------------------------

244
qucs/paintings/filldialog.cpp Normal file
View File

@ -0,0 +1,244 @@
/***************************************************************************
filldialog.cpp - description
-------------------
begin : Thu May 20 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "filldialog.h"
#include <qlayout.h>
#include <qlabel.h>
#include <qhbox.h>
#include <qvalidator.h>
#include <qcolordialog.h>
FillDialog::FillDialog(const QString& _Caption, QWidget *parent,
const char *name) : QDialog(parent, name)
{
setCaption(_Caption);
QVBoxLayout *v = new QVBoxLayout(this);
v->setSpacing(5);
v->setMargin(5);
QHBox *h1 = new QHBox(this);
h1->setSpacing(5);
v->addWidget(h1);
QHBox *h2 = new QHBox(this);
h2->setSpacing(5);
v->addWidget(h2);
QHBox *h3 = new QHBox(this);
h3->setSpacing(5);
v->addWidget(h3);
QHBox *h4 = new QHBox(this);
h4->setSpacing(5);
v->addWidget(h4);
QHBox *h5 = new QHBox(this);
h5->setSpacing(5);
v->addWidget(h5);
// must be first to get RETURN pressed event
QPushButton *ButtOK = new QPushButton(tr("OK"),h5);
connect(ButtOK, SIGNAL(clicked()), SLOT(accept()));
QPushButton *ButtCancel = new QPushButton(tr("Cancel"),h5);
connect(ButtCancel, SIGNAL(clicked()), SLOT(reject()));
new QLabel(tr("Line Color: "), h1);
ColorButt = new QPushButton(" ",h1);
ColorButt->setPaletteBackgroundColor(QColor(0,0,0));
connect(ColorButt, SIGNAL(clicked()), SLOT(slotSetColor()));
new QLabel(tr(" Line Width: "), h1);
Expr.setPattern("[0-9]{1,2}"); // valid expression for property input
QValidator *Validator = new QRegExpValidator(Expr, this);
LineWidth = new QLineEdit(h1);
LineWidth->setValidator(Validator);
LineWidth->setMaximumWidth(35);
LineWidth->setText("0");
new QLabel(tr("Line Style: "), h2);
StyleBox = new QComboBox(h2);
StyleBox->insertItem(tr("solid line"));
StyleBox->insertItem(tr("dash line"));
StyleBox->insertItem(tr("dot line"));
StyleBox->insertItem(tr("dash dot line"));
StyleBox->insertItem(tr("dash dot dot line"));
connect(StyleBox, SIGNAL(activated(int)), SLOT(slotSetStyle(int)));
LineStyle = Qt::SolidLine;
new QLabel(tr("Fill Color: "), h3);
FillColorButt = new QPushButton(" ", h3);
FillColorButt->setPaletteBackgroundColor(QColor(0,0,0));
connect(FillColorButt, SIGNAL(clicked()), SLOT(slotSetFillColor()));
new QLabel(tr("Fill Style: "), h4);
FillStyleBox = new QComboBox(h4);
FillStyleBox->insertItem(tr("no filling"));
FillStyleBox->insertItem(tr("solid"));
FillStyleBox->insertItem(tr("dense 1 (densest)"));
FillStyleBox->insertItem(tr("dense 2 (densest)"));
FillStyleBox->insertItem(tr("dense 3 (densest)"));
FillStyleBox->insertItem(tr("dense 4 (densest)"));
FillStyleBox->insertItem(tr("dense 5 (densest)"));
FillStyleBox->insertItem(tr("dense 6 (densest)"));
FillStyleBox->insertItem(tr("dense 7 (least dense)"));
FillStyleBox->insertItem(tr("horizontal line"));
FillStyleBox->insertItem(tr("vertical line"));
FillStyleBox->insertItem(tr("crossed lines"));
FillStyleBox->insertItem(tr("hatched backwards"));
FillStyleBox->insertItem(tr("hatched forwards"));
FillStyleBox->insertItem(tr("diagonal crossed"));
connect(FillStyleBox, SIGNAL(activated(int)), SLOT(slotSetFillStyle(int)));
FillStyle = Qt::SolidPattern;
ButtOK->setFocus();
}
FillDialog::~FillDialog()
{
}
// --------------------------------------------------------------------------
void FillDialog::slotSetColor()
{
QColor c = QColorDialog::getColor(ColorButt->paletteBackgroundColor(),this);
ColorButt->setPaletteBackgroundColor(c);
}
// --------------------------------------------------------------------------
void FillDialog::slotSetFillColor()
{
QColor c =
QColorDialog::getColor(FillColorButt->paletteBackgroundColor(), this);
FillColorButt->setPaletteBackgroundColor(c);
}
// --------------------------------------------------------------------------
void FillDialog::slotSetStyle(int index)
{
switch(index) {
case 0 : LineStyle = Qt::SolidLine;
break;
case 1 : LineStyle = Qt::DashLine;
break;
case 2 : LineStyle = Qt::DotLine;
break;
case 3 : LineStyle = Qt::DashDotLine;
break;
case 4 : LineStyle = Qt::DashDotDotLine;
break;
}
}
// --------------------------------------------------------------------------
void FillDialog::SetComboBox(Qt::PenStyle _Style)
{
LineStyle = _Style;
switch(_Style) {
case Qt::SolidLine : StyleBox->setCurrentItem(0);
break;
case Qt::DashLine : StyleBox->setCurrentItem(1);
break;
case Qt::DotLine : StyleBox->setCurrentItem(2);
break;
case Qt::DashDotLine : StyleBox->setCurrentItem(3);
break;
case Qt::DashDotDotLine : StyleBox->setCurrentItem(4);
break;
default: ;
}
}
// --------------------------------------------------------------------------
void FillDialog::slotSetFillStyle(int index)
{
switch(index) {
case 0 : FillStyle = Qt::NoBrush;
break;
case 1 : FillStyle = Qt::SolidPattern;
break;
case 2 : FillStyle = Qt::Dense1Pattern;
break;
case 3 : FillStyle = Qt::Dense2Pattern;
break;
case 4 : FillStyle = Qt::Dense3Pattern;
break;
case 5 : FillStyle = Qt::Dense4Pattern;
break;
case 6 : FillStyle = Qt::Dense5Pattern;
break;
case 7 : FillStyle = Qt::Dense6Pattern;
break;
case 8 : FillStyle = Qt::Dense7Pattern;
break;
case 9 : FillStyle = Qt::HorPattern;
break;
case 10 : FillStyle = Qt::VerPattern;
break;
case 11 : FillStyle = Qt::CrossPattern;
break;
case 12 : FillStyle = Qt::BDiagPattern;
break;
case 13 : FillStyle = Qt::FDiagPattern;
break;
case 14 : FillStyle = Qt::DiagCrossPattern;
break;
}
}
// --------------------------------------------------------------------------
void FillDialog::SetFillComboBox(Qt::BrushStyle _Style)
{
FillStyle = _Style;
switch(_Style) {
case Qt::NoBrush : FillStyleBox->setCurrentItem(0);
break;
case Qt::SolidPattern : FillStyleBox->setCurrentItem(1);
break;
case Qt::Dense1Pattern : FillStyleBox->setCurrentItem(2);
break;
case Qt::Dense2Pattern : FillStyleBox->setCurrentItem(3);
break;
case Qt::Dense3Pattern : FillStyleBox->setCurrentItem(4);
break;
case Qt::Dense4Pattern : FillStyleBox->setCurrentItem(5);
break;
case Qt::Dense5Pattern : FillStyleBox->setCurrentItem(6);
break;
case Qt::Dense6Pattern : FillStyleBox->setCurrentItem(7);
break;
case Qt::Dense7Pattern : FillStyleBox->setCurrentItem(8);
break;
case Qt::HorPattern : FillStyleBox->setCurrentItem(9);
break;
case Qt::VerPattern : FillStyleBox->setCurrentItem(10);
break;
case Qt::CrossPattern : FillStyleBox->setCurrentItem(11);
break;
case Qt::BDiagPattern : FillStyleBox->setCurrentItem(12);
break;
case Qt::FDiagPattern : FillStyleBox->setCurrentItem(13);
break;
case Qt::DiagCrossPattern : FillStyleBox->setCurrentItem(14);
break;
default: ;
}
}

56
qucs/paintings/filldialog.h Normal file
View File

@ -0,0 +1,56 @@
/***************************************************************************
filldialog.h - description
-------------------
begin : Thu May 20 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef FILLDIALOG_H
#define FILLDIALOG_H
#include <qdialog.h>
#include <qregexp.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qcombobox.h>
/**
*@author Michael Margraf
*/
class FillDialog : public QDialog {
Q_OBJECT
public:
FillDialog(const QString& _Caption, QWidget *parent=0, const char *name=0);
~FillDialog();
void SetComboBox(Qt::PenStyle _Style);
void SetFillComboBox(Qt::BrushStyle _Style);
private slots:
void slotSetColor();
void slotSetFillColor();
void slotSetStyle(int index);
void slotSetFillStyle(int index);
public:
QRegExp Expr;
QLineEdit *LineWidth;
QPushButton *ColorButt, *FillColorButt;
QComboBox *StyleBox, *FillStyleBox;
Qt::PenStyle LineStyle;
Qt::BrushStyle FillStyle;
};
#endif

288
qucs/paintings/filledellipse.cpp Normal file
View File

@ -0,0 +1,288 @@
/***************************************************************************
filledellipse.cpp - description
-------------------
begin : Thu May 20 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "filledellipse.h"
#include "filldialog.h"
// **********************************************************************
// In contrast to "rectangle", the "filledrect" is also selected when
// clicking within the rectangle.
FilledEllipse::FilledEllipse()
{
isSelected = false;
Pen = QPen(QColor());
Brush = QBrush(QPen::lightGray);
cx = cy = 0;
x1 = x2 = 0;
y1 = y2 = 0;
}
FilledEllipse::~FilledEllipse()
{
}
// --------------------------------------------------------------------------
void FilledEllipse::paint(QPainter *p)
{
if(isSelected) {
p->setPen(QPen(QPen::darkGray,Pen.width()+5));
p->setBrush(Brush);
p->drawEllipse(cx, cy, x2, y2);
p->setPen(QPen(QPen::white, Pen.width(), Pen.style()));
p->setBrush(QBrush::NoBrush);
p->drawEllipse(cx, cy, x2, y2);
return;
}
p->setPen(Pen);
p->setBrush(Brush);
p->drawEllipse(cx, cy, x2, y2);
p->setBrush(QBrush::NoBrush); // no filling for the next paintings
}
// --------------------------------------------------------------------------
void FilledEllipse::paintScheme(QPainter *p)
{
p->drawEllipse(cx, cy, x2, y2);
}
// --------------------------------------------------------------------------
void FilledEllipse::getCenter(int& x, int &y)
{
x = cx+(x2>>1);
y = cy+(y2>>1);
}
// --------------------------------------------------------------------------
// Sets the center of the painting to x/y.
void FilledEllipse::setCenter(int x, int y, bool relative)
{
if(relative) { cx += x; cy += y; }
else { cx = x-(x2>>1); cy = y-(y2>>1); }
}
// --------------------------------------------------------------------------
FilledEllipse* FilledEllipse::newOne()
{
return new FilledEllipse();
}
// --------------------------------------------------------------------------
bool FilledEllipse::load(const QString& _s)
{
bool ok;
QString s = _s;
if(s.at(0) != '<') return false;
if(s.at(s.length()-1) != '>') return false;
s = s.mid(1, s.length()-2); // cut off start and end character
QString n;
n = s.section(' ',1,1); // cx
cx = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',2,2); // cy
cy = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',3,3); // x2
x2 = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',4,4); // y2
y2 = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',5,5); // color
QColor co;
co.setNamedColor(n);
Pen.setColor(co);
if(!Pen.color().isValid()) return false;
n = s.section(' ',6,6); // thickness
Pen.setWidth(n.toInt(&ok));
if(!ok) return false;
n = s.section(' ',7,7); // line style
Pen.setStyle((Qt::PenStyle)n.toInt(&ok));
if(!ok) return false;
n = s.section(' ',8,8); // fill color
co.setNamedColor(n);
Brush.setColor(co);
if(!Brush.color().isValid()) return false;
n = s.section(' ',9,9); // fill style
Brush.setStyle((Qt::BrushStyle)n.toInt(&ok));
if(!ok) return false;
return true;
}
// --------------------------------------------------------------------------
QString FilledEllipse::save()
{
QString s = " <FilledEllipse " +
QString::number(cx) + " " + QString::number(cy) + " " +
QString::number(x2) + " " + QString::number(y2) + " " +
Pen.color().name() + " " + QString::number(Pen.width()) + " " +
QString::number(Pen.style()) + " " +
Brush.color().name() + " " + QString::number(Brush.style()) + ">";
return s;
}
// --------------------------------------------------------------------------
// x/y are the precise coordinates, gx/gy are the coordinates due to the grid.
void FilledEllipse::MouseMoving(int x, int y, int gx, int gy, QPainter *p, bool drawn)
{
if(State > 0) {
if(State > 1) p->drawEllipse(x1, y1, x2-x1, y2-y1); // erase old painting
State++;
x2 = gx;
y2 = gy;
p->drawEllipse(x1, y1, x2-x1, y2-y1); // paint new painting
}
else { x2 = gx; y2 = gy; }
p->setPen(Qt::SolidLine);
if(drawn) {
p->drawEllipse(cx+13, cy, 18, 12); // erase old cursor symbol
p->drawLine(cx+14, cy+7, cx+20, cy+1);
p->drawLine(cx+25, cy+2, cx+18, cy+9);
p->drawLine(cx+29, cy+4, cx+23, cy+10);
}
cx = x;
cy = y;
p->drawEllipse(cx+13, cy, 18, 12); // paint new cursor symbol
p->drawLine(cx+14, cy+7, cx+20, cy+1);
p->drawLine(cx+25, cy+2, cx+18, cy+9);
p->drawLine(cx+29, cy+4, cx+23, cy+10);
}
// --------------------------------------------------------------------------
bool FilledEllipse::MousePressing()
{
State++;
if(State == 1) {
x1 = x2;
y1 = y2; // first corner is determined
}
else {
if(x1 < x2) { cx = x1; x2 = x2-x1; } // cx/cy should always be the upper left corner
else { cx = x2; x2 = x1-x2; }
if(y1 < y2) { cy = y1; y2 = y2-y1; }
else { cy = y2; y2 = y1-y2; }
x1 = y1 = 0;
State = 0;
return true; // painting is ready
}
return false;
}
// --------------------------------------------------------------------------
// Checks if the coordinates x/y point to the painting.
bool FilledEllipse::getSelected(int x, int y)
{
x = (x-cx-(x2>>1)); x *= x;
y = (y-cy-(y2>>1)); y *= y;
int a = x2 >> 1; a *= a;
int b = y2 >> 1; b *= b;
double x_double = double(x);
double y_double = double(y);
if((x_double/double(a) + y_double/double(b)) > 1.0) return false;
return true;
}
// --------------------------------------------------------------------------
void FilledEllipse::Bounding(int& _x1, int& _y1, int& _x2, int& _y2)
{
_x1 = cx; _y1 = cy;
_x2 = cx+x2; _y2 = cy+y2;
}
// --------------------------------------------------------------------------
// Rotates around the center.
void FilledEllipse::rotate()
{
cy += (y2-x2) >> 1;
cx += (x2-y2) >> 1;
int tmp = x2;
x2 = y2;
y2 = tmp;
}
// --------------------------------------------------------------------------
// Mirrors about center line.
void FilledEllipse::mirrorX()
{ // nothing to do
}
// --------------------------------------------------------------------------
// Mirrors about center line.
void FilledEllipse::mirrorY()
{ // nothing to do
}
// --------------------------------------------------------------------------
// Calls the property dialog for the painting and changes them accordingly.
// If there were changes, it returns 'true'.
bool FilledEllipse::Dialog()
{
bool changed = false;
FillDialog *d = new FillDialog(QObject::tr("Edit Ellipse Properties"));
d->ColorButt->setPaletteBackgroundColor(Pen.color());
d->LineWidth->setText(QString::number(Pen.width()));
d->SetComboBox(Pen.style());
d->FillColorButt->setPaletteBackgroundColor(Brush.color());
d->SetFillComboBox(Brush.style());
if(d->exec() == QDialog::Rejected) {
delete d;
return false;
}
if(Pen.color() != d->ColorButt->paletteBackgroundColor()) {
Pen.setColor(d->ColorButt->paletteBackgroundColor());
changed = true;
}
if(Pen.width() != d->LineWidth->text().toUInt()) {
Pen.setWidth(d->LineWidth->text().toUInt());
changed = true;
}
if(Pen.style() != d->LineStyle) {
Pen.setStyle(d->LineStyle);
changed = true;
}
if(Brush.color() != d->FillColorButt->paletteBackgroundColor()) {
Brush.setColor(d->FillColorButt->paletteBackgroundColor());
changed = true;
}
if(Brush.style() != d->FillStyle) {
Brush.setStyle(d->FillStyle);
changed = true;
}
delete d;
return changed;
}

58
qucs/paintings/filledellipse.h Normal file
View File

@ -0,0 +1,58 @@
/***************************************************************************
filledellipse.h - description
-------------------
begin : Thu May 20 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef FILLEDELLIPSE_H
#define FILLEDELLIPSE_H
#include "painting.h"
#include <qpen.h>
#include <qbrush.h>
/**
*@author Michael Margraf
*/
class FilledEllipse : public Painting {
public:
FilledEllipse();
~FilledEllipse();
void paintScheme(QPainter *p);
void getCenter(int& x, int &y);
void setCenter(int x, int y, bool relative=false);
FilledEllipse* newOne();
bool load(const QString& s);
QString save();
void paint(QPainter *p);
void MouseMoving(int x, int y, int gx, int gy, QPainter *p, bool drawn);
bool MousePressing();
bool getSelected(int x, int y);
void Bounding(int&, int&, int&, int&);
void rotate();
void mirrorX();
void mirrorY();
bool Dialog();
QPen Pen;
QBrush Brush;
};
#endif

285
qucs/paintings/filledrect.cpp Normal file
View File

@ -0,0 +1,285 @@
/***************************************************************************
filledrect.cpp - description
-------------------
begin : Thu May 20 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "filledrect.h"
#include "filldialog.h"
// **********************************************************************
// In contrast to "rectangle", the "filledrect" is also selected when
// clicking within the rectangle.
FilledRect::FilledRect()
{
isSelected = false;
Pen = QPen(QColor());
Brush = QBrush(QPen::lightGray);
cx = cy = 0;
x1 = x2 = 0;
y1 = y2 = 0;
}
FilledRect::~FilledRect()
{
}
// --------------------------------------------------------------------------
void FilledRect::paint(QPainter *p)
{
if(isSelected) {
p->setPen(QPen(QPen::darkGray,Pen.width()+5));
p->setBrush(Brush);
p->drawRect(cx, cy, x2, y2);
p->setPen(QPen(QPen::white, Pen.width(), Pen.style()));
p->setBrush(QBrush::NoBrush);
p->drawRect(cx, cy, x2, y2);
return;
}
p->setPen(Pen);
p->setBrush(Brush);
p->drawRect(cx, cy, x2, y2);
p->setBrush(QBrush::NoBrush); // no filling for the next paintings
}
// --------------------------------------------------------------------------
void FilledRect::paintScheme(QPainter *p)
{
p->drawRect(cx, cy, x2, y2);
}
// --------------------------------------------------------------------------
void FilledRect::getCenter(int& x, int &y)
{
x = cx+(x2>>1);
y = cy+(y2>>1);
}
// --------------------------------------------------------------------------
// Sets the center of the painting to x/y.
void FilledRect::setCenter(int x, int y, bool relative)
{
if(relative) { cx += x; cy += y; }
else { cx = x-(x2>>1); cy = y-(y2>>1); }
}
// --------------------------------------------------------------------------
FilledRect* FilledRect::newOne()
{
return new FilledRect();
}
// --------------------------------------------------------------------------
bool FilledRect::load(const QString& _s)
{
bool ok;
QString s = _s;
if(s.at(0) != '<') return false;
if(s.at(s.length()-1) != '>') return false;
s = s.mid(1, s.length()-2); // cut off start and end character
QString n;
n = s.section(' ',1,1); // cx
cx = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',2,2); // cy
cy = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',3,3); // x2
x2 = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',4,4); // y2
y2 = n.toInt(&ok);
if(!ok) return false;
n = s.section(' ',5,5); // color
QColor co;
co.setNamedColor(n);
Pen.setColor(co);
if(!Pen.color().isValid()) return false;
n = s.section(' ',6,6); // thickness
Pen.setWidth(n.toInt(&ok));
if(!ok) return false;
n = s.section(' ',7,7); // line style
Pen.setStyle((Qt::PenStyle)n.toInt(&ok));
if(!ok) return false;
n = s.section(' ',8,8); // fill color
co.setNamedColor(n);
Brush.setColor(co);
if(!Brush.color().isValid()) return false;
n = s.section(' ',9,9); // fill style
Brush.setStyle((Qt::BrushStyle)n.toInt(&ok));
if(!ok) return false;
return true;
}
// --------------------------------------------------------------------------
QString FilledRect::save()
{
QString s = " <FilledRect " +
QString::number(cx) + " " + QString::number(cy) + " " +
QString::number(x2) + " " + QString::number(y2) + " " +
Pen.color().name() + " " + QString::number(Pen.width()) + " " +
QString::number(Pen.style()) + " " +
Brush.color().name() + " " + QString::number(Brush.style()) + ">";
return s;
}
// --------------------------------------------------------------------------
// x/y are the precise coordinates, gx/gy are the coordinates due to the grid.
void FilledRect::MouseMoving(int x, int y, int gx, int gy, QPainter *p, bool drawn)
{
if(State > 0) {
if(State > 1) p->drawRect(x1, y1, x2-x1, y2-y1); // erase old painting
State++;
x2 = gx;
y2 = gy;
p->drawRect(x1, y1, x2-x1, y2-y1); // paint new rectangle
}
else { x2 = gx; y2 = gy; }
p->setPen(Qt::SolidLine);
if(drawn) {
p->drawRect(cx+13, cy, 18, 12); // erase old cursor symbol
p->drawLine(cx+14, cy+6, cx+19, cy+1);
p->drawLine(cx+26, cy+1, cx+17, cy+10);
p->drawLine(cx+29, cy+5, cx+24, cy+10);
}
cx = x;
cy = y;
p->drawRect(cx+13, cy, 18, 12); // paint new cursor symbol
p->drawLine(cx+14, cy+6, cx+19, cy+1);
p->drawLine(cx+26, cy+1, cx+17, cy+10);
p->drawLine(cx+29, cy+5, cx+24, cy+10);
}
// --------------------------------------------------------------------------
bool FilledRect::MousePressing()
{
State++;
if(State == 1) {
x1 = x2;
y1 = y2; // first corner is determined
}
else {
if(x1 < x2) { cx = x1; x2 = x2-x1; } // cx/cy always be upper left corner
else { cx = x2; x2 = x1-x2; }
if(y1 < y2) { cy = y1; y2 = y2-y1; }
else { cy = y2; y2 = y1-y2; }
x1 = y1 = 0;
State = 0;
return true; // rectangle is ready
}
return false;
}
// --------------------------------------------------------------------------
// Checks if the coordinates x/y point to the painting.
bool FilledRect::getSelected(int x, int y)
{
if(x > (cx+x2)) return false; // coordinates outside the rectangle ?
if(y > (cy+y2)) return false;
if(x < cx) return false;
if(y < cy) return false;
return true;
}
// --------------------------------------------------------------------------
void FilledRect::Bounding(int& _x1, int& _y1, int& _x2, int& _y2)
{
_x1 = cx; _y1 = cy;
_x2 = cx+x2; _y2 = cy+y2;
}
// --------------------------------------------------------------------------
// Rotates around the center.
void FilledRect::rotate()
{
cy += (y2-x2) >> 1;
cx += (x2-y2) >> 1;
int tmp = x2;
x2 = y2;
y2 = tmp;
}
// --------------------------------------------------------------------------
// Mirrors about center line.
void FilledRect::mirrorX()
{ // nothing to do
}
// --------------------------------------------------------------------------
// Mirrors about center line.
void FilledRect::mirrorY()
{ // nothing to do
}
// --------------------------------------------------------------------------
// Calls the property dialog for the painting and changes them accordingly.
// If there were changes, it returns 'true'.
bool FilledRect::Dialog()
{
bool changed = false;
FillDialog *d = new FillDialog(QObject::tr("Edit Rectangle Properties"));
d->ColorButt->setPaletteBackgroundColor(Pen.color());
d->LineWidth->setText(QString::number(Pen.width()));
d->SetComboBox(Pen.style());
d->FillColorButt->setPaletteBackgroundColor(Brush.color());
d->SetFillComboBox(Brush.style());
if(d->exec() == QDialog::Rejected) {
delete d;
return false;
}
if(Pen.color() != d->ColorButt->paletteBackgroundColor()) {
Pen.setColor(d->ColorButt->paletteBackgroundColor());
changed = true;
}
if(Pen.width() != d->LineWidth->text().toUInt()) {
Pen.setWidth(d->LineWidth->text().toUInt());
changed = true;
}
if(Pen.style() != d->LineStyle) {
Pen.setStyle(d->LineStyle);
changed = true;
}
if(Brush.color() != d->FillColorButt->paletteBackgroundColor()) {
Brush.setColor(d->FillColorButt->paletteBackgroundColor());
changed = true;
}
if(Brush.style() != d->FillStyle) {
Brush.setStyle(d->FillStyle);
changed = true;
}
delete d;
return changed;
}

58
qucs/paintings/filledrect.h Normal file
View File

@ -0,0 +1,58 @@
/***************************************************************************
filledrect.h - description
-------------------
begin : Thu May 20 2004
copyright : (C) 2003 by Michael Margraf
email : margraf@mwt.ee.tu-berlin.de
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef FILLEDRECT_H
#define FILLEDRECT_H
#include "painting.h"
#include <qpen.h>
#include <qbrush.h>
/**
*@author Michael Margraf
*/
class FilledRect : public Painting {
public:
FilledRect();
~FilledRect();
void paintScheme(QPainter *p);
void getCenter(int& x, int &y);
void setCenter(int x, int y, bool relative=false);
FilledRect* newOne();
bool load(const QString& s);
QString save();
void paint(QPainter *p);
void MouseMoving(int x, int y, int gx, int gy, QPainter *p, bool drawn);
bool MousePressing();
bool getSelected(int x, int y);
void Bounding(int&, int&, int&, int&);
void rotate();
void mirrorX();
void mirrorY();
bool Dialog();
QPen Pen;
QBrush Brush; // filling style/color
};
#endif

2
qucs/paintings/paintings.h
View File

@ -23,7 +23,9 @@
#include "painting.h"
#include "rectangle.h"
#include "filledrect.h"
#include "ellipse.h"
#include "filledellipse.h"
#include "arrow.h"
#include "graphicline.h"
#include "graphictext.h"

212
qucs/qucs.cpp
View File

@ -67,6 +67,7 @@ QucsApp::QucsApp()
if(!loadSettings())
resize(600,400);
// resize(maximumSize());
initView();
@ -117,8 +118,6 @@ bool QucsApp::loadSettings()
resize(x,y); }
}
file.close();
// resize(600,400);
// resize(maximumSize());
return true;
}
@ -230,14 +229,14 @@ void QucsApp::initView()
// ---------------------------------------------------------------------
readProjects(); // reads all projects and inserts them into the ListBox
view->Docs.append(new QucsDoc(WorkView, "")); // creates a document called "untitled"
// creates a document called "untitled"
view->Docs.append(new QucsDoc(WorkView, ""));
// ...............................................................
// connect(view, SIGNAL(CompsSelected(bool)), this, SLOT(slotActivateCopy(bool)));
}
// ----------------------------------------------------------
// Menu that appears if right mouse button is pressed on a file in the "Content" ListView.
// Menu that appears if right mouse button is pressed on a file in the
// "Content" ListView.
void QucsApp::initCursorMenu()
{
ContentMenu = new QPopupMenu(Content);
@ -432,6 +431,8 @@ bool QucsApp::gotoPage(const QString& Name)
if(!d->load()) { // load document if possible
view->Docs.remove();
view->Docs.at(No);
view->viewport()->repaint();
view->drawn = false;
return false;
}
@ -460,7 +461,6 @@ void QucsApp::slotFileSettings()
{
SettingsDialog *d = new SettingsDialog(view->Docs.current(), this);
d->exec();
delete d;
view->viewport()->repaint();
view->drawn = false;
}
@ -483,7 +483,7 @@ void QucsApp::slotFileOpen()
statusBar()->message(tr("Opening file..."));
QString s = QFileDialog::getOpenFileName(".", QucsFileFilter, this,
"", tr("Enter a Schematic Name"));
"", tr("Enter a Schematic Name"));
if(!s.isEmpty()) gotoPage(s); //openDocument(s);
else statusBar()->message(tr("Opening aborted"), 2000);
@ -1250,80 +1250,144 @@ void QucsApp::slotSetCompView(int index)
CompComps->clear(); // clear the IconView
switch(index) {
case COMBO_passive:
new QIconViewItem(CompComps, tr("Resistor"), QImage(BITMAPDIR "resistor.xpm"));
new QIconViewItem(CompComps, tr("Resistor US"), QImage(BITMAPDIR "resistor_us.xpm"));
new QIconViewItem(CompComps, tr("Capacitor"), QImage(BITMAPDIR "capacitor.xpm"));
new QIconViewItem(CompComps, tr("Inductor"), QImage(BITMAPDIR "inductor.xpm"));
new QIconViewItem(CompComps, tr("Ground"), QImage(BITMAPDIR "ground.xpm"));
new QIconViewItem(CompComps, tr("Subcircuit Port"), QImage(BITMAPDIR "port.xpm"));
new QIconViewItem(CompComps, tr("Transformer"), QImage(BITMAPDIR "transformer.xpm"));
new QIconViewItem(CompComps, tr("symmetric Transformer"), QImage(BITMAPDIR "symtrans.xpm"));
new QIconViewItem(CompComps, tr("dc Block"), QImage(BITMAPDIR "dcblock.xpm"));
new QIconViewItem(CompComps, tr("dc Feed"), QImage(BITMAPDIR "dcfeed.xpm"));
new QIconViewItem(CompComps, tr("Bias T"), QImage(BITMAPDIR "biast.xpm"));
new QIconViewItem(CompComps, tr("Attenuator"), QImage(BITMAPDIR "attenuator.xpm"));
new QIconViewItem(CompComps, tr("Isolator"), QImage(BITMAPDIR "isolator.xpm"));
new QIconViewItem(CompComps, tr("Circulator"), QImage(BITMAPDIR "circulator.xpm"));
new QIconViewItem(CompComps, tr("Gyrator"), QImage(BITMAPDIR "gyrator.xpm"));
new QIconViewItem(CompComps, tr("Phase Shifter"), QImage(BITMAPDIR "pshifter.xpm"));
new QIconViewItem(CompComps, tr("Current Probe"), QImage(BITMAPDIR "iprobe.xpm"));
new QIconViewItem(CompComps, tr("Resistor"),
QImage(BITMAPDIR "resistor.xpm"));
new QIconViewItem(CompComps, tr("Resistor US"),
QImage(BITMAPDIR "resistor_us.xpm"));
new QIconViewItem(CompComps, tr("Capacitor"),
QImage(BITMAPDIR "capacitor.xpm"));
new QIconViewItem(CompComps, tr("Inductor"),
QImage(BITMAPDIR "inductor.xpm"));
new QIconViewItem(CompComps, tr("Ground"),
QImage(BITMAPDIR "ground.xpm"));
new QIconViewItem(CompComps, tr("Subcircuit Port"),
QImage(BITMAPDIR "port.xpm"));
new QIconViewItem(CompComps, tr("Transformer"),
QImage(BITMAPDIR "transformer.xpm"));
new QIconViewItem(CompComps, tr("symmetric Transformer"),
QImage(BITMAPDIR "symtrans.xpm"));
new QIconViewItem(CompComps, tr("dc Block"),
QImage(BITMAPDIR "dcblock.xpm"));
new QIconViewItem(CompComps, tr("dc Feed"),
QImage(BITMAPDIR "dcfeed.xpm"));
new QIconViewItem(CompComps, tr("Bias T"),
QImage(BITMAPDIR "biast.xpm"));
new QIconViewItem(CompComps, tr("Attenuator"),
QImage(BITMAPDIR "attenuator.xpm"));
new QIconViewItem(CompComps, tr("Isolator"),
QImage(BITMAPDIR "isolator.xpm"));
new QIconViewItem(CompComps, tr("Circulator"),
QImage(BITMAPDIR "circulator.xpm"));
new QIconViewItem(CompComps, tr("Gyrator"),
QImage(BITMAPDIR "gyrator.xpm"));
new QIconViewItem(CompComps, tr("Phase Shifter"),
QImage(BITMAPDIR "pshifter.xpm"));
new QIconViewItem(CompComps, tr("Current Probe"),
QImage(BITMAPDIR "iprobe.xpm"));
break;
case COMBO_Sources:
new QIconViewItem(CompComps, tr("dc Voltage Source"), QImage(BITMAPDIR "dc_voltage.xpm"));
new QIconViewItem(CompComps, tr("dc Current Source"), QImage(BITMAPDIR "dc_current.xpm"));
new QIconViewItem(CompComps, tr("ac Voltage Source"), QImage(BITMAPDIR "ac_voltage.xpm"));
new QIconViewItem(CompComps, tr("Power Source"), QImage(BITMAPDIR "source.xpm"));
new QIconViewItem(CompComps, tr("Noise Voltage Source"), QImage(BITMAPDIR "noise_volt.xpm"));
new QIconViewItem(CompComps, tr("Noise Current Source"), QImage(BITMAPDIR "noise_current.xpm"));
new QIconViewItem(CompComps, tr("Voltage Controlled Current Source"), QImage(BITMAPDIR "vccs.xpm"));
new QIconViewItem(CompComps, tr("Current Controlled Current Source"), QImage(BITMAPDIR "cccs.xpm"));
new QIconViewItem(CompComps, tr("Voltage Controlled Voltage Source"), QImage(BITMAPDIR "vcvs.xpm"));
new QIconViewItem(CompComps, tr("Current Controlled Voltage Source"), QImage(BITMAPDIR "ccvs.xpm"));
new QIconViewItem(CompComps, tr("dc Voltage Source"),
QImage(BITMAPDIR "dc_voltage.xpm"));
new QIconViewItem(CompComps, tr("dc Current Source"),
QImage(BITMAPDIR "dc_current.xpm"));
new QIconViewItem(CompComps, tr("ac Voltage Source"),
QImage(BITMAPDIR "ac_voltage.xpm"));
new QIconViewItem(CompComps, tr("Power Source"),
QImage(BITMAPDIR "source.xpm"));
new QIconViewItem(CompComps, tr("Noise Voltage Source"),
QImage(BITMAPDIR "noise_volt.xpm"));
new QIconViewItem(CompComps, tr("Noise Current Source"),
QImage(BITMAPDIR "noise_current.xpm"));
new QIconViewItem(CompComps, tr("Voltage Controlled Current Source"),
QImage(BITMAPDIR "vccs.xpm"));
new QIconViewItem(CompComps, tr("Current Controlled Current Source"),
QImage(BITMAPDIR "cccs.xpm"));
new QIconViewItem(CompComps, tr("Voltage Controlled Voltage Source"),
QImage(BITMAPDIR "vcvs.xpm"));
new QIconViewItem(CompComps, tr("Current Controlled Voltage Source"),
QImage(BITMAPDIR "ccvs.xpm"));
break;
case COMBO_TLines:
new QIconViewItem(CompComps, tr("Transmission Line"), QImage(BITMAPDIR "tline.xpm"));
new QIconViewItem(CompComps, tr("Substrate"), QImage(BITMAPDIR "substrate.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Line"), QImage(BITMAPDIR "msline.xpm"));
new QIconViewItem(CompComps, tr("Coupled Microstrip Line"), QImage(BITMAPDIR "mscoupled.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Step"), QImage(BITMAPDIR "msstep.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Corner"), QImage(BITMAPDIR "mscorner.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Tee"), QImage(BITMAPDIR "mstee.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Cross"), QImage(BITMAPDIR "mscross.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Mitered Bend"), QImage(BITMAPDIR "msmbend.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Open"), QImage(BITMAPDIR "msopen.xpm"));
new QIconViewItem(CompComps, tr("Coplanar Line"), QImage(BITMAPDIR "coplanar.xpm"));
new QIconViewItem(CompComps, tr("Transmission Line"),
QImage(BITMAPDIR "tline.xpm"));
new QIconViewItem(CompComps, tr("Substrate"),
QImage(BITMAPDIR "substrate.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Line"),
QImage(BITMAPDIR "msline.xpm"));
new QIconViewItem(CompComps, tr("Coupled Microstrip Line"),
QImage(BITMAPDIR "mscoupled.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Step"),
QImage(BITMAPDIR "msstep.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Corner"),
QImage(BITMAPDIR "mscorner.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Tee"),
QImage(BITMAPDIR "mstee.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Cross"),
QImage(BITMAPDIR "mscross.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Mitered Bend"),
QImage(BITMAPDIR "msmbend.xpm"));
new QIconViewItem(CompComps, tr("Microstrip Open"),
QImage(BITMAPDIR "msopen.xpm"));
new QIconViewItem(CompComps, tr("Coplanar Line"),
QImage(BITMAPDIR "coplanar.xpm"));
break;
case COMBO_nonlinear:
new QIconViewItem(CompComps, tr("Diode"), QImage(BITMAPDIR "diode.xpm"));
new QIconViewItem(CompComps, tr("Diode"),
QImage(BITMAPDIR "diode.xpm"));
break;
case COMBO_File:
new QIconViewItem(CompComps, tr("1-port S parameter file"), QImage(BITMAPDIR "spfile1.xpm"));
new QIconViewItem(CompComps, tr("2-port S parameter file"), QImage(BITMAPDIR "spfile2.xpm"));
new QIconViewItem(CompComps, tr("3-port S parameter file"), QImage(BITMAPDIR "spfile3.xpm"));
new QIconViewItem(CompComps, tr("4-port S parameter file"), QImage(BITMAPDIR "spfile4.xpm"));
new QIconViewItem(CompComps, tr("5-port S parameter file"), QImage(BITMAPDIR "spfile5.xpm"));
new QIconViewItem(CompComps, tr("6-port S parameter file"), QImage(BITMAPDIR "spfile6.xpm"));
new QIconViewItem(CompComps, tr("1-port S parameter file"),
QImage(BITMAPDIR "spfile1.xpm"));
new QIconViewItem(CompComps, tr("2-port S parameter file"),
QImage(BITMAPDIR "spfile2.xpm"));
new QIconViewItem(CompComps, tr("3-port S parameter file"),
QImage(BITMAPDIR "spfile3.xpm"));
new QIconViewItem(CompComps, tr("4-port S parameter file"),
QImage(BITMAPDIR "spfile4.xpm"));
new QIconViewItem(CompComps, tr("5-port S parameter file"),
QImage(BITMAPDIR "spfile5.xpm"));
new QIconViewItem(CompComps, tr("6-port S parameter file"),
QImage(BITMAPDIR "spfile6.xpm"));
break;
case COMBO_Sims:
new QIconViewItem(CompComps, tr("dc simulation"), QImage(BITMAPDIR "dc.xpm"));
new QIconViewItem(CompComps, tr("Transient simulation"), QImage(BITMAPDIR "tran.xpm"));
new QIconViewItem(CompComps, tr("ac simulation"), QImage(BITMAPDIR "ac.xpm"));
new QIconViewItem(CompComps, tr("S-parameter simulation"), QImage(BITMAPDIR "sparameter.xpm"));
new QIconViewItem(CompComps, tr("Harmonic balance"), QImage(BITMAPDIR "hb.xpm"));
new QIconViewItem(CompComps, tr("Parameter sweep"), QImage(BITMAPDIR "sweep.xpm"));
new QIconViewItem(CompComps, tr("dc simulation"),
QImage(BITMAPDIR "dc.xpm"));
new QIconViewItem(CompComps, tr("Transient simulation"),
QImage(BITMAPDIR "tran.xpm"));
new QIconViewItem(CompComps, tr("ac simulation"),
QImage(BITMAPDIR "ac.xpm"));
new QIconViewItem(CompComps, tr("S-parameter simulation"),
QImage(BITMAPDIR "sparameter.xpm"));
new QIconViewItem(CompComps, tr("Harmonic balance"),
QImage(BITMAPDIR "hb.xpm"));
new QIconViewItem(CompComps, tr("Parameter sweep"),
QImage(BITMAPDIR "sweep.xpm"));
break;
case COMBO_Paints:
new QIconViewItem(CompComps, tr("Line"), QImage(BITMAPDIR "line.xpm"));
new QIconViewItem(CompComps, tr("Arrow"), QImage(BITMAPDIR "arrow.xpm"));
new QIconViewItem(CompComps, tr("Text"), QImage(BITMAPDIR "text.xpm"));
new QIconViewItem(CompComps, tr("Ellipse"), QImage(BITMAPDIR "ellipse.xpm"));
new QIconViewItem(CompComps, tr("Rectangle"), QImage(BITMAPDIR "rectangle.xpm"));
new QIconViewItem(CompComps, tr("Line"),
QImage(BITMAPDIR "line.xpm"));
new QIconViewItem(CompComps, tr("Arrow"),
QImage(BITMAPDIR "arrow.xpm"));
new QIconViewItem(CompComps, tr("Text"),
QImage(BITMAPDIR "text.xpm"));
new QIconViewItem(CompComps, tr("Ellipse"),
QImage(BITMAPDIR "ellipse.xpm"));
new QIconViewItem(CompComps, tr("Rectangle"),
QImage(BITMAPDIR "rectangle.xpm"));
new QIconViewItem(CompComps, tr("filled Ellipse"),
QImage(BITMAPDIR "filledellipse.xpm"));
new QIconViewItem(CompComps, tr("filled Rectangle"),
QImage(BITMAPDIR "filledrect.xpm"));
break;
case COMBO_Diagrams:
new QIconViewItem(CompComps, tr("Cartesian"), QImage(BITMAPDIR "rect.xpm"));
new QIconViewItem(CompComps, tr("Polar"), QImage(BITMAPDIR "polar.xpm"));
new QIconViewItem(CompComps, tr("Tabular"), QImage(BITMAPDIR "tabular.xpm"));
new QIconViewItem(CompComps, tr("Smith Chart"), QImage(BITMAPDIR "smith.xpm"));
new QIconViewItem(CompComps, tr("Cartesian"),
QImage(BITMAPDIR "rect.xpm"));
new QIconViewItem(CompComps, tr("Polar"),
QImage(BITMAPDIR "polar.xpm"));
new QIconViewItem(CompComps, tr("Tabular"),
QImage(BITMAPDIR "tabular.xpm"));
new QIconViewItem(CompComps, tr("Smith Chart"),
QImage(BITMAPDIR "smith.xpm"));
break;
}
}
@ -1434,11 +1498,13 @@ void QucsApp::slotSelectComponent(QIconViewItem *item)
break;
case COMBO_Paints:
switch(CompComps->index(item)) {
case 0: view->selPaint = new GraphicLine(); break;
case 1: view->selPaint = new Arrow(); break;
case 2: view->selPaint = new GraphicText(); break;
case 3: view->selPaint = new Ellipse(); break;
case 4: view->selPaint = new Rectangle(); break;
case 0: view->selPaint = new GraphicLine(); break;
case 1: view->selPaint = new Arrow(); break;
case 2: view->selPaint = new GraphicText(); break;
case 3: view->selPaint = new Ellipse(); break;
case 4: view->selPaint = new Rectangle(); break;
case 5: view->selPaint = new FilledEllipse(); break;
case 6: view->selPaint = new FilledRect(); break;
}
if(view->drawn) view->viewport()->repaint();
view->drawn = false;

119
qucs/qucs_de.ts
View File

@ -219,6 +219,117 @@
<translation>OK</translation>
</message>
</context>
<context>
<name>FillDialog</name>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Abbrechen</translation>
</message>
<message>
<source>Line Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source> Line Width: </source>
<translation type="unfinished">Linienbreite: </translation>
</message>
<message>
<source>Line Style: </source>
<translation type="unfinished">Linienstil: </translation>
</message>
<message>
<source>solid line</source>
<translation type="unfinished">durchgezogene Linie</translation>
</message>
<message>
<source>dash line</source>
<translation type="unfinished">gestrichelte Linie</translation>
</message>
<message>
<source>dot line</source>
<translation type="unfinished">gepunktete Linie</translation>
</message>
<message>
<source>dash dot line</source>
<translation type="unfinished">Strich-Punkt-Linie</translation>
</message>
<message>
<source>dash dot dot line</source>
<translation type="unfinished">Strich-Punkt-Punkt-Linie</translation>
</message>
<message>
<source>Fill Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>no filling</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 1 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 2 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 3 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 4 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 5 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 6 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 7 (least dense)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>horizontal line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>vertical line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>crossed lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched backwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched forwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>diagonal crossed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GraphicTextDialog</name>
<message>
@ -2757,6 +2868,14 @@ Setzt eine Markierung auf einen Graphen im Diagramm</translation>
<source>Qucs Documents (*.sch *.dpl);;Any File (*)</source>
<translation>Qucs-Dokumente (*.sch *.dpl);;Alle Dateien (*)</translation>
</message>
<message>
<source>filled Ellipse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>

119
qucs/qucs_fr.ts
View File

@ -219,6 +219,117 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FillDialog</name>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source> Line Width: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash dot dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>no filling</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 1 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 2 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 3 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 4 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 5 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 6 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 7 (least dense)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>horizontal line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>vertical line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>crossed lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched backwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched forwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>diagonal crossed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GraphicTextDialog</name>
<message>
@ -1681,6 +1792,14 @@ Go on ?</source>
<source>Qucs Documents (*.sch *.dpl);;Any File (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Ellipse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>

119
qucs/qucs_it.ts
View File

@ -219,6 +219,117 @@
<translation>ERRORE: Impossibile leggere file:</translation>
</message>
</context>
<context>
<name>FillDialog</name>
<message>
<source>OK</source>
<translation type="unfinished">OK</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancella</translation>
</message>
<message>
<source>Line Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source> Line Width: </source>
<translation type="unfinished"> Larghezza linea: </translation>
</message>
<message>
<source>Line Style: </source>
<translation type="unfinished">Stile linea:</translation>
</message>
<message>
<source>solid line</source>
<translation type="unfinished">linea continua</translation>
</message>
<message>
<source>dash line</source>
<translation type="unfinished">linea tratteggiata</translation>
</message>
<message>
<source>dot line</source>
<translation type="unfinished">linea a punti</translation>
</message>
<message>
<source>dash dot line</source>
<translation type="unfinished">linea tratteggio punto</translation>
</message>
<message>
<source>dash dot dot line</source>
<translation type="unfinished">linea tratteggio punto punto</translation>
</message>
<message>
<source>Fill Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>no filling</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 1 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 2 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 3 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 4 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 5 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 6 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 7 (least dense)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>horizontal line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>vertical line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>crossed lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched backwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched forwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>diagonal crossed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GraphicTextDialog</name>
<message>
@ -2460,6 +2571,14 @@ Continuare ?</translation>
<source>Qucs Documents (*.sch *.dpl);;Any File (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Ellipse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>

119
qucs/qucs_pl.ts
View File

@ -219,6 +219,117 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FillDialog</name>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source> Line Width: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash dot dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>no filling</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 1 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 2 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 3 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 4 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 5 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 6 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 7 (least dense)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>horizontal line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>vertical line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>crossed lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched backwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched forwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>diagonal crossed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GraphicTextDialog</name>
<message>
@ -1681,6 +1792,14 @@ Go on ?</source>
<source>Qucs Documents (*.sch *.dpl);;Any File (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Ellipse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>

119
qucs/qucs_ro.ts
View File

@ -219,6 +219,117 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FillDialog</name>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source> Line Width: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Line Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dash dot dot line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Color: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fill Style: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>no filling</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>solid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 1 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 2 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 3 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 4 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 5 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 6 (densest)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>dense 7 (least dense)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>horizontal line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>vertical line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>crossed lines</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched backwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>hatched forwards</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>diagonal crossed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GraphicTextDialog</name>
<message>
@ -1681,6 +1792,14 @@ Go on ?</source>
<source>Qucs Documents (*.sch *.dpl);;Any File (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Ellipse</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>

14
qucs/qucsdoc.cpp
View File

@ -1017,7 +1017,7 @@ void QucsDoc::selectWireLine(Element *pe, Node *pn, bool ctrl)
}*/
// ---------------------------------------------------
bool QucsDoc::setMarker(int x, int y)
Marker* QucsDoc::setMarker(int x, int y)
{
int n;
// test all diagrams
@ -1031,12 +1031,12 @@ bool QucsDoc::setMarker(int x, int y)
Marker *pm = new Marker(pd, pg, n-1);
pd->Markers.append(pm);
setChanged(true);
return true;
return pm;
}
}
}
return false;
return 0;
}
// ---------------------------------------------------
@ -2129,7 +2129,8 @@ bool QucsDoc::deleteElements()
sel = true;
}
else {
for(Marker *pm = pd->Markers.first(); pm != 0; ) // all markers of diagram
// all markers of diagram
for(Marker *pm = pd->Markers.first(); pm != 0; )
if(pm->isSelected) {
pd->Markers.remove();
pm = pd->Markers.current();
@ -2137,7 +2138,8 @@ bool QucsDoc::deleteElements()
}
else pm = pd->Markers.next();
for(Graph *pg = pd->Graphs.first(); pg != 0; ) // all graphs of diagram
// all graphs of diagram
for(Graph *pg = pd->Graphs.first(); pg != 0; )
if(pg->isSelected) {
pd->Graphs.remove();
pg = pd->Graphs.current();
@ -2157,6 +2159,8 @@ bool QucsDoc::deleteElements()
}
else pp = Paints.next();
if(sel)
sizeOfAll(UsedX1, UsedY1, UsedX2, UsedY2); // set new document size
setChanged(sel);
return sel;
}

4
qucs/qucsdoc.h
View File

@ -90,7 +90,7 @@ public:
void deleteComp(Component *c);
void deleteWire(Wire *w);
bool deleteElements();
bool setMarker(int x, int y);
Marker* setMarker(int x, int y);
bool MarkerLeftRight(bool);
bool MarkerUpDown(bool);
@ -129,7 +129,7 @@ public:
double Scale;
int PosX, PosY; // upper left corner of the visible area (only for remembering during seeing another open document)
int ViewX1, ViewY1, ViewX2, ViewY2; // size of the document area
int UsedX1, UsedY1, UsedX2, UsedY2; // size of the document area used by elements
int UsedX1, UsedY1, UsedX2, UsedY2; // document area used by elements
QPtrList<Element> ElementCache;
};

20
qucs/qucsfile.cpp
View File

@ -110,13 +110,17 @@ bool QucsFile::pasteFromClipboard(QTextStream *stream, QPtrList<Element> *pe)
// read content *************************
while(!stream->atEnd()) {
Line = stream->readLine();
if(Line == "<Components>") { if(!loadComponents(stream, (QPtrList<Component>*)pe)) return false; }
if(Line == "<Components>") {
if(!loadComponents(stream, (QPtrList<Component>*)pe)) return false; }
else
if(Line == "<Wires>") { if(!loadWires(stream, (QPtrList<Wire>*)pe)) return false; }
if(Line == "<Wires>") {
if(!loadWires(stream, (QPtrList<Wire>*)pe)) return false; }
else
if(Line == "<Diagrams>") { if(!loadDiagrams(stream, (QPtrList<Diagram>*)pe)) return false; }
if(Line == "<Diagrams>") {
if(!loadDiagrams(stream, (QPtrList<Diagram>*)pe)) return false; }
else
if(Line == "<Paintings>") { if(!loadPaintings(stream, (QPtrList<Painting>*)pe)) return false; }
if(Line == "<Paintings>") {
if(!loadPaintings(stream, (QPtrList<Painting>*)pe)) return false; }
else {
QMessageBox::critical(0, QObject::tr("Error"),
QObject::tr("Clipboard Format Error:\nUnknown field!"));
@ -402,15 +406,17 @@ bool QucsFile::loadPaintings(QTextStream *stream, QPtrList<Painting> *List)
else if(cstr == "<Line") p = new GraphicLine();
else if(cstr == "<Arrow") p = new Arrow();
else if(cstr == "<Ellipse") p = new Ellipse();
else if(cstr == "<FilledEllipse") p = new FilledEllipse();
else if(cstr == "<FilledRect") p = new FilledRect();
else {
QMessageBox::critical(0, QObject::tr("Error"),
QObject::tr("Format Error:\nUnknown painting!"));
QObject::tr("Format Error:\nUnknown painting!"));
return false;
}
if(!p->load(Line)) {
QMessageBox::critical(0, QObject::tr("Error"),
QObject::tr("Format Error:\nWrong 'painting' line format!"));
QObject::tr("Format Error:\nWrong 'painting' line format!"));
delete p;
return false;
}
@ -418,7 +424,7 @@ bool QucsFile::loadPaintings(QTextStream *stream, QPtrList<Painting> *List)
}
QMessageBox::critical(0, QObject::tr("Error"),
QObject::tr("Format Error:\n'Painting' field is not closed!"));
QObject::tr("Format Error:\n'Painting' field is not closed!"));
return false;
}

253
qucs/qucsview.cpp
View File

@ -413,9 +413,10 @@ void QucsView::MMoveMoving2(QMouseEvent *Event)
MAx2 = int(Event->pos().x()/d->Scale) + d->ViewX1;
MAy2 = int(Event->pos().y()/d->Scale) + d->ViewY1;
Element *pe;
if(drawn) // erase old scheme
for(Element *p1 = movingElements.first(); p1 != 0; p1 = movingElements.next())
p1->paintScheme(&painter);
for(pe = movingElements.first(); pe != 0; pe = movingElements.next())
pe->paintScheme(&painter);
drawn = true;
d->setOnGrid(MAx2, MAy2);
@ -423,11 +424,14 @@ void QucsView::MMoveMoving2(QMouseEvent *Event)
MAy1 = MAy2 - MAy1;
Wire *pw;
for(Element *pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
for(pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
if(pe->Type == isWire) {
pw = (Wire*)pe; // connecting wires are not moved completely
if(int(pw->Port1) > 3) { pw->x1 += MAx1; pw->y1 += MAy1; }
if(int(pw->Port1) > 3) {
pw->x1 += MAx1; pw->y1 += MAy1;
if(pw->Label) { pw->Label->cx += MAx1; pw->Label->cy += MAy1; }
}
else { if(int(pw->Port1) & 1) { pw->x1 += MAx1; }
if(int(pw->Port1) & 2) { pw->y1 += MAy1; } }
@ -444,10 +448,12 @@ void QucsView::MMoveMoving2(QMouseEvent *Event)
}
else pe->setCenter(MAx1, MAy1, true);
pe->paintScheme(&painter);
}
// paint afterwards to avoid conflict between wire and label painting
for(pe = movingElements.first(); pe != 0; pe = movingElements.next())
pe->paintScheme(&painter);
MAx1 = MAx2;
MAy1 = MAy2;
}
@ -708,16 +714,18 @@ void QucsView::MPressLabel(QMouseEvent *Event)
Node *pn = Docs.current()->selectedNode(x, y);
if(!pn) {
pw = Docs.current()->selectedWire(x, y);
if(pw == 0) return;
if(!pw) return;
}
QString Name("");
Element *pe=0;
if(pw) pe = Docs.current()->getWireLabel(pw->Port1); // is wire line already labeled ?
// is wire line already labeled ?
if(pw) pe = Docs.current()->getWireLabel(pw->Port1);
else pe = Docs.current()->getWireLabel(pn);
if(pe) {
if(pe->Type == isComponent) {
QMessageBox::information(0, tr("Info"), tr("The ground potential cannot be labeled!"));
QMessageBox::information(0, tr("Info"),
tr("The ground potential cannot be labeled!"));
return;
}
if(pe->Type == isNode) Name = ((Node*)pe)->Label->Name;
@ -725,33 +733,36 @@ void QucsView::MPressLabel(QMouseEvent *Event)
}
bool OK;
Name = QInputDialog::getText(tr("Insert Nodename"), tr("Enter the label:"), QLineEdit::Normal,
Name, &OK, this);
Name = QInputDialog::getText(tr("Insert Nodename"),
tr("Enter the label:"), QLineEdit::Normal, Name, &OK, this);
if(OK)
if(!Name.isEmpty()) {
Name.replace(' ', '_'); // label must not contain spaces
while(Name.at(0) == '_') Name.remove(0,1); // label must not start with '_'
while(Name.at(0) == '_') Name.remove(0,1); // label must not start with '_'
if(Name.isEmpty()) return;
if(pe) {
if(pe->Type == isWire) ((Wire*)pe)->setName(""); // delete old name of wire line
if(pe->Type == isWire) ((Wire*)pe)->setName(""); // delete old name
else ((Node*)pe)->setName("");
}
WireLabel *pl=0;
if(pw) { pw->setName(Name, x-pw->x1 + y-pw->y1, x+30, y-30); pl = pw->Label; }
if(pw) { // set new name
pw->setName(Name, x-pw->x1 + y-pw->y1, x+30, y-30);
pl = pw->Label;
}
else { pn->setName(Name, x+30, y-30); pl = pn->Label; }
enlargeView(pl->x1, pl->y1, pl->x1+pl->x2, pl->y1-pl->y2);
enlargeView(pl->x1, pl->y1-pl->y2, pl->x1+pl->x2, pl->y1);
viewport()->repaint();
drawn = false;
Docs.current()->setChanged(true);
}
else { // if no name was entered (empty string), delete name
if(pe) {
if(pe->Type == isWire) ((Wire*)pe)->setName(""); // delete old name of wire line
if(pe->Type == isWire) ((Wire*)pe)->setName(""); // delete old name
else ((Node*)pe)->setName("");
}
else {
if(pw) pw->setName(""); // delete name of wire
if(pw) pw->setName(""); // delete name of wire
else pn->setName("");
}
viewport()->repaint();
@ -784,15 +795,17 @@ void QucsView::MPressSelect(QMouseEvent *Event)
if(focusElement->Type == isDiagram) // resize diagram ?
if(((Diagram*)focusElement)->ResizeTouched(MAx1, MAy1, MAx2, MAy2)) {
if(((Diagram*)focusElement)->Name == "Polar") isMoveEqual = true; // diagram must be square
else if(((Diagram*)focusElement)->Name == "Smith") isMoveEqual = true;
Docs.current()->setOnGrid(MAx1, MAy1);
MouseReleaseAction = &QucsView::MReleaseResizeDiagram;
MouseMoveAction = &QucsView::MMoveSelect;
MousePressAction = &QucsView::MouseDoNothing;
MouseDoubleClickAction = &QucsView::MouseDoNothing;
return;
if(((Diagram*)focusElement)->Name == "Polar")
isMoveEqual = true; // diagram must be square
else if(((Diagram*)focusElement)->Name == "Smith")
isMoveEqual = true; // diagram must be square
Docs.current()->setOnGrid(MAx1, MAy1);
MouseReleaseAction = &QucsView::MReleaseResizeDiagram;
MouseMoveAction = &QucsView::MMoveSelect;
MousePressAction = &QucsView::MouseDoNothing;
MouseDoubleClickAction = &QucsView::MouseDoNothing;
return;
}
Docs.current()->setOnGrid(MAx1, MAy1);
@ -807,12 +820,14 @@ void QucsView::MPressDelete(QMouseEvent *Event)
{
QucsDoc *d = Docs.current();
Element *e = d->selectElement(int(Event->pos().x()/d->Scale)+d->ViewX1,
int(Event->pos().y()/d->Scale)+d->ViewY1,
false);
if(e != 0) {
e->isSelected = true;
Element *pe = d->selectElement(int(Event->pos().x()/d->Scale)+d->ViewX1,
int(Event->pos().y()/d->Scale)+d->ViewY1,
false);
if(pe) {
pe->isSelected = true;
Docs.current()->deleteElements();
d->sizeOfAll(d->UsedX1, d->UsedY1, d->UsedX2, d->UsedY2);
viewport()->repaint();
drawn = false;
}
@ -974,7 +989,7 @@ void QucsView::MPressDiagram(QMouseEvent *Event)
if(Event->button() != Qt::LeftButton) return;
// dialog is Qt::WDestructiveClose !!!
DiagramDialog *dia = new DiagramDialog(selDiag, d->DataSet);
DiagramDialog *dia = new DiagramDialog(selDiag, d->DataSet, this);
if(dia->exec() == QDialog::Rejected) { // don't insert if dialog canceled
viewport()->repaint();
drawn = false;
@ -1096,11 +1111,16 @@ void QucsView::MPressWire2(QMouseEvent *Event)
void QucsView::MPressMarker(QMouseEvent *Event)
{
MAx1 = int(double(Event->pos().x())/Docs.current()->Scale)
+Docs.current()->ViewX1;
+Docs.current()->ViewX1;
MAy1 = int(double(Event->pos().y())/Docs.current()->Scale)
+Docs.current()->ViewY1;
Docs.current()->setMarker(MAx1, MAy1);
+Docs.current()->ViewY1;
Marker *pm = Docs.current()->setMarker(MAx1, MAy1);
if(pm) {
int x0 = pm->Diag->cx;
int y0 = pm->Diag->cy;
enlargeView(x0+pm->x1, y0-pm->y1-pm->y2, x0+pm->x1+pm->x2, y0-pm->y1);
}
viewport()->repaint();
drawn = false;
}
@ -1254,33 +1274,46 @@ void QucsView::endElementMoving()
// if components lie outside the view
for(Element *pe = movingElements.first(); pe!=0; pe = movingElements.next()) {
switch(pe->Type) {
case isWire: if(pe->x1 == pe->x2) if(pe->y1 == pe->y2) break;
d->insertWire((Wire*)pe);
if (d->Wires.containsRef ((Wire*)pe))
enlargeView(pe->x1, pe->y1, pe->x2, pe->y2);
else pe = NULL;
break;
case isDiagram: d->Diags.append((Diagram*)pe);
enlargeView(pe->cx, pe->cy-pe->y2, pe->cx+pe->x2, pe->cy);
// d->setChanged(true);
break;
case isPainting: d->Paints.append((Painting*)pe);
((Painting*)pe)->Bounding(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
// d->setChanged(true);
break;
case isComponent: d->insertRawComponent((Component*)pe);
((Component*)pe)->entireBounds(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
break;
case isMovingLabel: d->insertNodeLabel((WireLabel*)pe);
// d->setChanged(true);
break;
case isMarker: ((Marker*)pe)->Diag->Markers.append((Marker*)pe);
enlargeView(pe->x1, pe->y1, pe->x1+pe->x2, pe->y1+pe->y2);
// d->setChanged(true);
break;
default: ; // e.g. isHWireLabel
case isWire:
if(pe->x1 == pe->x2) if(pe->y1 == pe->y2) break;
d->insertWire((Wire*)pe);
if (d->Wires.containsRef ((Wire*)pe))
enlargeView(pe->x1, pe->y1, pe->x2, pe->y2);
else pe = NULL;
break;
case isDiagram:
d->Diags.append((Diagram*)pe);
enlargeView(pe->cx, pe->cy-pe->y2, pe->cx+pe->x2, pe->cy);
// d->setChanged(true);
break;
case isPainting:
d->Paints.append((Painting*)pe);
((Painting*)pe)->Bounding(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
// d->setChanged(true);
break;
case isComponent:
d->insertRawComponent((Component*)pe);
((Component*)pe)->entireBounds(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
break;
case isMovingLabel:
d->insertNodeLabel((WireLabel*)pe);
enlargeView(pe->x1, pe->y1-pe->y2, pe->x1+pe->x2, pe->y1);
// d->setChanged(true);
break;
case isMarker:
((Marker*)pe)->Diag->Markers.append((Marker*)pe);
((Marker*)pe)->Bounding(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
// d->setChanged(true);
break;
case isHWireLabel:
case isVWireLabel:
case isNodeLabel:
enlargeView(pe->x1, pe->y1-pe->y2, pe->x1+pe->x2, pe->y1);
break;
default: ;
}
d->setChanged(true);
if (pe) pe->isSelected = false;
@ -1299,31 +1332,36 @@ void QucsView::MReleasePaste(QMouseEvent *Event)
QucsDoc *d = Docs.current();
QPainter painter(viewport());
Element *pe;
switch(Event->button()) {
case Qt::LeftButton :
// insert all moved elements into document
for(Element *pe = movingElements.first(); pe!=0; pe = movingElements.next()) {
for(pe = movingElements.first(); pe!=0; pe = movingElements.next()) {
switch(pe->Type) {
case isWire: if(pe->x1 == pe->x2) if(pe->y1 == pe->y2) break;
d->insertWire((Wire*)pe);
if (d->Wires.containsRef ((Wire*)pe))
enlargeView(pe->x1, pe->y1, pe->x2, pe->y2);
else pe = NULL;
break;
case isDiagram: d->Diags.append((Diagram*)pe);
((Diagram*)pe)->loadGraphData(d->DataSet);
enlargeView(pe->cx, pe->cy-pe->y2, pe->cx+pe->x2, pe->cy);
d->setChanged(true);
break;
case isPainting: d->Paints.append((Painting*)pe);
((Painting*)pe)->Bounding(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
d->setChanged(true);
break;
default: d->insertComponent((Component*)pe);
((Component*)pe)->entireBounds(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
break;
case isWire:
if(pe->x1 == pe->x2) if(pe->y1 == pe->y2) break;
Docs.current()->insertWire((Wire*)pe);
if (d->Wires.containsRef ((Wire*)pe))
enlargeView(pe->x1, pe->y1, pe->x2, pe->y2);
else pe = NULL;
break;
case isDiagram:
Docs.current()->Diags.append((Diagram*)pe);
((Diagram*)pe)->loadGraphData(Docs.current()->DataSet);
enlargeView(pe->cx, pe->cy-pe->y2, pe->cx+pe->x2, pe->cy);
Docs.current()->setChanged(true);
break;
case isPainting:
Docs.current()->Paints.append((Painting*)pe);
((Painting*)pe)->Bounding(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
Docs.current()->setChanged(true);
break;
default:
Docs.current()->insertComponent((Component*)pe);
((Component*)pe)->entireBounds(x1,y1,x2,y2);
enlargeView(x1, y1, x2, y2);
break;
}
if (pe) pe->isSelected = false;
}
@ -1338,19 +1376,20 @@ void QucsView::MReleasePaste(QMouseEvent *Event)
viewport()->repaint();
break;
// ............................................................
case Qt::RightButton : // right button rotates the elements
setPainter(&painter, d);
if(drawn) // erase old scheme
for(Element *p1 = movingElements.first(); p1 != 0; p1 = movingElements.next())
p1->paintScheme(&painter);
for(pe = movingElements.first(); pe != 0; pe = movingElements.next())
pe->paintScheme(&painter);
drawn = true;
x1 = int(Event->pos().x()/d->Scale) + d->ViewX1;
y1 = int(Event->pos().y()/d->Scale) + d->ViewY1;
d->setOnGrid(x1, y1);
for(Element *pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
for(pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
switch(pe->Type) {
case isComponent:
((Component*)pe)->rotate(); // rotate !before! rotating the center
@ -1397,7 +1436,7 @@ void QucsView::contentsMouseDoubleClickEvent(QMouseEvent *Event)
// -----------------------------------------------------------
void QucsView::MDoubleClickSelect(QMouseEvent *Event)
{
if(focusElement == 0) return; // if no component was double clicked, try the wires
if(focusElement == 0) return;
Component *c;
Diagram *dia;
@ -1461,24 +1500,24 @@ void QucsView::MDoubleClickWire2(QMouseEvent *Event)
MouseDoubleClickAction = &QucsView::MouseDoNothing;
}
// *************************************************************************************
// ********** **********
// ********** Function for serving mouse wheel moving **********
// ********** **********
// *************************************************************************************
// *************************************************************************
// ********** **********
// ********** Function for serving mouse wheel moving **********
// ********** **********
// *************************************************************************
void QucsView::contentsWheelEvent(QWheelEvent *Event)
{
int delta = Event->delta() >> 1; // use smaller steps
// ...............................................................................
// .....................................................................
if((Event->state() & Qt::ShiftButton) || (Event->orientation() == Horizontal)) { // scroll horizontally ?
if(delta > 0) { if(ScrollLeft(delta)) scrollBy(-delta, 0); }
else { if(ScrollRight(delta)) scrollBy(-delta, 0); }
viewport()->repaint(); // because QScrollView thinks nothing has changed
drawn = false;
}
// ...............................................................................
else if(Event->state() & Qt::ControlButton) { // use mouse wheel to zoom ?
// .....................................................................
else if(Event->state() & Qt::ControlButton) { // use mouse wheel to zoom ?
double Scaling;
if(delta < 0) Scaling = double(-delta)/80;
else Scaling = 80/double(delta);
@ -1487,7 +1526,7 @@ void QucsView::contentsWheelEvent(QWheelEvent *Event)
viewport()->repaint();
drawn = false;
}
// ...............................................................................
// .....................................................................
else { // scroll vertically !
if(delta > 0) { if(ScrollUp(delta)) scrollBy(0, -delta); }
else { if(ScrollDown(delta)) scrollBy(0, -delta); }
@ -1499,7 +1538,8 @@ void QucsView::contentsWheelEvent(QWheelEvent *Event)
}
// -----------------------------------------------------------
// Scrolls the visible area upwards and enlarges or reduces the view area accordingly.
// Scrolls the visible area upwards and enlarges or reduces the view
// area accordingly.
bool QucsView::ScrollUp(int step)
{
int diff;
@ -1524,8 +1564,8 @@ bool QucsView::ScrollUp(int step)
}
// -----------------------------------------------------------
// Scrolls the visible area downwards and enlarges or reduces the view area accordingly.
// ("step" must be negative!)
// Scrolls the visible area downwards and enlarges or reduces the view
// area accordingly. ("step" must be negative!)
bool QucsView::ScrollDown(int step)
{
int diff;
@ -1551,7 +1591,8 @@ bool QucsView::ScrollDown(int step)
}
// -----------------------------------------------------------
// Scrolls the visible area to the left and enlarges or reduces the view area accordingly.
// Scrolls the visible area to the left and enlarges or reduces the view
// area accordingly.
bool QucsView::ScrollLeft(int step)
{
int diff;
@ -1576,8 +1617,8 @@ bool QucsView::ScrollLeft(int step)
}
// -----------------------------------------------------------
// Scrolls the visible area to the right and enlarges or reduces the view area accordingly.
// ("step" must be negative!)
// Scrolls the visible area to the right and enlarges or reduces the
// view area accordingly. ("step" must be negative!)
bool QucsView::ScrollRight(int step)
{
int diff;
@ -1607,7 +1648,7 @@ bool QucsView::ScrollRight(int step)
void QucsView::slotScrollUp()
{
ScrollUp(verticalScrollBar()->lineStep());
viewport()->repaint(); // because QScrollView thinks nothing has changed
viewport()->repaint(); // because QScrollView thinks nothing has changed
drawn = false;
}
@ -1616,7 +1657,7 @@ void QucsView::slotScrollUp()
void QucsView::slotScrollDown()
{
ScrollDown(-verticalScrollBar()->lineStep());
viewport()->repaint(); // because QScrollView thinks nothing has changed
viewport()->repaint(); // because QScrollView thinks nothing has changed
drawn = false;
}
@ -1625,7 +1666,7 @@ void QucsView::slotScrollDown()
void QucsView::slotScrollLeft()
{
ScrollLeft(horizontalScrollBar()->lineStep());
viewport()->repaint(); // because QScrollView thinks nothing has changed
viewport()->repaint(); // because QScrollView thinks nothing has changed
drawn = false;
}
@ -1634,6 +1675,6 @@ void QucsView::slotScrollLeft()
void QucsView::slotScrollRight()
{
ScrollRight(-horizontalScrollBar()->lineStep());
viewport()->repaint(); // because QScrollView thinks nothing has changed
viewport()->repaint(); // because QScrollView thinks nothing has changed
drawn = false;
}