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-25 19:10:00 +00:00
parent b3e7fadf07
commit c7f24e35bd
30 changed files with 1095 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NEWS
View File

@ -1,4 +1,4 @@
--
--
-- NEWS
--
-- Copyright (C) 2003 Stefan Jahn <stefan@lkcc.org>
@ -33,3 +33,14 @@ Version 0.0.2
* translations into german
* modified build system, no more kdevelop
* a (very modest) help system
* deleting and rename of documents
* some new components and paintings
* runs more stable
* mouse cursor symbols show active action
* document area more flexible for resize and zoom
* equation support
* strongly improved handling with wire labels
* diagrams more beautiful
* diagrams can show independent and more-dimensional graphs
* markers can be set on graphs

5
qucs/ChangeLog
View File

@ -1,3 +1,8 @@
2004-05-23 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* improved detection of grounded wires and labeled wires
* add component ampere_ac
2004-05-22 Stefan Jahn <stefan@lkcc.org>
* qucsdoc.cpp (selectElements): Rearranged the code for

2
qucs/Makefile.am
View File

@ -38,7 +38,7 @@ qucs_LDFLAGS = $(X11_LDFLAGS) $(QT_LDFLAGS)
qucs_LDADD = components/libcomponents.a diagrams/libdiagrams.a \
paintings/libpaintings.a dialogs/libdialogs.a
noinst_HEADERS = $(MOCHEADERS) wire.h qucsdoc.h element.h \
noinst_HEADERS = $(MOCHEADERS) main.h wire.h qucsdoc.h element.h \
node.h wirelabel.h qucsfile.h
# rules for translations

2
qucs/bitmaps/Makefile.am
View File

@ -32,7 +32,7 @@ XPMS = ac_voltage.xpm arrow.xpm capacitor.xpm dc_current.xpm dc_voltage.xpm \
port.xpm spfile1.xpm spfile2.xpm spfile3.xpm spfile4.xpm spfile5.xpm \
spfile6.xpm coplanar.xpm ellipse.xpm mscoupled.xpm gyrator.xpm \
pshifter.xpm iprobe.xpm noise_current.xpm noise_volt.xpm msmbend.xpm \
msopen.xpm filledellipse.xpm filledrect.xpm
msopen.xpm filledellipse.xpm filledrect.xpm ac_current.xpm
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \
deactiv.png bottom.png editpaste.png equation.png fileclose.png \

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

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

4
qucs/components/Makefile.am
View File

@ -36,7 +36,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
ampere_dc.cpp transformer.cpp symtrafo.cpp subcirport.cpp ground.cpp \
dcfeed.cpp dcblock.cpp biast.cpp inductor.cpp capacitor.cpp resistorus.cpp \
component.cpp resistor.cpp iprobe.cpp volt_noise.cpp ampere_noise.cpp \
msmbend.cpp msopen.cpp $(MOCFILES)
msmbend.cpp msopen.cpp ampere_ac.cpp $(MOCFILES)
noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
inductor.h biast.h dcblock.h dcfeed.h ground.h subcirport.h symtrafo.h \
@ -45,7 +45,7 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
ccvs.h coplanar.h dc_sim.h diode.h hb_sim.h mscorner.h mscoupled.h \
mscross.h msline.h msstep.h mstee.h param_sweep.h sp_sim.h substrate.h \
tline.h tr_sim.h component.h vcvs.h gyrator.h phaseshifter.h resistorus.h \
iprobe.h volt_noise.h ampere_noise.h msmbend.h msopen.h
iprobe.h volt_noise.h ampere_noise.h msmbend.h msopen.h ampere_ac.h
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES)

59
qucs/components/ampere_ac.cpp Normal file
View File

@ -0,0 +1,59 @@
/***************************************************************************
ampere_ac.cpp - description
-------------------
begin : Sun May 23 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 "ampere_ac.h"
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)));
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)));
Ports.append(new Port( 30, 0));
Ports.append(new Port(-30, 0));
x1 = -30; y1 = -14;
x2 = 30; y2 = 14;
tx = x1+4;
ty = y2+4;
Sign = "Iac";
Model = "Iac";
Name = "I";
Props.append(new Property("I", "1 mA", true,
QObject::tr("current in Ampere")));
Props.append(new Property("f", "1 GHz", true,
QObject::tr("frequency in Hertz")));
}
Ampere_ac::~Ampere_ac()
{
}
Ampere_ac* Ampere_ac::newOne()
{
return new Ampere_ac();
}

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

@ -0,0 +1,31 @@
/***************************************************************************
ampere_ac.h - description
-------------------
begin : Sun May 23 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 AMPERE_AC_H
#define AMPERE_AC_H
#include "component.h"
class Ampere_ac : public Component {
public:
Ampere_ac();
~Ampere_ac();
Ampere_ac* newOne();
};
#endif

1
qucs/components/components.h
View File

@ -44,6 +44,7 @@
#include "volt_dc.h"
#include "ampere_dc.h"
#include "volt_ac.h"
#include "ampere_ac.h"
#include "source_ac.h"
#include "vccs.h"
#include "cccs.h"

5
qucs/dialogs/Makefile.am
View File

@ -25,11 +25,12 @@
noinst_LIBRARIES = libdialogs.a
MOCHEADERS = fileshowdialog.h helpdialog.h messagebox.h settingsdialog.h \
simmessage.h
simmessage.h qucssettingsdialog.h
MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
libdialogs_a_SOURCES = fileshowdialog.cpp helpdialog.cpp messagebox.cpp \
settingsdialog.cpp newprojdialog.cpp simmessage.cpp $(MOCFILES)
settingsdialog.cpp newprojdialog.cpp simmessage.cpp \
qucssettingsdialog.cpp $(MOCFILES)
noinst_HEADERS = newprojdialog.h $(MOCHEADERS)

169
qucs/dialogs/qucssettingsdialog.cpp Normal file
View File

@ -0,0 +1,169 @@
/***************************************************************************
qucssettingsdialog.cpp - description
-------------------
begin : Sun May 23 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 "qucssettingsdialog.h"
#include "../main.h"
#include <qwidget.h>
#include <qlabel.h>
#include <qhbox.h>
#include <qtabwidget.h>
#include <qlayout.h>
#include <qcolordialog.h>
#include <qfontdialog.h>
QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent,
const char *name)
: QDialog(parent, name, TRUE, Qt::WDestructiveClose)
{
App = parent;
setCaption(tr("Edit Qucs Properties"));
QVBoxLayout *all = new QVBoxLayout(this); // to provide the neccessary size
QTabWidget *t = new QTabWidget(this);
all->addWidget(t);
// ...........................................................
QWidget *Tab1 = new QWidget(t);
QGridLayout *gp = new QGridLayout(Tab1,2,2,5,5);
QLabel *l1 = new QLabel(tr("Font (set after reload):"), Tab1);
gp->addWidget(l1,0,0);
FontButton = new QPushButton(Tab1);
connect(FontButton, SIGNAL(clicked()), SLOT(slotFontDialog()));
gp->addWidget(FontButton,0,1);
QLabel *l2 = new QLabel(tr("Document Background Color:"), Tab1);
gp->addWidget(l2,1,0);
BGColorButton = new QPushButton(" ", Tab1);
connect(BGColorButton, SIGNAL(clicked()), SLOT(slotBGColorDialog()));
gp->addWidget(BGColorButton,1,1);
t->addTab(Tab1, tr("Design"));
// ...........................................................
/* QWidget *Tab2 = new QWidget(t);
QGridLayout *gp2 = new QGridLayout(Tab2,3,2,5,5);
Check_GridOn = new QCheckBox(tr("show Grid"),Tab2);
QLabel *l3 = new QLabel(tr("horizontal Grid:"), Tab2);
gp2->addWidget(l3,1,0);
Input_GridX = new QLineEdit(Tab2);
gp2->addWidget(Input_GridX,1,1);
QLabel *l4 = new QLabel(tr("vertical Grid:"), Tab2);
gp2->addWidget(l4,2,0);
Input_GridY = new QLineEdit(Tab2);
gp2->addWidget(Input_GridY,2,1);
t->addTab(Tab2, tr("Grid"));
*/
// ...........................................................
// buttons on the bottom of the dialog (independent of the TabWidget)
QHBox *Butts = new QHBox(this);
Butts->setSpacing(5);
Butts->setMargin(5);
all->addWidget(Butts);
QPushButton *OkButt = new QPushButton(tr("OK"), Butts);
connect(OkButt, SIGNAL(clicked()), SLOT(slotOK()));
QPushButton *ApplyButt = new QPushButton(tr("Apply"), Butts);
connect(ApplyButt, SIGNAL(clicked()), SLOT(slotApply()));
QPushButton *CancelButt = new QPushButton(tr("Cancel"), Butts);
connect(CancelButt, SIGNAL(clicked()), SLOT(reject()));
QPushButton *DefaultButt = new QPushButton(tr("Default Values"), Butts);
connect(DefaultButt, SIGNAL(clicked()), SLOT(slotDefaultValues()));
OkButt->setDefault(true);
// ...........................................................
// fill the fields with the Qucs-Properties
Font = App->globalSettings->font;
FontButton->setText(Font.toString());
BGColorButton->setPaletteBackgroundColor(
App->view->viewport()->paletteBackgroundColor());
}
QucsSettingsDialog::~QucsSettingsDialog()
{
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotOK()
{
slotApply();
accept();
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotApply()
{
bool changed = false;
if(App->font() != Font) {
App->globalSettings->font = Font;
// App->setFont(Font);
// App->App->setFont(Font);
// App->ContentMenu->setFont(Font);
changed = true;
}
if(App->view->viewport()->paletteBackgroundColor() !=
BGColorButton->paletteBackgroundColor()) {
App->view->viewport()->setPaletteBackgroundColor(
BGColorButton->paletteBackgroundColor());
changed = true;
}
if(changed) {
// App->menuBar()->update();
App->repaint();
// App->saveSettings();
}
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotFontDialog()
{
bool ok;
QFont tmpFont = QFontDialog::getFont(&ok, Font, this);
if(ok) {
Font = tmpFont;
FontButton->setText(Font.toString());
}
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotBGColorDialog()
{
QColor c = QColorDialog::getColor(
BGColorButton->paletteBackgroundColor(), this);
if(c.isValid())
BGColorButton->setPaletteBackgroundColor(c);
}
// -----------------------------------------------------------
void QucsSettingsDialog::slotDefaultValues()
{
Font = QFont("helvetica", 12);
FontButton->setText(Font.toString());
BGColorButton->setPaletteBackgroundColor(QColor(255,250,225));
}

51
qucs/dialogs/qucssettingsdialog.h Normal file
View File

@ -0,0 +1,51 @@
/***************************************************************************
qucssettingsdialog.h - description
-------------------
begin : Sun May 23 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 QUCSSETTINGSDIALOG_H
#define QUCSSETTINGSDIALOG_H
#include "qucs.h"
#include <qdialog.h>
#include <qpushbutton.h>
#include <qfont.h>
/**
*@author Michael Margraf
*/
class QucsSettingsDialog : public QDialog {
Q_OBJECT
public:
QucsSettingsDialog(QucsApp *parent=0, const char *name=0);
~QucsSettingsDialog();
private slots:
void slotOK();
void slotApply();
void slotFontDialog();
void slotBGColorDialog();
void slotDefaultValues();
public:
QucsApp *App;
QFont Font;
QPushButton *FontButton, *BGColorButton;
};
#endif

12
qucs/dialogs/settingsdialog.cpp
View File

@ -17,6 +17,8 @@
#include "settingsdialog.h"
#include "qucs.h"
#include <qwidget.h>
#include <qlabel.h>
#include <qhbox.h>
@ -50,7 +52,8 @@ SettingsDialog::SettingsDialog(QucsDoc *d, QWidget *parent, const char *name)
Input_DataSet = new QLineEdit(Tab1);
gp->addWidget(Input_DataSet,1,1);
Check_OpenDpl = new QCheckBox(tr("open data display after simulation"),Tab1);
Check_OpenDpl = new QCheckBox(tr("open data display after simulation"),
Tab1);
gp->addMultiCellWidget(Check_OpenDpl,2,2,0,1);
t->addTab(Tab1, tr("Simulation"));
@ -114,7 +117,7 @@ SettingsDialog::~SettingsDialog()
void SettingsDialog::slotOK()
{
slotApply();
reject();
accept();
}
// -----------------------------------------------------------
@ -152,5 +155,8 @@ void SettingsDialog::slotApply()
changed = true;
}
if(changed) Doc->setChanged(true);
if(changed) {
Doc->setChanged(true);
((QucsApp*)parent())->view->viewport()->repaint();
}
}

90
qucs/main.cpp
View File

@ -20,26 +20,100 @@
#endif
#include <qapplication.h>
#include <qfont.h>
#include <qstring.h>
#include <qtextcodec.h>
#include <qtranslator.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qmessagebox.h>
#include "qucs.h"
#include "main.h"
tQucsSettings QucsSettings
= {0, 0, 600, 400, QFont("helvetica", 12), QColor(255, 250, 225)};
// #########################################################################
// Loads the settings file and stores the settings.
bool loadSettings()
{
QFile file(QDir::homeDirPath()+"/.qucs/qucsrc");
if(!file.open(IO_ReadOnly)) return false; // settings file doesn't exist
QTextStream stream(&file);
QString Line, Setting;
bool ok;
while(!stream.atEnd()) {
Line = stream.readLine();
Setting = Line.section('=',0,0);
Line = Line.section('=',1,1);
if(Setting == "Position") {
QucsSettings.x = Line.section(",",0,0).toInt(&ok);
QucsSettings.y = Line.section(",",1,1).toInt(&ok); }
else if(Setting == "Size") {
QucsSettings.dx = Line.section(",",0,0).toInt(&ok);
QucsSettings.dy = Line.section(",",1,1).toInt(&ok); }
else if(Setting == "Font") {
QucsSettings.font.fromString(Line); }
else if(Setting == "BGColor") {
QucsSettings.BGColor.setNamedColor(Line);
if(!QucsSettings.BGColor.isValid())
QucsSettings.BGColor.setRgb(255, 250, 225); }
}
file.close();
return true;
}
// #########################################################################
// Saves the settings in the settings file.
bool saveSettings(QucsApp *qucs)
{
QFile file(QDir::homeDirPath()+"/.qucs/qucsrc");
if(!file.open(IO_WriteOnly)) { // settings file cannot be created
QMessageBox::warning(0, QObject::tr("Warning"),
QObject::tr("Cannot save settings !"));
return false;
}
QString Line;
QTextStream stream(&file);
stream << "Settings file, Qucs " PACKAGE_VERSION "\n"
<< "Position=" << qucs->x() << "," << qucs->y() << "\n"
<< "Size=" << qucs->width() << "," << qucs->height() << "\n"
<< "Font=" << QucsSettings.font.toString() << "\n"
<< "BGColor=" << qucs->view->viewport()->paletteBackgroundColor().name()
<< "\n";
file.close();
return true;
}
// #########################################################################
// ########## ##########
// ########## Program Start ##########
// ########## ##########
// #########################################################################
int main(int argc, char *argv[])
{
loadSettings();
QApplication a(argc, argv);
a.setFont(QFont("helvetica", 12));
a.setFont(QucsSettings.font);
QTranslator tor( 0 );
// set the location where your .qm files are in load() below as the last parameter instead of "."
// for development, use "/" to use the english original as
// .qm files are stored in the base project directory.
tor.load( QString("qucs_") + QTextCodec::locale(), LANGUAGEDIR );
a.installTranslator( &tor );
QucsApp *qucs=new QucsApp();
QucsApp *qucs = new QucsApp(&QucsSettings);
a.setMainWidget(qucs);
qucs->show();
return a.exec();
int result = a.exec();
saveSettings(qucs);
return result;
}

32
qucs/main.h Normal file
View File

@ -0,0 +1,32 @@
/***************************************************************************
main.h - description
-------------------
begin : Mon May 24 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 MAIN_H
#define MAIN_H
#include <qfont.h>
#include <qcolor.h>
struct tQucsSettings {
int x, y, dx, dy; // position and size of main window
QFont font;
QColor BGColor; // background color of view area
};
#endif

2
qucs/paintings/arrowdialog.cpp
View File

@ -103,7 +103,7 @@ ArrowDialog::~ArrowDialog()
void ArrowDialog::slotSetColor()
{
QColor c = QColorDialog::getColor(ColorButt->paletteBackgroundColor(),this);
ColorButt->setPaletteBackgroundColor(c);
if(c.isValid()) ColorButt->setPaletteBackgroundColor(c);
}
// --------------------------------------------------------------------------

2
qucs/paintings/filldialog.cpp
View File

@ -120,7 +120,7 @@ FillDialog::~FillDialog()
void FillDialog::slotSetColor()
{
QColor c = QColorDialog::getColor(ColorButt->paletteBackgroundColor(),this);
ColorButt->setPaletteBackgroundColor(c);
if(c.isValid()) ColorButt->setPaletteBackgroundColor(c);
}
// --------------------------------------------------------------------------

2
qucs/paintings/graphictextdialog.cpp
View File

@ -91,5 +91,5 @@ GraphicTextDialog::~GraphicTextDialog()
void GraphicTextDialog::slotSetColor()
{
QColor c = QColorDialog::getColor(ColorButt->paletteBackgroundColor(),this);
ColorButt->setPaletteBackgroundColor(c);
if(c.isValid()) ColorButt->setPaletteBackgroundColor(c);
}

2
qucs/paintings/linedialog.cpp
View File

@ -85,7 +85,7 @@ LineDialog::~LineDialog()
void LineDialog::slotSetColor()
{
QColor c = QColorDialog::getColor(ColorButt->paletteBackgroundColor(),this);
ColorButt->setPaletteBackgroundColor(c);
if(c.isValid()) ColorButt->setPaletteBackgroundColor(c);
}
// --------------------------------------------------------------------------

98
qucs/qucs.cpp
View File

@ -19,6 +19,7 @@
# include <config.h>
#endif
#include "main.h"
#include "qucs.h"
#include "qucsview.h"
#include "wire.h"
@ -29,6 +30,7 @@
#include "dialogs/newprojdialog.h"
#include "dialogs/fileshowdialog.h"
#include "dialogs/settingsdialog.h"
#include "dialogs/qucssettingsdialog.h"
#include <qaccel.h>
#include <qimage.h>
@ -43,6 +45,7 @@
#include <qinputdialog.h>
#include <qclipboard.h>
#include <qdatetime.h>
#include <qfont.h>
#include <limits.h>
@ -58,15 +61,16 @@
#define COMBO_Diagrams 7
QucsApp::QucsApp()
QucsApp::QucsApp(tQucsSettings *ps)
{
globalSettings = ps;
setCaption("Qucs " PACKAGE_VERSION);
QucsFileFilter = tr("Schematic (*.sch);;Data Display (*.dpl);;")+
tr("Qucs Documents (*.sch *.dpl);;Any File (*)");
tr("Qucs Documents (*.sch *.dpl);;Any File (*)");
if(!loadSettings())
resize(600,400);
move (globalSettings->x, globalSettings->y);
resize(globalSettings->dx, globalSettings->dy);
// resize(maximumSize());
@ -94,52 +98,6 @@ QucsApp::~QucsApp()
{
}
// ###########################################################################
// Loads the settings file and restores the settings.
bool QucsApp::loadSettings()
{
QFile file(QDir::homeDirPath()+"/.qucs/qucsrc");
if(!file.open(IO_ReadOnly)) return false; // settings file doesn't exist
QString Line, Setting;
QTextStream stream(&file);
int x, y;
bool ok;
while(!stream.atEnd()) {
Line = stream.readLine();
Setting = Line.section('=',0,0);
Line = Line.section('=',1,1);
if(Setting == "Position") { x = Line.section(",",0,0).toInt(&ok);
y = Line.section(",",1,1).toInt(&ok);
move(x,y); }
else if(Setting == "Size") { x = Line.section(",",0,0).toInt(&ok);
y = Line.section(",",1,1).toInt(&ok);
resize(x,y); }
}
file.close();
return true;
}
// ###########################################################################
// Saves the settings in the settings file.
void QucsApp::saveSettings()
{
QFile file(QDir::homeDirPath()+"/.qucs/qucsrc");
if(!file.open(IO_WriteOnly)) { // settings file cannot be created
QMessageBox::warning(this, tr("Warning"), tr("Cannot save settings !"));
return;
}
QString Line;
QTextStream stream(&file);
stream << "Settings file, Qucs " PACKAGE_VERSION "\n";
stream << "Position=" << x() << "," << y() << "\n";
stream << "Size=" << width() << "," << height() << "\n";
file.close();
}
// #########################################################################
// ########## ##########
@ -154,7 +112,7 @@ void QucsApp::initView()
TabView = new QTabWidget(Hsplit); // tabs on the left side
QVBox *WorkGroup = new QVBox(Hsplit);
WorkView = new QTabBar(WorkGroup); // tab on the right side
view = new QucsView(WorkGroup); // work area with documents
view = new QucsView(globalSettings, WorkGroup); // work area with documents
connect(WorkView, SIGNAL(selected(int)), SLOT(slotChangeView(int)));
@ -246,7 +204,6 @@ void QucsApp::initCursorMenu()
connect(Content,
SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)),
this,
SLOT(slotShowContentMenu(QListViewItem*, const QPoint&, int)));
}
@ -465,6 +422,15 @@ void QucsApp::slotFileSettings()
view->drawn = false;
}
// --------------------------------------------------------------
void QucsApp::slotQucsSettings()
{
QucsSettingsDialog *d = new QucsSettingsDialog(this);
d->exec();
view->viewport()->repaint();
view->drawn = false;
}
// --------------------------------------------------------------
void QucsApp::slotFileNew()
{
@ -718,11 +684,7 @@ void QucsApp::slotFileQuit()
tr("Do you really want to quit?"),
tr("Yes"), tr("No"));
if(exit == 0)
if(closeAllFiles()) {
saveSettings();
qApp->quit();
}
if(closeAllFiles()) qApp->quit();
statusBar()->message(tr("Ready."));
}
@ -732,10 +694,7 @@ void QucsApp::slotFileQuit()
void QucsApp::closeEvent(QCloseEvent* Event)
{
Event->ignore();
if(closeAllFiles()) {
saveSettings();
qApp->quit();
}
if(closeAllFiles()) qApp->quit();
}
// --------------------------------------------------------------------
@ -1292,6 +1251,8 @@ void QucsApp::slotSetCompView(int index)
QImage(BITMAPDIR "dc_current.xpm"));
new QIconViewItem(CompComps, tr("ac Voltage Source"),
QImage(BITMAPDIR "ac_voltage.xpm"));
new QIconViewItem(CompComps, tr("ac Current Source"),
QImage(BITMAPDIR "ac_current.xpm"));
new QIconViewItem(CompComps, tr("Power Source"),
QImage(BITMAPDIR "source.xpm"));
new QIconViewItem(CompComps, tr("Noise Voltage Source"),
@ -1447,13 +1408,14 @@ void QucsApp::slotSelectComponent(QIconViewItem *item)
case 0: view->selComp = new Volt_dc(); break;
case 1: view->selComp = new Ampere_dc(); break;
case 2: view->selComp = new Volt_ac(); break;
case 3: view->selComp = new Source_ac(); break;
case 4: view->selComp = new Volt_noise(); break;
case 5: view->selComp = new Ampere_noise(); break;
case 6: view->selComp = new VCCS(); break;
case 7: view->selComp = new CCCS(); break;
case 8: view->selComp = new VCVS(); break;
case 9: view->selComp = new CCVS(); break;
case 3: view->selComp = new Ampere_ac(); break;
case 4: view->selComp = new Source_ac(); break;
case 5: view->selComp = new Volt_noise(); break;
case 6: view->selComp = new Ampere_noise(); break;
case 7: view->selComp = new VCCS(); break;
case 8: view->selComp = new CCCS(); break;
case 9: view->selComp = new VCVS(); break;
case 10: view->selComp = new CCVS(); break;
}
break;
case COMBO_TLines:

13
qucs/qucs.h
View File

@ -59,12 +59,9 @@ class QucsApp : public QMainWindow
{
Q_OBJECT
public:
QucsApp();
QucsApp(tQucsSettings *ps);
~QucsApp();
bool loadSettings(); // loads the settings file and restores the settings
void saveSettings(); // saves the settings in the settings file
void initView(); // setup the mainview
void initCursorMenu();
@ -87,6 +84,7 @@ public slots:
void slotFileQuit(); // exits the application
void slotEditCut(); // put marked object into clipboard and delete it
void slotEditCopy(); // put the marked object into the clipboard
void slotQucsSettings();// open dialog to change application settings
void slotHelpIndex(); // shows a HTML docu: Help Index
void slotGettingStarted(); // shows a HTML docu: Getting started
@ -127,11 +125,12 @@ public slots:
void slotSelectAll();
public:
QucsView *view; // the working area with schematics, data displays etc.
tQucsSettings *globalSettings;
QucsView *view; // the working area with schematics, data displays etc.
QAction *fileNew, *fileNewDpl, *fileOpen, *fileSave, *fileSaveAs;
QAction *fileSaveAll, *fileClose, *fileSettings, *filePrint, *fileQuit;
QAction *projNew, *projOpen, *projDel;
QAction *projNew, *projOpen, *projDel, *QucsSettings;
QAction *editCut, *editCopy, *undo, *redo, *magAll, *magOne;
QAction *magPlus, *magMinus;
QAction *intoH, *popH;
@ -161,7 +160,7 @@ private:
// ********** Properties ************************************************
QString ProjName; // name of the project, that is open
QPtrList<QString> HierarchyHistory; // keeps track of the "go into subcircuit"
QPtrList<QString> HierarchyHistory; // keeps track of "go into subcircuit"
QString QucsFileFilter;

83
qucs/qucs_de.ts
View File

@ -1178,6 +1178,18 @@ Ungültiger Zeilenanfang!</translation>
<source>Too few independent data &quot;</source>
<translation>Zu wenige Datensatzeinträge in &quot;</translation>
</message>
<message>
<source>ideal ac current source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Warning</source>
<translation type="unfinished">Warnung</translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished">Einstellungen können nicht gespeichert werden !</translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -2714,7 +2726,7 @@ Kurze Einführung in Qucs</translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation>Einstellungen können nicht gespeichert werden !</translation>
<translation type="obsolete">Einstellungen können nicht gespeichert werden !</translation>
</message>
<message>
<source>Rename</source>
@ -2876,6 +2888,10 @@ Setzt eine Markierung auf einen Graphen im Diagramm</translation>
<source>filled Rectangle</source>
<translation>gefülltes Rechteck</translation>
</message>
<message>
<source>ac Current Source</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>
@ -3001,11 +3017,11 @@ Schließt das aktuelle Dokument</translation>
</message>
<message>
<source>Settings</source>
<translation>Einstellungen</translation>
<translation type="obsolete">Einstellungen</translation>
</message>
<message>
<source>Settings...</source>
<translation>Einstellungen...</translation>
<translation type="obsolete">Einstellungen...</translation>
</message>
<message>
<source>Settings
@ -3822,6 +3838,67 @@ Qt universal circuit simulator
<translation>Französisch von Eric Marzolf
</translation>
</message>
<message>
<source>Application Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Qucs Settings
Sets properties of the application</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsSettingsDialog</name>
<message>
<source>Edit Qucs Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Background Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simulation</source>
<translation type="obsolete">Simulation</translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Apply</source>
<translation type="unfinished">Übernehmen</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Abbrechen</translation>
</message>
<message>
<source>Design</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default Values</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsView</name>

85
qucs/qucs_fr.ts
View File

@ -1121,6 +1121,18 @@ Wrong line start!</source>
<source>Too few independent data &quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ideal ac current source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -1693,10 +1705,6 @@ Go on ?</source>
<source>Choose Project Directory for Deleting</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rename</source>
<translation type="unfinished"></translation>
@ -1800,6 +1808,10 @@ Go on ?</source>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac Current Source</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>
@ -1911,14 +1923,6 @@ Saves all open documents</source>
Closes the current document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings
@ -2645,6 +2649,63 @@ Qt universal circuit simulator
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Qucs Settings
Sets properties of the application</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsSettingsDialog</name>
<message>
<source>Edit Qucs Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Background Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Design</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default Values</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsView</name>

79
qucs/qucs_it.ts
View File

@ -1126,6 +1126,18 @@ Wrong &apos;component&apos; line format!</source>
<source>Too few independent data &quot;</source>
<translation>Troppo poche variabili indipendenti &quot;</translation>
</message>
<message>
<source>ideal ac current source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Warning</source>
<translation type="unfinished">Attenzione</translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished">Impossibile salvare impostazioni !</translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -1146,7 +1158,7 @@ Wrong &apos;component&apos; line format!</source>
</message>
<message>
<source>Cannot save settings !</source>
<translation>Impossibile salvare impostazioni !</translation>
<translation type="obsolete">Impossibile salvare impostazioni !</translation>
</message>
<message>
<source>New</source>
@ -2585,6 +2597,10 @@ Continuare ?</translation>
<source>filled Rectangle</source>
<translation>Rettangolo riempito</translation>
</message>
<message>
<source>ac Current Source</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>
@ -3529,6 +3545,67 @@ Qt universal circuit simulator
<translation>Francese di Eric Marzolf
</translation>
</message>
<message>
<source>Application Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Qucs Settings
Sets properties of the application</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsSettingsDialog</name>
<message>
<source>Edit Qucs Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Background Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simulation</source>
<translation type="obsolete">Simulazione</translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished">OK</translation>
</message>
<message>
<source>Apply</source>
<translation type="unfinished">Applica</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancella</translation>
</message>
<message>
<source>Design</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default Values</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsView</name>

85
qucs/qucs_pl.ts
View File

@ -1121,6 +1121,18 @@ Wrong line start!</source>
<source>Too few independent data &quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ideal ac current source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -1693,10 +1705,6 @@ Go on ?</source>
<source>Choose Project Directory for Deleting</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rename</source>
<translation type="unfinished"></translation>
@ -1800,6 +1808,10 @@ Go on ?</source>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac Current Source</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>
@ -1911,14 +1923,6 @@ Saves all open documents</source>
Closes the current document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings
@ -2645,6 +2649,63 @@ Qt universal circuit simulator
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Qucs Settings
Sets properties of the application</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsSettingsDialog</name>
<message>
<source>Edit Qucs Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Background Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Design</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default Values</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsView</name>

85
qucs/qucs_ro.ts
View File

@ -1121,6 +1121,18 @@ Wrong &apos;component&apos; line format!</source>
<source>Too few independent data &quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ideal ac current source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsActions</name>
@ -1139,10 +1151,6 @@ Wrong &apos;component&apos; line format!</source>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot save settings !</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New</source>
<translation>Nou</translation>
@ -1800,6 +1808,10 @@ Go on ?</source>
<source>filled Rectangle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ac Current Source</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsInit</name>
@ -1911,14 +1923,6 @@ Saves all open documents</source>
Closes the current document</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Settings
@ -2645,6 +2649,63 @@ Qt universal circuit simulator
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Application Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Qucs Settings
Sets properties of the application</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Settings...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsSettingsDialog</name>
<message>
<source>Edit Qucs Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Document Background Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Design</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Default Values</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsView</name>

157
qucs/qucsdoc.cpp
View File

@ -783,14 +783,16 @@ bool QucsDoc::connectVWires2(Wire *w)
}
// ---------------------------------------------------
// Inserts a vertical or horizontal wire into the schematic and connects the ports that hit together.
// Returns whether the beginning and ending (the ports of the wire) are connected or not.
// Inserts a vertical or horizontal wire into the schematic and connects
// the ports that hit together. Returns whether the beginning and ending
// (the ports of the wire) are connected or not.
int QucsDoc::insertWire(Wire *w)
{
int tmp, con = 0;
bool ok;
// change coordinates if necessary (port 1 coordinates must be less port 2 coordinates)
// change coordinates if necessary (port 1 coordinates must be less
// port 2 coordinates)
if(w->x1 > w->x2) { tmp = w->x1; w->x1 = w->x2; w->x2 = tmp; }
else
if(w->y1 > w->y2) { tmp = w->y1; w->y1 = w->y2; w->y2 = tmp; }
@ -819,8 +821,8 @@ int QucsDoc::insertWire(Wire *w)
if(con > 255) con = ((con >> 1) & 1) | ((con << 1) & 2); // change node 1 and 2
// change node 1 and 2
if(con > 255) con = ((con >> 1) & 1) | ((con << 1) & 2);
Wires.append(w); // add wire to the schematic
@ -1194,28 +1196,35 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
// Deselects all elements except 'e'.
void QucsDoc::deselectElements(Element *e)
{
for(Component *pc = Comps.first(); pc != 0; pc = Comps.next()) // test all components
// test all components
for(Component *pc = Comps.first(); pc != 0; pc = Comps.next())
if(e != pc) pc->isSelected = false;
for(Wire *pw = Wires.first(); pw != 0; pw = Wires.next()) { // test all wires
// test all wires
for(Wire *pw = Wires.first(); pw != 0; pw = Wires.next()) {
if(e != pw) pw->isSelected = false;
if(pw->Label) if(pw->Label != e) pw->Label->isSelected = false;
}
for(Node *pn = Nodes.first(); pn != 0; pn = Nodes.next()) // test all node labels
// test all node labels
for(Node *pn = Nodes.first(); pn != 0; pn = Nodes.next())
if(pn->Label) if(pn->Label != e) pn->Label->isSelected = false;
for(Diagram *pd = Diags.first(); pd != 0; pd = Diags.next()) { // test all diagrams
// test all diagrams
for(Diagram *pd = Diags.first(); pd != 0; pd = Diags.next()) {
if(e != pd) pd->isSelected = false;
for(Marker *pm = pd->Markers.first(); pm != 0; pm = pd->Markers.next()) // test markers of diagram
// test markers of diagram
for(Marker *pm = pd->Markers.first(); pm != 0; pm = pd->Markers.next())
if(e != pm) pm->isSelected = false;
for(Graph *pg = pd->Graphs.first(); pg != 0; pg = pd->Graphs.next()) // test graphs of diagram
// test graphs of diagram
for(Graph *pg = pd->Graphs.first(); pg != 0; pg = pd->Graphs.next())
if(e != pg) pg->isSelected = false;
}
for(Painting *pp = Paints.first(); pp != 0; pp = Paints.next()) // test all paintings
// test all paintings
for(Painting *pp = Paints.first(); pp != 0; pp = Paints.next())
if(e != pp) pp->isSelected = false;
}
@ -1231,8 +1240,9 @@ int QucsDoc::selectElements(int x1, int y1, int x2, int y2, bool flag)
cy1 = (y1 < y2) ? y1 : y2; cy2 = (y1 > y2) ? y1 : y2;
x1 = cx1; x2 = cx2;
y1 = cy1; y2 = cy2;
for(Component *pc = Comps.first(); pc != 0; pc = Comps.next()) { // test all components
// test all components
for(Component *pc = Comps.first(); pc != 0; pc = Comps.next()) {
pc->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2) {
pc->isSelected = true; z++;
@ -1243,7 +1253,7 @@ int QucsDoc::selectElements(int x1, int y1, int x2, int y2, bool flag)
Wire *pw;
for(pw = Wires.first(); pw != 0; pw = Wires.next()) { // test all wires
for(pw = Wires.first(); pw != 0; pw = Wires.next()) { // test all wires
if(pw->x1 >= x1) if(pw->x2 <= x2) if(pw->y1 >= y1) if(pw->y2 <= y2) {
pw->isSelected = true; z++;
continue;
@ -1269,8 +1279,8 @@ int QucsDoc::selectElements(int x1, int y1, int x2, int y2, bool flag)
// test all node labels *************************************
for(Node *pn = Nodes.first(); pn != 0; pn = Nodes.next()) {
if(pn->Label) {
pl = pn->Label;
pl = pn->Label;
if(pl) {
if(pl->x1 >= x1) if((pl->x1+pl->x2) <= x2)
if((pl->y1-pl->y2) >= y1) if(pl->y1 <= y2) {
pl->isSelected = true; z++;
@ -1542,13 +1552,21 @@ void QucsDoc::copySelectedElements(QPtrList<Element> *p)
void QucsDoc::activateComps(int x1, int y1, int x2, int y2)
{
int cx1, cy1, cx2, cy2;
if(x1 > x2) { cx1 = x1; x1 = x2; x2 = cx1; }
if(y1 > y2) { cy1 = y1; y1 = y2; y2 = cy1; }
// exchange rectangle coordinates to obtain x1 < x2 and y1 < y2
cx1 = (x1 < x2) ? x1 : x2; cx2 = (x1 > x2) ? x1 : x2;
cy1 = (y1 < y2) ? y1 : y2; cy2 = (y1 > y2) ? y1 : y2;
x1 = cx1; x2 = cx2;
y1 = cy1; y2 = cy2;
for(Component *pc = Comps.first(); pc != 0; pc = Comps.next()) {
pc->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2)
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2) {
pc->isActive ^= true; // change "active status"
setChanged(true);
if(pc->isActive) // if existing, delete label on wire line
if(pc->Sign == "GND") oneLabel(pc->Ports.getFirst()->Connection);
}
}
}
@ -1562,6 +1580,8 @@ bool QucsDoc::activateComponent(int x, int y)
if(x >= x1) if(x <= x2) if(y >= y1) if(y <= y2) {
pc->isActive ^= true; // change "active status"
setChanged(true);
if(pc->isActive) // if existing, delete label on wire line
if(pc->Sign == "GND") oneLabel(pc->Ports.getFirst()->Connection);
return true;
}
}
@ -1578,6 +1598,8 @@ bool QucsDoc::activateComponents()
if(pc->isSelected) {
pc->isActive ^= true; // change "active status"
sel = true;
if(pc->isActive) // if existing, delete label on wire line
if(pc->Sign == "GND") oneLabel(pc->Ports.getFirst()->Connection);
}
setChanged(sel);
@ -1585,11 +1607,14 @@ bool QucsDoc::activateComponents()
}
// ---------------------------------------------------
// Test, if wire connects wire line with more than one label and delete all further labels.
// Test, if wire connects wire line with more than one label and delete
// all further labels. Also delete all labels if wire line is grounded.
void QucsDoc::oneLabel(Node *n1)
{
Wire *pw;
Node *pn;
Element *pe;
WireLabel *pl = 0;
bool named=false; // wire line already named ?
QPtrList<Node> Cons;
@ -1604,18 +1629,31 @@ void QucsDoc::oneLabel(Node *n1)
delete pn->Label;
pn->Label = 0; // erase double names
}
else named = true;
else {
named = true;
pl = pn->Label;
}
}
for(Element *pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next()) {
if(pe->Type != isWire) continue;
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next()) {
if(pe->Type != isWire) {
if(((Component*)pe)->isActive)
if(((Component*)pe)->Sign == "GND") {
named = true;
if(pl)
if(pl->pWire) pl->pWire->setName("");
else pl->pNode->setName("");
pl = 0;
}
continue;
}
pw = (Wire*)pe;
if(pn != pw->Port1) {
if(!pw->Port1->Name.isEmpty()) continue;
pw->Port1->Name = "x"; // mark Node as already checked
Cons.append(pw->Port1);
Cons.findRef(pn);
if(!pw->Port1->Name.isEmpty()) continue;
pw->Port1->Name = "x"; // mark Node as already checked
Cons.append(pw->Port1);
Cons.findRef(pn);
}
else {
if(!pw->Port2->Name.isEmpty()) continue;
@ -1629,7 +1667,10 @@ void QucsDoc::oneLabel(Node *n1)
delete pw->Label;
pw->Label = 0; // erase double names
}
else named = true;
else {
named = true;
pl = pw->Label;
}
}
}
}
@ -1642,6 +1683,7 @@ Element* QucsDoc::getWireLabel(Node *pn_)
{
Wire *pw;
Node *pn;
Element *pe;
QPtrList<Node> Cons;
for(pn = Nodes.first(); pn!=0; pn = Nodes.next())
@ -1652,9 +1694,10 @@ Element* QucsDoc::getWireLabel(Node *pn_)
for(pn = Cons.first(); pn!=0; pn = Cons.next())
if(pn->Label) return pn;
else
for(Element *pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next()) {
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next()) {
if(pe->Type != isWire) {
if(((Component*)pe)->Sign == "GND") return pe;
if(((Component*)pe)->isActive)
if(((Component*)pe)->Sign == "GND") return pe;
continue;
}
@ -1687,6 +1730,7 @@ void QucsDoc::sizeOfAll(int& xmin, int& ymin, int& xmax, int& ymax)
Component *pc;
Diagram *pd;
Wire *pw;
WireLabel *pl;
Painting *pp;
if(Comps.isEmpty())
@ -1715,14 +1759,23 @@ void QucsDoc::sizeOfAll(int& xmin, int& ymin, int& xmax, int& ymax)
if(pw->y1 < ymin) ymin = pw->y1;
if(pw->y2 > ymax) ymax = pw->y2;
if(pw->Label != 0) { // check position of wire label
if(pw->Label->x1 < xmin) xmin = pw->x1;
if((pw->Label->x1+pw->Label->x2) > xmax)
xmax = pw->Label->x1+pw->Label->x2;
if(pw->Label->y1 > ymax)
ymax = pw->Label->y1;
if((pw->Label->y1+pw->Label->y2) < ymin)
ymin = pw->Label->y1+pw->Label->y2;
pl = pw->Label;
if(pl) { // check position of wire label
if(pl->x1 < xmin) xmin = pl->x1;
if((pl->x1+pl->x2) > xmax) xmax = pl->x1 + pl->x2;
if(pl->y1 > ymax) ymax = pl->y1;
if((pl->y1-pl->y2) < ymin) ymin = pl->y1 - pl->y2;
}
}
// find boundings of all node labels
for(Node *pn = Nodes.first(); pn != 0; pn = Nodes.next()) {
pl = pn->Label;
if(pl) { // check position of node label
if(pl->x1 < xmin) xmin = pl->x1;
if((pl->x1+pl->x2) > xmax) xmax = pl->x1 + pl->x2;
if(pl->y1 > ymax) ymax = pl->y1;
if((pl->y1-pl->y2) < ymin) ymin = pl->y1 - pl->y2;
}
}
@ -1733,6 +1786,15 @@ void QucsDoc::sizeOfAll(int& xmin, int& ymin, int& xmax, int& ymax)
if(x2 > xmax) xmax = x2;
if(y1 < ymin) ymin = y1;
if(y2 > ymax) ymax = y2;
// test all markers of diagram
for(Marker *pm = pd->Markers.first(); pm != 0; pm = pd->Markers.next()) {
pm->Bounding(x1, y1, x2, y2);
if(x1 < xmin) xmin = x1;
if(x2 > xmax) xmax = x2;
if(y1 < ymin) ymin = y1;
if(y2 > ymax) ymax = y2;
}
}
// find boundings of all Paintings
@ -2230,15 +2292,16 @@ bool QucsDoc::giveNodeNames(QTextStream *stream)
// give the ground nodes the name "gnd", and insert subcircuits
for(Component *pc = Comps.first(); pc != 0; pc = Comps.next())
if(pc->Sign == "GND") pc->Ports.first()->Connection->Name = "gnd";
else if(pc->Sign.left(3) == "Sub") {
QucsDoc *d = new QucsDoc(0, pc->Props.getFirst()->Value);
if(!d->load()) { // load document if possible
delete d;
return false;
if(pc->isActive)
if(pc->Sign == "GND") pc->Ports.first()->Connection->Name = "gnd";
else if(pc->Sign.left(3) == "Sub") {
QucsDoc *d = new QucsDoc(0, pc->Props.getFirst()->Value);
if(!d->load()) { // load document if possible
delete d;
return false;
}
d->createSubNetlist(stream);
}
d->createSubNetlist(stream);
}
QPtrList<Node> Cons;

17
qucs/qucsinit.cpp
View File

@ -110,8 +110,9 @@ void QucsInit::initActions()
tr("Close File\n\nCloses the current document"));
connect(App->fileClose, SIGNAL(activated()), App, SLOT(slotFileClose()));
App->fileSettings = new QAction(tr("Settings"), tr("Settings..."), 0, App);
App->fileSettings->setStatusTip(tr("Settings"));
App->fileSettings = new QAction(tr("Document Settings"),
tr("Document Settings..."), 0, App);
App->fileSettings->setStatusTip(tr("Document Settings"));
App->fileSettings->setWhatsThis(
tr("Settings\n\nSets properties of the file"));
connect(App->fileSettings, SIGNAL(activated()),
@ -131,6 +132,14 @@ void QucsInit::initActions()
App->fileQuit->setWhatsThis(tr("Exit\n\nQuits the application"));
connect(App->fileQuit, SIGNAL(activated()), App, SLOT(slotFileQuit()));
App->QucsSettings = new QAction(tr("Application Settings"),
tr("Application Settings..."), 0, App);
App->QucsSettings->setStatusTip(tr("Application Settings"));
App->QucsSettings->setWhatsThis(
tr("Qucs Settings\n\nSets properties of the application"));
connect(App->QucsSettings, SIGNAL(activated()),
App, SLOT(slotQucsSettings()));
App->editCut = new QAction(tr("Cut"),
QIconSet(QImage(BITMAPDIR "editcut.png")),
tr("Cu&t"), CTRL+Key_X, App);
@ -463,10 +472,10 @@ void QucsInit::initMenuBar()
App->fileSave->addTo(fileMenu);
App->fileSaveAll->addTo(fileMenu);
App->fileSaveAs->addTo(fileMenu);
fileMenu->insertSeparator();
App->filePrint->addTo(fileMenu);
App->fileSettings->addTo(fileMenu);
fileMenu->insertSeparator();
App->filePrint->addTo(fileMenu);
App->QucsSettings->addTo(fileMenu);
fileMenu->insertSeparator();
App->fileQuit->addTo(fileMenu);

125
qucs/qucsview.cpp
View File

@ -15,6 +15,7 @@
* *
***************************************************************************/
#include "main.h"
#include "qucsview.h"
#include "components/componentdialog.h"
#include "diagrams/diagramdialog.h"
@ -29,12 +30,11 @@
#include <stdlib.h>
QucsView::QucsView(QWidget *parent) : QScrollView(parent)
QucsView::QucsView(tQucsSettings *ps, QWidget *parent) : QScrollView(parent)
{
setVScrollBarMode(QScrollView::AlwaysOn);
setHScrollBarMode(QScrollView::AlwaysOn);
viewport()->setPaletteBackgroundColor(QColor(255,250,225));
resizeContents(800,800);
viewport()->setPaletteBackgroundColor(ps->BGColor);
viewport()->setMouseTracking(true);
MouseMoveAction = &QucsView::MouseDoNothing;
@ -134,7 +134,8 @@ bool QucsView::pasteElements()
// -----------------------------------------------------------
// Enlarge the viewport area if the coordinates x1-x2/y1-y2 exceeds the visible area.
// Enlarge the viewport area if the coordinates x1-x2/y1-y2 exceed the
// visible area.
void QucsView::enlargeView(int x1, int y1, int x2, int y2)
{
int dx=0, dy=0;
@ -232,6 +233,49 @@ void QucsView::editLabel(WireLabel *pl)
Docs.current()->setChanged(true);
}
// -----------------------------------------------------------
// Reinserts all elements (moved by the user) back into the schematic.
void QucsView::endElementMoving()
{
Element *pe;
QucsDoc *d = Docs.current();
for(pe = movingElements.first(); pe!=0; pe = movingElements.next()) {
pe->isSelected = false; // deselect first (maybe afterwards pe == NULL)
switch(pe->Type) {
case isWire:
if(pe->x1 == pe->x2) if(pe->y1 == pe->y2) break;
d->insertWire((Wire*)pe);
break;
case isDiagram:
d->Diags.append((Diagram*)pe);
break;
case isPainting:
d->Paints.append((Painting*)pe);
break;
case isComponent:
d->insertRawComponent((Component*)pe);
break;
case isMovingLabel:
d->insertNodeLabel((WireLabel*)pe);
break;
case isMarker:
((Marker*)pe)->Diag->Markers.append((Marker*)pe);
break;
default: ;
}
d->setChanged(true);
}
movingElements.clear();
// enlarge viewarea if components lie outside the view
d->sizeOfAll(d->UsedX1, d->UsedY1, d->UsedX2, d->UsedY2);
enlargeView(d->UsedX1, d->UsedY1, d->UsedX2, d->UsedY2);
viewport()->repaint();
drawn = false;
}
// -----------------------------------------------------------
void QucsView::MouseDoNothing(QMouseEvent*)
{
@ -1071,7 +1115,8 @@ void QucsView::MPressWire2(QMouseEvent *Event)
if(MAx1 == 0) { // which wire direction first ?
if(MAx2 != MAx3) {
if(d->insertWire(new Wire(MAx3, MAy2, MAx2, MAy2)) & 2) {
MouseMoveAction = &QucsView::MMoveWire1; // if last port connected, then start a new wire
// if last port is connected, then start a new wire
MouseMoveAction = &QucsView::MMoveWire1;
MousePressAction = &QucsView::MPressWire1;
MouseDoubleClickAction = &QucsView::MouseDoNothing;
}
@ -1079,7 +1124,8 @@ void QucsView::MPressWire2(QMouseEvent *Event)
}
else if(MAy2 != MAy3)
if(d->insertWire(new Wire(MAx3, MAy3, MAx3, MAy2)) & 2) {
MouseMoveAction = &QucsView::MMoveWire1; // if last port connected, then start a new wire
// if last port is connected, then start a new wire
MouseMoveAction = &QucsView::MMoveWire1;
MousePressAction = &QucsView::MPressWire1;
MouseDoubleClickAction = &QucsView::MouseDoNothing;
}
@ -1087,7 +1133,8 @@ void QucsView::MPressWire2(QMouseEvent *Event)
else {
if(MAy2 != MAy3) {
if(d->insertWire(new Wire(MAx2, MAy3, MAx2, MAy2)) & 2) {
MouseMoveAction = &QucsView::MMoveWire1; // if last port connected, then start a new wire
// if last port is connected, then start a new wire
MouseMoveAction = &QucsView::MMoveWire1;
MousePressAction = &QucsView::MPressWire1;
MouseDoubleClickAction = &QucsView::MouseDoNothing;
}
@ -1095,7 +1142,8 @@ void QucsView::MPressWire2(QMouseEvent *Event)
}
else if(MAx2 != MAx3)
if(d->insertWire(new Wire(MAx3, MAy3, MAx2, MAy3)) & 2) {
MouseMoveAction = &QucsView::MMoveWire1; // if last port connected, then start a new wire
// if last port is connected, then start a new wire
MouseMoveAction = &QucsView::MMoveWire1;
MousePressAction = &QucsView::MPressWire1;
MouseDoubleClickAction = &QucsView::MouseDoNothing;
}
@ -1293,67 +1341,6 @@ void QucsView::MReleaseResizeDiagram(QMouseEvent *Event)
drawn = false;
}
// -----------------------------------------------------------
void QucsView::endElementMoving()
{
int x1, y1, x2, y2;
QucsDoc *d = Docs.current();
// insert all moved elements into document and enlarge viewarea
// 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);
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;
}
movingElements.clear();
viewport()->repaint();
drawn = false;
}
// -----------------------------------------------------------
void QucsView::MReleasePaste(QMouseEvent *Event)
{

5
qucs/qucsview.h
View File

@ -36,6 +36,7 @@
#include "components/components.h"
#include "wire.h"
#include "qucsdoc.h"
#include "main.h"
@ -49,7 +50,7 @@ class QucsView : public QScrollView
Q_OBJECT
public:
QucsView(QWidget *parent=0);
QucsView(tQucsSettings *ps, QWidget *parent=0);
~QucsView();
double Zoom(double s);
@ -63,7 +64,7 @@ public:
Diagram *selDiag; // diagram selected in IconView
Painting *selPaint; // painting selected in IconView
bool drawn; // indicates whether the scheme component was drawn the last time
bool drawn; // indicates whether the scheme element was drawn last time
QString ProjName;
QPtrList<Element> movingElements;