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 2006-05-05 06:00:05 +00:00
parent 6ffad1cf72
commit 08457bcf8a
20 changed files with 380 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qucs/ChangeLog
View File

@ -1,3 +1,10 @@
2006-03-05 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* replace function for text editor
* mark component as short circuit
* fixed bug forgetting to activate undo button
* subcircuit component in component listview
2006-04-24 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* fixed problem with VHDL file starting with comment

2
qucs/bitmaps/Makefile.am
View File

@ -42,7 +42,7 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \
noise_iv.png or.png nor.png and.png nand.png xor.png xnor.png digi.png \
inverter.png digi_source.png timing.png truth.png rsflipflop.png \
dflipflop.png jkflipflop.png coupler.png coaxial.png am_mod.png pm_mod.png \
vhdlfile.png
vhdlfile.png subcircuit.png
# toolbar pictures
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \

BIN
qucs/bitmaps/deactiv.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 290 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 253 B

43
qucs/components/component.cpp
View File

@ -46,7 +46,8 @@ Component::Component()
mirroredX = false;
rotated = 0;
isSelected = false;
isActive = showName = true;
isActive = COMP_IS_ACTIVE;
showName = true;
cx = 0;
cy = 0;
@ -276,8 +277,11 @@ void Component::paint(ViewPainter *p)
y += p->LineSpacing;
}
if(!isActive) {
if(isActive == COMP_IS_OPEN)
p->Painter->setPen(QPen(QPen::red,0));
else if(isActive & COMP_IS_SHORTEN)
p->Painter->setPen(QPen(QPen::darkGreen,0));
if(isActive != COMP_IS_ACTIVE) {
p->drawRect(cx+x1, cy+y1, x2-x1+1, y2-y1+1);
p->drawLine(cx+x1, cy+y1, cx+x2, cy+y2);
p->drawLine(cx+x1, cy+y2, cx+x2, cy+y1);
@ -611,12 +615,34 @@ QString Component::NetList()
return s;
}
// -------------------------------------------------------
QString Component::getShortenNetlist()
{
int z=0;
QString s;
QString Node1 = Ports.first()->Connection->Name;
for(Port *pp = Ports.next(); pp != 0; pp = Ports.next())
s += "R:" + Name + "." + QString::number(z++) + " " +
Node1 + " " + pp->Connection->Name + " R=\"0\"\n";
return s;
}
// -------------------------------------------------------
QString Component::VHDL_Code(int)
{
return QString(""); // no digital model
}
// -------------------------------------------------------
QString Component::getShortenVHDL()
{
QString s;
QString Node1 = Ports.first()->Connection->Name;
for(Port *pp = Ports.next(); pp != 0; pp = Ports.next())
s += " " + pp->Connection->Name + " <= " + Node1 + ";\n";
return s;
}
// -------------------------------------------------------
QString Component::save()
{
@ -627,9 +653,8 @@ QString Component::save()
int i=0;
if(!showName)
i = 2;
if(isActive)
i |= 1;
i = 4;
i |= isActive;
s += QString::number(i);
s += " "+QString::number(cx)+" "+QString::number(cy);
s += " "+QString::number(tx)+" "+QString::number(ty);
@ -667,11 +692,9 @@ bool Component::load(const QString& _s)
n = s.section(' ',2,2); // isActive
tmp = n.toInt(&ok);
if(!ok) return false;
if(tmp & 1)
isActive = true;
else
isActive = false;
if(tmp & 2)
isActive = tmp & 3;
if(tmp & 4)
showName = false;
else
showName = true;

13
qucs/components/component.h
View File

@ -39,6 +39,8 @@ public:
virtual void recreate(Schematic*) {};
virtual QString NetList();
virtual QString VHDL_Code(int);
QString getShortenNetlist();
QString getShortenVHDL();
void paint(ViewPainter*);
void paintScheme(QPainter*);
void print(ViewPainter*);
@ -67,11 +69,14 @@ public:
QPtrList<Text> Texts;
QPtrList<Property> Props;
bool isActive; // should it be used in simulation or not ?
int tx, ty; // upper left corner of text (position)
QString Description;
bool showName;
#define COMP_IS_OPEN 0
#define COMP_IS_ACTIVE 1
#define COMP_IS_SHORTEN 2
int isActive; // should it be used in simulation or not ?
int tx, ty; // upper left corner of text (position)
bool showName;
QString Model, Name;
QString Description;
protected:
int analyseLine(const QString&);

19
qucs/components/subcircuit.cpp
View File

@ -39,13 +39,12 @@ Subcircuit::Subcircuit()
Type = isComponent; // both analog and digital
Description = QObject::tr("subcircuit");
Ports.append(new Port(0, 0)); // dummy port because of being device
Model = "Sub";
Name = "SUB";
Props.append(new Property("File", "", true,
QObject::tr("name of qucs schematic file")));
createSymbol();
Model = "Sub";
Name = "SUB";
}
// ---------------------------------------------------------------------
@ -58,6 +57,16 @@ Component* Subcircuit::newOne()
return p;
}
// -------------------------------------------------------
Element* Subcircuit::info(QString& Name, char* &BitmapFile, bool getNewOne)
{
Name = QObject::tr("Subcircuit");
BitmapFile = "subcircuit";
if(getNewOne) return new Subcircuit();
return 0;
}
// ---------------------------------------------------------------------
// Makes the schematic symbol subcircuit with the correct number
// of ports.

1
qucs/components/subcircuit.h
View File

@ -26,6 +26,7 @@ public:
Subcircuit();
~Subcircuit() {};
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString NetList();
QString VHDL_Code(int);

73
qucs/dialogs/searchdialog.cpp
View File

@ -25,23 +25,29 @@
#include <qcheckbox.h>
#include <qlineedit.h>
#include <qtabwidget.h>
#include <qvgroupbox.h>
#include <qpushbutton.h>
#include <qmessagebox.h>
SearchDialog::SearchDialog(QucsApp *App_) : QDialog(App_, 0, true)
SearchDialog::SearchDialog(QucsApp *App_)
: QDialog(App_, 0, true)
{
App = App_;
setCaption(tr("Search Text"));
QVBoxLayout *all = new QVBoxLayout(this);
all->setMargin(5);
QLabel *Label1 = new QLabel(tr("Text to search for:"), this);
all->addWidget(Label1);
QVGroupBox *g1 = new QVGroupBox(tr("Text to search for"), this);
all->addWidget(g1);
SearchEdit = new QLineEdit(g1);
SearchEdit = new QLineEdit(this);
all->addWidget(SearchEdit);
ReplaceGroup = new QVGroupBox(tr("Text to replace with"), this);
all->addWidget(ReplaceGroup);
ReplaceEdit = new QLineEdit(ReplaceGroup);
AskBox = new QCheckBox(tr("Ask before replacing"), this);
all->addWidget(AskBox);
PositionBox = new QCheckBox(tr("From cursor position"), this);
all->addWidget(PositionBox);
@ -67,13 +73,25 @@ SearchDialog::~SearchDialog()
}
// ---------------------------------------------------------------------
void SearchDialog::initSearch()
void SearchDialog::initSearch(bool replace)
{
if(replace) {
setCaption(tr("Replace Text"));
AskBox->setHidden(false);
ReplaceGroup->setHidden(false);
}
else {
setCaption(tr("Search Text"));
AskBox->hide();
ReplaceGroup->hide();
}
TextDoc *Doc = (TextDoc*)App->DocumentTab->currentPage();
ReplaceEdit->clear();
SearchEdit->setText(Doc->selectedText());
SearchEdit->selectAll();
setFocusProxy(SearchEdit);
SearchEdit->setFocus();
exec();
}
@ -82,7 +100,7 @@ void SearchDialog::searchText(bool fromCursor, int Offset)
{
TextDoc *Doc = (TextDoc*)App->DocumentTab->currentPage();
int Line=0, Column=0;
int Line=0, Column=0, count=0, i;
if(fromCursor)
Doc->getCursorPosition(&Line, &Column);
else if(BackwardBox->isChecked())
@ -93,16 +111,45 @@ void SearchDialog::searchText(bool fromCursor, int Offset)
if(SearchEdit->text().isEmpty())
return;
if(!Doc->find(SearchEdit->text(), CaseBox->isChecked(),
while(Doc->find(SearchEdit->text(), CaseBox->isChecked(),
WordBox->isChecked(), !BackwardBox->isChecked(), &Line, &Column)) {
QMessageBox::information(this, tr("Search..."),
tr("Could not find search string!"));
count++;
if(AskBox->isHidden()) // search only ?
return;
i = QMessageBox::Yes;
if(AskBox->isChecked()) {
i = QMessageBox::question(this,
tr("Replace..."), tr("Replace occurrence ?"),
QMessageBox::Yes | QMessageBox::Default, QMessageBox::No,
QMessageBox::Cancel | QMessageBox::Escape);
}
switch(i) {
case QMessageBox::Yes:
Doc->insert(ReplaceEdit->text());
Column += ReplaceEdit->text().length();
break;
case QMessageBox::No:
Column += SearchEdit->text().length();
break;
default: return;
}
}
if(count == 0)
QMessageBox::information(this, tr("Search..."),
tr("Search string not found!"));
else
if(!AskBox->isHidden()) // replace ?
if(!AskBox->isChecked()) // only with that, "count" has correct number !!!
QMessageBox::information(this, tr("Replace..."),
tr("Replaced %1 occurrences!").arg(count));
}
// ---------------------------------------------------------------------
void SearchDialog::slotSearch()
{
searchText(PositionBox->isChecked(), 0);
accept();
searchText(PositionBox->isChecked(), 0);
}

8
qucs/dialogs/searchdialog.h
View File

@ -23,6 +23,7 @@
class QucsApp;
class QLineEdit;
class QCheckBox;
class QVGroupBox;
class QPushButton;
@ -32,7 +33,7 @@ public:
SearchDialog(QucsApp*);
~SearchDialog();
void initSearch();
void initSearch(bool replace=false);
void searchText(bool, int);
private slots:
@ -40,8 +41,9 @@ private slots:
private:
QucsApp *App;
QLineEdit *SearchEdit;
QCheckBox *PositionBox, *CaseBox, *WordBox, *BackwardBox;
QLineEdit *SearchEdit, *ReplaceEdit;
QCheckBox *PositionBox, *CaseBox, *WordBox, *BackwardBox, *AskBox;
QVGroupBox *ReplaceGroup;
};
#endif

14
qucs/mouseactions.cpp
View File

@ -654,10 +654,7 @@ void MouseActions::MMoveActivate(Schematic *Doc, QMouseEvent *Event)
painter.setRasterOp(Qt::NotROP); // background should not be erased
if(drawn) {
painter.drawLine(MAx3, MAy3-9, MAx3+13, MAy3-9); // erase old
painter.drawLine(MAx3, MAy3, MAx3+13, MAy3);
painter.drawLine(MAx3, MAy3-9, MAx3, MAy3);
painter.drawLine(MAx3+13, MAy3-9, MAx3+13, MAy3);
painter.drawRect(MAx3, MAy3-9, 14, 10); // erase old
painter.drawLine(MAx3, MAy3-9, MAx3+13, MAy3);
painter.drawLine(MAx3, MAy3, MAx3+13, MAy3-9);
}
@ -666,10 +663,7 @@ void MouseActions::MMoveActivate(Schematic *Doc, QMouseEvent *Event)
MAx3 = Event->pos().x() - Doc->contentsX();
MAy3 = Event->pos().y() - Doc->contentsY();
painter.drawLine(MAx3, MAy3-9, MAx3+13, MAy3-9); // paint new
painter.drawLine(MAx3, MAy3, MAx3+13, MAy3);
painter.drawLine(MAx3, MAy3-9, MAx3, MAy3);
painter.drawLine(MAx3+13, MAy3-9, MAx3+13, MAy3);
painter.drawRect(MAx3, MAy3-9, 14, 10); // paint new
painter.drawLine(MAx3, MAy3-9, MAx3+13, MAy3);
painter.drawLine(MAx3, MAy3, MAx3+13, MAy3-9);
}
@ -1046,7 +1040,7 @@ void MouseActions::MPressActivate(Schematic *Doc, QMouseEvent*, int x, int y)
{
MAx1 = x;
MAy1 = y;
if(!Doc->activateComponent(x, y)) {
if(!Doc->activateSpecifiedComponent(x, y)) {
// if(Event->button() != Qt::LeftButton) return;
MAx2 = 0; // if not clicking on a component => open a rectangle
MAy2 = 0;
@ -1474,7 +1468,7 @@ void MouseActions::MReleaseActivate(Schematic *Doc, QMouseEvent *Event)
if(Event->button() != Qt::LeftButton) return;
// activates all components within the rectangle
Doc->activateComps(MAx1, MAy1, MAx1+MAx2, MAy1+MAy2);
Doc->activateCompsWithinRect(MAx1, MAy1, MAx1+MAx2, MAy1+MAy2);
QucsMain->MouseMoveAction = &MouseActions::MMoveActivate;
QucsMain->MousePressAction = &MouseActions::MPressActivate;

47
qucs/qucs.cpp
View File

@ -327,7 +327,7 @@ pInfoFunc Simulations[] =
pInfoFunc FileComponents[] =
{&SpiceFile::info, &SParamFile::info1, &SParamFile::info2,
&SParamFile::info, 0};
&SParamFile::info, &Subcircuit::info, 0};
pInfoFunc Diagrams[] =
{&RectDiagram::info, &PolarDiagram::info, &TabDiagram::info,
@ -1069,7 +1069,7 @@ bool QucsApp::saveFile(QucsDoc *Doc)
int Result = Doc->save();
if(Result < 0) return false;
updatePortNumber(Result);
updatePortNumber(Doc, Result);
return true;
}
@ -1176,7 +1176,7 @@ bool QucsApp::saveAs()
n = Doc->save(); // SAVE
if(n < 0) return false;
updatePortNumber(n);
updatePortNumber(Doc, n);
return true;
}
@ -1215,6 +1215,9 @@ void QucsApp::slotFileSaveAll()
}
DocumentTab->blockSignals(false);
// Call update() to update subcircuit symbols in current document.
((QScrollView*)DocumentTab->currentPage())->viewport()->update();
view->drawn = false;
statusBar()->message(tr("Ready."));
}
@ -1362,37 +1365,42 @@ void QucsApp::slotApplSettings()
// --------------------------------------------------------------
void QucsApp::updatePortNumber(int No)
void QucsApp::updatePortNumber(QucsDoc *currDoc, int No)
{
if(No<0) return;
QWidget *w = DocumentTab->currentPage();
if(w->inherits("QTextEdit")) return;
QString pathName = ((Schematic*)w)->DocName;
QString pathName = currDoc->DocName;
QFileInfo Info(pathName);
QString File, Name = Info.fileName();
QString Model, File, Name = Info.fileName();
// enter new port number into ListView
QListViewItem *p;
for(p = ConSchematics->firstChild(); p!=0; p = p->nextSibling()) {
if(p->text(0) == Name) {
if(No == 0) p->setText(1,"");
else p->setText(1,QString::number(No)+tr("-port"));
break;
if(Info.extension() == "sch") {
Model = "Sub";
// enter new port number into ListView
QListViewItem *p;
for(p = ConSchematics->firstChild(); p!=0; p = p->nextSibling()) {
if(p->text(0) == Name) {
if(No == 0) p->setText(1,"");
else p->setText(1,QString::number(No)+tr("-port"));
break;
}
}
}
if(No == 0) return;
else
Model = "VHDL";
// update all occurencies of subcircuit in all open documents
No = 0;
QWidget *w;
Component *pc_tmp;
while((w=DocumentTab->page(No++)) != 0) {
if(w->inherits("QTextEdit")) continue;
// start from the last to avoid re-appended components
// start from the last to omit re-appended components
Schematic *Doc = (Schematic*)w;
for(Component *pc=Doc->Components->last(); pc!=0; ) {
if(pc->Model == "Sub") {
if(pc->Model == Model) {
File = pc->Props.getFirst()->Value;
if((File == pathName) || (File == Name)) {
pc_tmp = Doc->Components->prev();
@ -1894,7 +1902,6 @@ void QucsApp::switchSchematicDoc(bool SchematicMode)
distrVert->setEnabled(SchematicMode);
onGrid->setEnabled(SchematicMode);
moveText->setEnabled(SchematicMode);
changeProps->setEnabled(SchematicMode);
editFind->setEnabled(!SchematicMode);
editFindAgain->setEnabled(!SchematicMode);
editRotate->setEnabled(SchematicMode);

2
qucs/qucs.h
View File

@ -180,7 +180,7 @@ private:
void readProjectFiles();
void OpenProject(const QString&, const QString&);
bool DeleteProject(const QString&, const QString&);
void updatePortNumber(int);
void updatePortNumber(QucsDoc*, int);
void fillComboBox(bool);
void switchSchematicDoc(bool);
void switchEditMode(bool);

49
qucs/qucs_actions.cpp
View File

@ -135,8 +135,9 @@ void QucsApp::slotEditActivate(bool on)
editActivate->blockSignals(false);
}
else
performToggleAction(on, editActivate, &Schematic::activateComponents,
&MouseActions::MMoveActivate, &MouseActions::MPressActivate);
performToggleAction(on, editActivate,
&Schematic::activateSelectedComponents,
&MouseActions::MMoveActivate, &MouseActions::MPressActivate);
}
// ------------------------------------------------------------------------
@ -517,20 +518,6 @@ void QucsApp::slotSelectAll()
}
}
// ---------------------------------------------------------------------
// Is called when the find action is activated.
void QucsApp::slotEditFind()
{
SearchDia->initSearch();
}
// ---------------------------------------------------------------------
// Is called when the find-again action is activated.
void QucsApp::slotEditFindAgain()
{
SearchDia->searchText(true, 1);
}
// ------------------------------------------------------------------------
// Is called by slotShowLastMsg(), by slotShowLastNetlist() and from the
// component edit dialog.
@ -660,14 +647,34 @@ void QucsApp::showHTML(const QString& Page)
connect(this, SIGNAL(signalKillEmAll()), QucsHelp, SLOT(kill()));
}
// ---------------------------------------------------------------------
// Is called when the find action is activated.
void QucsApp::slotEditFind()
{
SearchDia->initSearch();
}
// ---------------------------------------------------------------------
// Is called when the find-again action is activated.
void QucsApp::slotEditFindAgain()
{
SearchDia->searchText(true, 1);
}
// --------------------------------------------------------------
void QucsApp::slotChangeProps()
{
Schematic *Doc = (Schematic*)DocumentTab->currentPage();
ChangeDialog *d = new ChangeDialog(Doc);
if(d->exec() == QDialog::Accepted) {
Doc->setChanged(true, true);
Doc->viewport()->update();
QWidget *Doc = DocumentTab->currentPage();
if(Doc->inherits("QTextEdit")) {
((TextDoc*)Doc)->viewport()->setFocus();
SearchDia->initSearch(true);
}
else {
ChangeDialog *d = new ChangeDialog((Schematic*)Doc);
if(d->exec() == QDialog::Accepted) {
((Schematic*)Doc)->setChanged(true, true);
((Schematic*)Doc)->viewport()->update();
}
}
}

10
qucs/qucs_init.cpp
View File

@ -183,9 +183,9 @@ void QucsApp::initActions()
moveText->setToggleAction(true);
connect(moveText, SIGNAL(toggled(bool)), SLOT(slotMoveText(bool)));
changeProps = new QAction(tr("Change Property Values..."), Key_F7, this);
changeProps = new QAction(tr("Replace..."), Key_F7, this);
changeProps->setWhatsThis(
tr("Change Property Values\n\nChange Property Value of Components"));
tr("Replace\n\nChange component properties\nor\ntext in VHDL code"));
connect(changeProps, SIGNAL(activated()), SLOT(slotChangeProps()));
editCut = new QAction(
@ -383,9 +383,9 @@ void QucsApp::initActions()
QIconSet(QImage(QucsSettings.BitmapDir + "deactiv.png")),
tr("Deactivate/Activate"), CTRL+Key_D, this);
editActivate->setStatusTip(
tr("Deactivate/Activate the selected item"));
tr("Deactivate/Activate selected components"));
editActivate->setWhatsThis(
tr("Deactivate/Activate\n\nDeactivate/Activate the selected item"));
tr("Deactivate/Activate\n\nDeactivate/Activate the selected components"));
editActivate->setToggleAction(true);
connect(editActivate, SIGNAL(toggled(bool)), SLOT(slotEditActivate(bool)));
@ -587,11 +587,11 @@ void QucsApp::initMenuBar()
selectAll->addTo(editMenu);
editFind->addTo(editMenu);
editFindAgain->addTo(editMenu);
changeProps->addTo(editMenu);
editRotate->addTo(editMenu);
editMirror->addTo(editMenu);
editMirrorY->addTo(editMenu);
editActivate->addTo(editMenu);
changeProps->addTo(editMenu);
editMenu->insertItem(tr("Align"), alignMenu);
onGrid->addTo(editMenu);
moveText->addTo(editMenu);

6
qucs/schematic.h
View File

@ -167,9 +167,9 @@ public:
void insertRawComponent(Component*, bool noOptimize=true);
void recreateComponent(Component*);
void insertComponent(Component*);
void activateComps(int, int, int, int);
bool activateComponent(int, int);
bool activateComponents();
void activateCompsWithinRect(int, int, int, int);
bool activateSpecifiedComponent(int, int);
bool activateSelectedComponents();
void setCompPorts(Component*);
Component* selectCompText(int, int, int&, int&);
Component* searchSelSubcircuit();

65
qucs/schematic_element.cpp
View File

@ -1922,12 +1922,10 @@ void Schematic::insertComponent(Component *c)
}
// ---------------------------------------------------
// Activates/deactivates components that lie within the
// rectangle x1/y1, x2/y2.
void Schematic::activateComps(int x1, int y1, int x2, int y2)
void Schematic::activateCompsWithinRect(int x1, int y1, int x2, int y2)
{
bool changed = false;
int cx1, cy1, cx2, cy2;
int cx1, cy1, cx2, cy2, a;
// 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;
@ -1938,10 +1936,19 @@ void Schematic::activateComps(int x1, int y1, int x2, int y2)
for(Component *pc = Components->first(); pc != 0; pc = Components->next()) {
pc->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2) {
pc->isActive ^= true; // change "active status"
a = pc->isActive - 1;
if(pc->Ports.count() > 1) {
if(a < 0) a = 2;
}
else {
a &= 1;
if(pc->isActive == COMP_IS_ACTIVE) // only for active (not shorten)
if(pc->Model == "GND") // if existing, delete label on wire line
oneLabel(pc->Ports.getFirst()->Connection);
}
pc->isActive = a; // change "active status"
changed = true;
if(pc->isActive) // if existing, delete label on wire line
if(pc->Model == "GND") oneLabel(pc->Ports.getFirst()->Connection);
}
}
@ -1949,17 +1956,25 @@ void Schematic::activateComps(int x1, int y1, int x2, int y2)
}
// ---------------------------------------------------
// Activate/deactivate component, if x/y lies within its boundings.
bool Schematic::activateComponent(int x, int y)
bool Schematic::activateSpecifiedComponent(int x, int y)
{
int x1, y1, x2, y2;
int x1, y1, x2, y2, a;
for(Component *pc = Components->first(); pc != 0; pc = Components->next()) {
pc->Bounding(x1, y1, x2, y2);
if(x >= x1) if(x <= x2) if(y >= y1) if(y <= y2) {
pc->isActive ^= true; // change "active status"
a = pc->isActive - 1;
if(pc->Ports.count() > 1) {
if(a < 0) a = 2;
}
else {
a &= 1;
if(pc->isActive == COMP_IS_ACTIVE) // only for active (not shorten)
if(pc->Model == "GND") // if existing, delete label on wire line
oneLabel(pc->Ports.getFirst()->Connection);
}
pc->isActive = a; // change "active status"
setChanged(true, true);
if(pc->isActive) // if existing, delete label on wire line
if(pc->Model == "GND") oneLabel(pc->Ports.getFirst()->Connection);
return true;
}
}
@ -1967,17 +1982,25 @@ bool Schematic::activateComponent(int x, int y)
}
// ---------------------------------------------------
// Activates/deactivates all selected components.
bool Schematic::activateComponents()
bool Schematic::activateSelectedComponents()
{
int a;
bool sel = false;
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
if(pc->isSelected) {
pc->isActive ^= true; // change "active status"
a = pc->isActive - 1;
if(pc->Ports.count() > 1) {
if(a < 0) a = 2;
}
else {
a &= 1;
if(pc->isActive == COMP_IS_ACTIVE) // only for active (not shorten)
if(pc->Model == "GND") // if existing, delete label on wire line
oneLabel(pc->Ports.getFirst()->Connection);
}
pc->isActive = a; // change "active status"
sel = true;
if(pc->isActive) // if existing, delete label on wire line
if(pc->Model == "GND") oneLabel(pc->Ports.getFirst()->Connection);
}
if(sel) setChanged(true, true);
@ -2169,7 +2192,7 @@ void Schematic::oneLabel(Node *n1)
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next()) {
if(pe->Type != isWire) {
if(((Component*)pe)->isActive)
if(((Component*)pe)->isActive == COMP_IS_ACTIVE)
if(((Component*)pe)->Model == "GND") {
named = true;
if(pl) {
@ -2249,7 +2272,7 @@ Element* Schematic::getWireLabel(Node *pn_)
else
for(pe = pn->Connections.first(); pe!=0; pe = pn->Connections.next()) {
if(pe->Type != isWire) {
if(((Component*)pe)->isActive)
if(((Component*)pe)->isActive == COMP_IS_ACTIVE)
if(((Component*)pe)->Model == "GND") return pe;
continue;
}

226
qucs/schematic_file.cpp
View File

@ -802,99 +802,110 @@ bool Schematic::giveNodeNames(QTextStream *stream, int& countInit,
bool r;
QString s;
// give the ground nodes the name "gnd", and insert subcircuits etc.
for(Component *pc = DocComps.first(); pc != 0; pc = DocComps.next())
if(pc->isActive) {
if(NumPorts < 0) {
if((pc->Type & isAnalogComponent) == 0) {
ErrText->insert(QObject::tr("ERROR: Component \"%1\" has no analog model.").arg(pc->Name));
return false;
}
for(Component *pc = DocComps.first(); pc != 0; pc = DocComps.next()) {
if(pc->isActive != COMP_IS_ACTIVE) continue;
if(NumPorts < 0) {
if((pc->Type & isAnalogComponent) == 0) {
ErrText->insert(QObject::tr("ERROR: Component \"%1\" has no analog model.").arg(pc->Name));
return false;
}
else {
if((pc->Type & isDigitalComponent) == 0) {
ErrText->insert(QObject::tr("ERROR: Component \"%1\" has no digital model.").arg(pc->Name));
return false;
}
}
else {
if((pc->Type & isDigitalComponent) == 0) {
ErrText->insert(QObject::tr("ERROR: Component \"%1\" has no digital model.").arg(pc->Name));
return false;
}
}
if(pc->Model == "GND") {
pc->Ports.getFirst()->Connection->Name = "gnd";
continue;
}
if(pc->Model == "Sub") {
s = pc->Props.getFirst()->Value;
if(StringList.findIndex(s) >= 0)
continue; // insert each subcircuit just one time
StringList.append(s);
Schematic *d = new Schematic(0, QucsWorkDir.filePath(s));
if(!d->loadDocument()) { // load document if possible
delete d;
ErrText->insert(QObject::tr("ERROR: Cannot load subcircuit \"%1\".").arg(s));
return false;
}
d->DocName = s;
r = d->createSubNetlist(stream, countInit, Collect, ErrText, NumPorts);
delete d;
if(!r) return false;
continue;
}
if(pc->Model == "Lib") {
s = pc->Props.first()->Value + "_";
s += pc->Props.next()->Value;
if(StringList.findIndex(s) >= 0)
continue; // insert each subcircuit just one time
StringList.append(s);
r = ((LibComp*)pc)->outputSubNetlist(stream);
if(!r) {
ErrText->insert(
QObject::tr("ERROR: Cannot load library component \"%1\".").arg(pc->Name));
return false;
}
continue;
}
if(pc->Model == "SPICE") {
s = pc->Props.first()->Value;
if(s.isEmpty()) {
ErrText->insert(QObject::tr("ERROR: No file name in SPICE component \"%1\".").
arg(pc->Name));
return false;
}
if(StringList.findIndex(s) >= 0)
continue; // insert each spice component just one time
StringList.append(s);
s += '"'+pc->Props.next()->Value;
if(pc->Props.next()->Value == "yes") s = "SPICE \""+s;
else s = "SPICEo\""+s;
Collect.append(s);
continue;
}
if(pc->Model == "VHDL") {
s = pc->Props.getFirst()->Value;
if(s.isEmpty()) {
ErrText->insert(QObject::tr("ERROR: No file name in VHDL component \"%1\".").
arg(pc->Name));
return false;
}
if(StringList.findIndex(s) >= 0)
continue; // insert each vhdl component just one time
StringList.append(s);
QFileInfo Info(s);
if(Info.isRelative())
s = QucsWorkDir.filePath(s);
QFile f(s);
if(!f.open(IO_ReadOnly)) {
ErrText->insert(
QObject::tr("ERROR: Cannot open VHDL file \"%1\".").arg(s));
return false;
}
if(pc->Model == "GND") pc->Ports.getFirst()->Connection->Name = "gnd";
else if(pc->Model == "Sub") {
s = pc->Props.getFirst()->Value;
if(StringList.findIndex(s) >= 0)
continue; // insert each subcircuit just one time
StringList.append(s);
Schematic *d = new Schematic(0, QucsWorkDir.filePath(s));
if(!d->loadDocument()) { // load document if possible
delete d;
ErrText->insert(QObject::tr("ERROR: Cannot load subcircuit \"%1\".").arg(s));
return false;
}
d->DocName = s;
r = d->createSubNetlist(
stream, countInit, Collect, ErrText, NumPorts);
delete d;
if(!r) return false;
}
else if(pc->Model == "Lib") {
s = pc->Props.first()->Value + "_";
s += pc->Props.next()->Value;
if(StringList.findIndex(s) >= 0)
continue; // insert each subcircuit just one time
StringList.append(s);
r = ((LibComp*)pc)->outputSubNetlist(stream);
if(!r) {
ErrText->insert(
QObject::tr("ERROR: Cannot load library component \"%1\".").arg(pc->Name));
return false;
}
}
else if(pc->Model == "SPICE") {
s = pc->Props.first()->Value;
if(s.isEmpty()) {
ErrText->insert(QObject::tr("ERROR: No file name in SPICE component \"%1\".").
arg(pc->Name));
return false;
}
if(StringList.findIndex(s) >= 0)
continue; // insert each spice component just one time
StringList.append(s);
s += '"'+pc->Props.next()->Value;
if(pc->Props.next()->Value == "yes") s = "SPICE \""+s;
else s = "SPICEo\""+s;
Collect.append(s);
}
else if(pc->Model == "VHDL") {
s = pc->Props.getFirst()->Value;
if(s.isEmpty()) {
ErrText->insert(QObject::tr("ERROR: No file name in VHDL component \"%1\".").
arg(pc->Name));
return false;
}
if(StringList.findIndex(s) >= 0)
continue; // insert each vhdl component just one time
StringList.append(s);
QFileInfo Info(s);
if(Info.isRelative())
s = QucsWorkDir.filePath(s);
QFile f(s);
if(!f.open(IO_ReadOnly)) {
ErrText->insert(QObject::tr("ERROR: Cannot open VHDL file \"%1\".").
arg(s));
return false;
}
// Write the whole VHDL file into the netllist output.
QTextStream streamVHDL(&f);
s = streamVHDL.read();
f.close();
(*stream) << '\n' << s << '\n';
}
} // of "if(active)"
// Write the whole VHDL file into the netllist output.
QTextStream streamVHDL(&f);
s = streamVHDL.read();
f.close();
(*stream) << '\n' << s << '\n';
continue;
}
}
// work on named nodes first in order to preserve the user given names
@ -973,7 +984,7 @@ bool Schematic::createSubNetlist(QTextStream *stream, int& countInit,
// write all components with node names into the netlist file
for(pc = DocComps.first(); pc != 0; pc = DocComps.next()) {
if(!pc->isActive) continue; // should it be simulated ?
if(pc->isActive == COMP_IS_OPEN) continue; // should it be simulated ?
if(pc->Model.at(0) == '.') { // no simulations in subcircuits
ErrText->insert(
@ -986,10 +997,18 @@ bool Schematic::createSubNetlist(QTextStream *stream, int& countInit,
continue;
}
if(NumPorts < 0)
s = pc->NetList();
else
s = pc->VHDL_Code(NumPorts);
if(pc->isActive == COMP_IS_ACTIVE) {
if(NumPorts < 0)
s = pc->NetList();
else
s = pc->VHDL_Code(NumPorts);
}
else {
if(NumPorts < 0)
s = pc->getShortenNetlist();
else
s = pc->getShortenVHDL();
}
if(!s.isEmpty()) // not inserted: subcircuit ports, disabled components
(*stream) << s << "\n";
@ -1014,7 +1033,7 @@ int Schematic::prepareNetlist(QTextStream& stream, QStringList& Collect,
int allTypes = 0, NumPorts = 0;
// Detect simulation domain (analog/digital) by looking at component types.
for(Component *pc = DocComps.first(); pc != 0; pc = DocComps.next()) {
if(!pc->isActive) continue;
if(pc->isActive == COMP_IS_OPEN) continue;
if(pc->Model.at(0) == '.') {
if(pc->Model == ".Digi") {
if(allTypes & isDigitalComponent) {
@ -1102,10 +1121,14 @@ QString Schematic::createNetlist(QTextStream& stream, int NumPorts)
QString s, Time;
for(Component *pc = DocComps.first(); pc != 0; pc = DocComps.next()) {
if(!pc->isActive) continue; // should it be simulated ?
if(pc->isActive == COMP_IS_OPEN) continue; // should it be simulated ?
if(NumPorts < 0)
s = pc->NetList();
if(NumPorts < 0) {
if(pc->isActive == COMP_IS_ACTIVE)
s = pc->NetList();
else
s = pc->getShortenNetlist();
}
else {
if(pc->Model.at(0) == '.') { // simulation component ?
if(NumPorts > 0) // truth table simulation ?
@ -1115,7 +1138,10 @@ QString Schematic::createNetlist(QTextStream& stream, int NumPorts)
if(!VHDL_Time(Time, pc->Name)) return Time; // wrong time format
}
}
s = pc->VHDL_Code(NumPorts);
if(pc->isActive == COMP_IS_ACTIVE)
s = pc->VHDL_Code(NumPorts);
else
s = pc->getShortenVHDL();
if(s.at(0) == '§') return s; // return error
}

31
qucs/textdoc.cpp
View File

@ -35,10 +35,8 @@
TextDoc::TextDoc(QucsApp *App_, const QString& Name_) : QucsDoc(App_, Name_)
{
tmpPosX = tmpPosY = 0;
tmpPosX = tmpPosY = 1; // set to 1 to trigger line highlighting
Scale = (float)QucsSettings.font.pointSize();
undoIsAvailable = redoIsAvailable = false;
setUndoDepth(QucsSettings.maxUndo);
QFileInfo Info(Name_);
@ -63,12 +61,6 @@ TextDoc::TextDoc(QucsApp *App_, const QString& Name_) : QucsDoc(App_, Name_)
syntaxHighlight = new SyntaxHighlighter(this);
}
tmpPosX = tmpPosY = 1; // set to 1 to trigger line highlighting
Scale = (float)QucsSettings.font.pointSize();
undoIsAvailable = redoIsAvailable = false;
setUndoDepth(QucsSettings.maxUndo);
}
TextDoc::~TextDoc()
@ -100,9 +92,9 @@ void TextDoc::becomeCurrent(bool)
slotCursorPosChanged(x, y);
viewport()->setFocus();
if(undoIsAvailable) App->undo->setEnabled(true);
if(isUndoAvailable()) App->undo->setEnabled(true);
else App->undo->setEnabled(false);
if(redoIsAvailable) App->redo->setEnabled(true);
if(isRedoAvailable()) App->redo->setEnabled(true);
else App->redo->setEnabled(false);
}
@ -124,11 +116,14 @@ void TextDoc::slotCursorPosChanged(int x, int y)
// ---------------------------------------------------
void TextDoc::slotSetChanged()
{
if((!DocChanged) && isModified()) {
App->DocumentTab->setTabIconSet(this, QPixmap(smallsave_xpm));
DocChanged = true;
if(isModified()) {
if(isUndoAvailable()) slotChangeUndo(true); // fix Qt problem
if(!DocChanged) {
App->DocumentTab->setTabIconSet(this, QPixmap(smallsave_xpm));
DocChanged = true;
}
}
else if(DocChanged && (!isModified())) {
else if(DocChanged) {
App->DocumentTab->setTabIconSet(this, QPixmap(empty_xpm));
DocChanged = false;
}
@ -137,15 +132,13 @@ void TextDoc::slotSetChanged()
// ---------------------------------------------------
void TextDoc::slotChangeUndo(bool available)
{
undoIsAvailable = available;
App->undo->setEnabled(undoIsAvailable);
App->undo->setEnabled(available);
}
// ---------------------------------------------------
void TextDoc::slotChangeRedo(bool available)
{
redoIsAvailable = available;
App->redo->setEnabled(redoIsAvailable);
App->redo->setEnabled(available);
}
// ---------------------------------------------------

1
qucs/textdoc.h
View File

@ -53,7 +53,6 @@ public slots:
void slotChangeRedo(bool);
private:
bool undoIsAvailable, redoIsAvailable;
SyntaxHighlighter *syntaxHighlight;
};