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-08-14 06:08:19 +00:00
parent ec5c62426d
commit 978a31979a
20 changed files with 456 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qucs-help/ChangeLog
View File

@ -1,3 +1,8 @@
2006-08-12 Gopala Krishna <krishna.ggk@gmail.com>
* qucshelp is an application now
* added toolbar, statusbar and history
2006-05-23 Stefan Jahn <stefan@lkcc.org>
* docs/de/mathfunc.html: Completed German translation for math

188
qucs-help/qucshelp.cpp
View File

@ -22,8 +22,13 @@
#include "qucshelp.h"
#include <qpushbutton.h>
#include <qlayout.h>
#include <qhbox.h>
#include <qaction.h>
#include <qpixmap.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qpopupmenu.h>
#include <qmenubar.h>
#include <qapplication.h>
QucsHelp::QucsHelp(const QString& page)
{
@ -31,52 +36,23 @@ QucsHelp::QucsHelp(const QString& page)
setIcon (QPixmap(QucsSettings.BitmapDir + "big.qucs.xpm"));
setCaption(tr("Qucs Help System"));
QVBoxLayout *v = new QVBoxLayout(this);
v->setSpacing(5);
text = new QTextBrowser(this);
text->setMinimumSize(400,200);
v->addWidget(text);
setCentralWidget(text);
setupActions();
initList();
QHBox *h = new QHBox(this);
h->setSpacing(5);
v->addWidget(h);
QWidget *st = new QWidget(h); // stretchable placeholder
h->setStretchFactor(st,5);
QPushButton *ButtIndex = new QPushButton(tr("Help Index"),h);
connect(ButtIndex, SIGNAL(clicked()), SLOT(slotGotoIndex()));
QPushButton *ButtClose = new QPushButton(tr("Close"),h);
connect(ButtClose, SIGNAL(clicked()), SLOT(slotClose()));
ButtClose->setFocus();
text->setSource(QucsHelpDir.filePath(links[0]));
// .......................................
if(page.isEmpty()) slotGotoIndex();
else text->setSource(QucsHelpDir.filePath(page));
if(!page.isEmpty())
text->setSource(QucsHelpDir.filePath(page));
}
QucsHelp::~QucsHelp()
{
}
//-----------------------------------------------------------------
void QucsHelp::slotGotoIndex()
{
text->setSource(QucsHelpDir.filePath("index.html"));
}
//-----------------------------------------------------------------
void QucsHelp::slotClose()
{
int tmp;
tmp = x(); // call size and position function in order to ...
tmp = y(); // ... set them correctly before closing the ...
tmp = width(); // dialog !!! Otherwise the frame of the window ...
tmp = height(); // will not be recognized (a X11 problem).
accept();
}
//-----------------------------------------------------------------
// To get all close events.
void QucsHelp::closeEvent(QCloseEvent *Event)
@ -89,3 +65,141 @@ void QucsHelp::closeEvent(QCloseEvent *Event)
Event->accept();
}
void QucsHelp::setupActions()
{
QToolBar *toolbar = new QToolBar(this,"main_toolbar");
QMenuBar *bar = menuBar();
statusBar();
const QKeySequence ks = QKeySequence();
QAction *quitAction = new QAction(QIconSet(QPixmap(QucsSettings.BitmapDir + "quit.png")),
tr("&Quit"), ALT+Key_Q, this);
QAction *backAction = new QAction(QIconSet(QPixmap(QucsSettings.BitmapDir + "back.png")),
tr("&Back"), ALT+Key_Left, this);
QAction *forwardAction = new QAction(QIconSet(QPixmap(QucsSettings.BitmapDir + "forward.png")),
tr("&Forward"), ALT+Key_Right, this);
QAction *homeAction = new QAction(QIconSet(QPixmap(QucsSettings.BitmapDir + "home.png")),
tr("&Home"),CTRL+Key_H,this);
previousAction = new QAction(QIconSet(QPixmap(QucsSettings.BitmapDir + "previous.png")),tr("&Previous"),
ks, this);
nextAction = new QAction(QIconSet(QPixmap(QucsSettings.BitmapDir + "next.png")),
tr("&Next"), ks, this);
connect(quitAction,SIGNAL(activated()),qApp,SLOT(quit()));
connect(backAction,SIGNAL(activated()),text,SLOT(backward()));
connect(text,SIGNAL(backwardAvailable(bool)),backAction,SLOT(setEnabled(bool)));
connect(forwardAction,SIGNAL(activated()),text,SLOT(forward()));
connect(text,SIGNAL(forwardAvailable(bool)),forwardAction,SLOT(setEnabled(bool)));
connect(homeAction,SIGNAL(activated()),text,SLOT(home()));
connect(text,SIGNAL(sourceChanged(const QString &)),this,SLOT(slotSourceChanged(const QString&)));
connect(previousAction,SIGNAL(activated()),this,SLOT(previousLink()));
connect(nextAction,SIGNAL(activated()),this,SLOT(nextLink()));
backAction->addTo(toolbar);
forwardAction->addTo(toolbar);
toolbar->addSeparator();
homeAction->addTo(toolbar);
previousAction->addTo(toolbar);
nextAction->addTo(toolbar);
toolbar->addSeparator();
quitAction->addTo(toolbar);
QPopupMenu *fileMenu = new QPopupMenu(this);
quitAction->addTo(fileMenu);
QPopupMenu *viewMenu = new QPopupMenu(this);
backAction->addTo(viewMenu);
forwardAction->addTo(viewMenu);
homeAction->addTo(viewMenu);
previousAction->addTo(viewMenu);
nextAction->addTo(viewMenu);
QPopupMenu *helpMenu = new QPopupMenu(this);
helpMenu->insertItem("&About Qt",qApp,SLOT(aboutQt()));
bar->insertItem( "&File", fileMenu );
bar->insertItem("&View",viewMenu);
bar->insertSeparator();
bar->insertItem("&Help",helpMenu);
}
//This function finds all links dynamically from "index.html"
//This is used for next and back action
void QucsHelp::initList()
{
links << QString("index.html");
QFile file(QucsHelpDir.filePath("index.html"));
if(!file.open(IO_ReadOnly))
return;
QTextStream str(&file);
QString line,link;
int index = -1;
int end = -1;
while ( !str.atEnd() )
{
line = str.readLine();
index = line.find("href=\"");//find link to other file
if(index != -1)
{
index += 6;
end = line.find('"',index);
if(end == -1)
{
qWarning("can't find end quote. May be HTML error");
return;
}
link = line.mid(index,end-index);
if(link.startsWith("http"))//discard links to site
continue;
links << link;
}
}
}
//This slot updates next and previous actions i.e enabling/disabling
void QucsHelp::slotSourceChanged(const QString& str)
{
bool found = false;
for(unsigned int i=0;i < links.count(); i++)
{
if(str.endsWith(links[i]))
{
currentIndex = i;
previousAction->setEnabled(bool(i!=0));
nextAction->setEnabled(bool(i+1 != links.count()));
found = true;
break;
}
}
if(found == false) // some error
{
previousAction->setEnabled(bool(currentIndex!=0));
nextAction->setEnabled(bool(currentIndex+1 != links.count()));
text->blockSignals(true);
text->setSource(QucsHelpDir.filePath(links[currentIndex]));
text->blockSignals(false);
}
}
void QucsHelp::previousLink()
{
if(currentIndex > 0)
--currentIndex;
text->setSource(QucsHelpDir.filePath(links[currentIndex]));
}
void QucsHelp::nextLink()
{
++currentIndex;
if(currentIndex >= links.count())
currentIndex = links.count();
text->setSource(QucsHelpDir.filePath(links[currentIndex]));
}

19
qucs-help/qucshelp.h
View File

@ -18,11 +18,11 @@
#ifndef QUCSHELP_H
#define QUCSHELP_H
#include <qdialog.h>
#include <qmainwindow.h>
#include <qtextbrowser.h>
#include <qdir.h>
#include <qfont.h>
#include <qstring.h>
#include <qstringlist.h>
struct tQucsSettings {
int x, y, dx, dy; // position and size of main window
@ -35,22 +35,29 @@ struct tQucsSettings {
extern tQucsSettings QucsSettings;
extern QDir QucsHelpDir;
class QAction;
class QucsHelp : public QDialog {
class QucsHelp : public QMainWindow {
Q_OBJECT
public:
QucsHelp(const QString& page);
~QucsHelp();
private slots:
void slotGotoIndex();
void slotClose();
void slotSourceChanged(const QString& str);
void previousLink();
void nextLink();
private:
void closeEvent(QCloseEvent*);
void setupActions();
void initList();
QTextBrowser *text;
unsigned int currentIndex;
QStringList links;
QAction *previousAction;
QAction *nextAction;
};
#endif

7
qucs/ChangeLog
View File

@ -1,3 +1,10 @@
2006-08-12 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* no schematic frame during symbol edit
* fixed bug showing "changed" after change to symbol edit mode
* fixed bug in rectangular clipping algorithm
* simulate VHDL file taken from memory
2006-08-09 Stefan Jahn <stefan@lkcc.org>
* qucs_es.ts: Updated spanish translations. Thanks to Jose.

3
qucs/bitmaps/Makefile.am
View File

@ -50,7 +50,8 @@ PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \
fileprint.png filesaveall.png gear.png mirror.png nodename.png marker.png \
port.png rebuild.png redo.png rotate_ccw.png top.png undo.png viewmag1.png \
viewmag+.png viewmag-.png viewmagfit.png wire.png filenew.png mirrory.png \
ground.png textnew.png
ground.png textnew.png quit.png back.png forward.png home.png previous.png \
next.png
# application pictures
ICONS = big.button.qucs.xpm big.qucs.xpm tiny.button.qucs.xpm tiny.qucs.xpm

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
qucs/components/componentdialog.cpp
View File

@ -26,7 +26,6 @@
#include <qhgroupbox.h>
#include <qvalidator.h>
#include <qtabwidget.h>
#include <qmessagebox.h>
#include <qfiledialog.h>
#include <math.h>

4
qucs/components/opt_sim.cpp
View File

@ -33,8 +33,8 @@ Optimize_Sim::Optimize_Sim()
Model = ".Opt";
Name = "Opt";
Props.append(new Property("Type", "lin", true,
QObject::tr("sweep type")+" [lin, log, list, const]"));
// Props.append(new Property("Type", "lin", true,
// QObject::tr("sweep type")+" [lin, log, list, const]"));
}
Optimize_Sim::~Optimize_Sim()

336
qucs/components/optimizedialog.cpp
View File

@ -28,10 +28,12 @@
#include <qlayout.h>
#include <qcheckbox.h>
#include <qlineedit.h>
#include <qcombobox.h>
#include <qlistview.h>
#include <qtabwidget.h>
#include <qvalidator.h>
#include <qpushbutton.h>
#include <qmessagebox.h>
OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
@ -39,10 +41,12 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
{
Comp = c_;
Doc = d_;
changed = false;
setCaption(tr("Edit Optimization Properties"));
Expr.setPattern("[\\w_]+");
Validator = new QRegExpValidator(Expr, this);
numVal = new QDoubleValidator(this);
all = new QVBoxLayout(this); // to provide the neccessary size
QTabWidget *t = new QTabWidget(this);
@ -54,6 +58,7 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
gp1->addWidget(new QLabel(tr("Name:"), Tab1), 0,0);
NameEdit = new QLineEdit(Tab1);
NameEdit->setValidator(Validator);
gp1->addWidget(NameEdit,0,1);
@ -73,21 +78,36 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
connect(VarList, SIGNAL(clicked(QListViewItem*)),
SLOT(slotEditVariable(QListViewItem*)));
gp2->addWidget(new QLabel(tr("Name:"), Tab2), 1,0);
VarNameEdit = new QLineEdit(Tab2);
gp2->addWidget(VarNameEdit,1,1);
VarActiveCheck = new QCheckBox(tr("active"), Tab2);
gp2->addWidget(VarActiveCheck,1,2);
QHBox *VarLine = new QHBox(Tab2);
VarLine->setSpacing(3);
gp2->addMultiCellWidget(VarLine, 1,1,0,2);
new QLabel(tr("Name:"), VarLine);
VarNameEdit = new QLineEdit(VarLine);
VarNameEdit->setValidator(Validator);
connect(VarNameEdit, SIGNAL(returnPressed()),
SLOT(slotChangeVarName()));
VarActiveCheck = new QCheckBox(tr("active"), VarLine);
VarActiveCheck->setChecked(true);
gp2->addWidget(new QLabel(tr("initial:"), Tab2), 2,0);
gp2->addWidget(new QLabel(tr("min:"), Tab2), 2,1);
gp2->addWidget(new QLabel(tr("max:"), Tab2), 2,2);
VarInitEdit = new QLineEdit(Tab2);
VarInitEdit->setValidator(numVal);
gp2->addWidget(VarInitEdit,3,0);
connect(VarInitEdit, SIGNAL(returnPressed()),
SLOT(slotChangeVarInit()));
VarMinEdit = new QLineEdit(Tab2);
VarMinEdit->setValidator(numVal);
gp2->addWidget(VarMinEdit,3,1);
connect(VarMinEdit, SIGNAL(returnPressed()),
SLOT(slotChangeVarMin()));
VarMaxEdit = new QLineEdit(Tab2);
VarMaxEdit->setValidator(numVal);
gp2->addWidget(VarMaxEdit,3,2);
connect(VarMaxEdit, SIGNAL(returnPressed()),
SLOT(slotChangeVarMax()));
QPushButton *AddVar_Butt = new QPushButton(tr("Add"), Tab2);
gp2->addWidget(AddVar_Butt,4,1);
@ -101,23 +121,46 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
// ...........................................................
QWidget *Tab3 = new QWidget(t);
QGridLayout *gp3 = new QGridLayout(Tab3,5,2,3,3);
QGridLayout *gp3 = new QGridLayout(Tab3,4,3,3,3);
GoalList = new QListView(Tab3);
GoalList->addColumn(tr("Name"));
GoalList->addColumn(tr("Goal"));
gp3->addMultiCellWidget(GoalList,0,0,0,1);
GoalList->addColumn(tr("Value"));
GoalList->addColumn(tr("Type"));
gp3->addMultiCellWidget(GoalList,0,0,0,2);
connect(GoalList, SIGNAL(clicked(QListViewItem*)),
SLOT(slotEditGoal(QListViewItem*)));
QPushButton *AddGoal_Butt = new QPushButton(tr("Set"), Tab3);
gp3->addWidget(AddGoal_Butt,1,1);
gp3->addWidget(new QLabel(tr("Name:"), Tab3), 1,0);
GoalNameEdit = new QLineEdit(Tab3);
GoalNameEdit->setValidator(Validator);
gp3->addWidget(GoalNameEdit,1,1);
// connect(VarNameEdit, SIGNAL(returnPressed()),
// SLOT(slotChangeVarName()));
gp3->addWidget(new QLabel(tr("Value:"), Tab3), 2,0);
GoalNumEdit = new QLineEdit(Tab3);
GoalNumEdit->setValidator(numVal);
gp3->addWidget(GoalNumEdit,2,1);
GoalTypeCombo = new QComboBox(Tab3);
GoalTypeCombo->insertItem(tr("minimum"));
GoalTypeCombo->insertItem(tr("maximum"));
GoalTypeCombo->insertItem(tr("less"));
GoalTypeCombo->insertItem(tr("greater"));
GoalTypeCombo->insertItem(tr("equal"));
gp3->addWidget(GoalTypeCombo,2,2);
QHBox *GoalButtons = new QHBox(Tab3);
GoalButtons->setSpacing(3);
gp3->addMultiCellWidget(GoalButtons, 3,3,0,2);
GoalButtons->setStretchFactor(new QWidget(GoalButtons),5);
QPushButton *AddGoal_Butt = new QPushButton(tr("Add"), GoalButtons);
connect(AddGoal_Butt, SIGNAL(clicked()), SLOT(slotAddGoal()));
QPushButton *DelGoal_Butt = new QPushButton(tr("Remove"), Tab3);
gp3->addWidget(DelGoal_Butt,2,1);
QPushButton *DelGoal_Butt = new QPushButton(tr("Delete"), GoalButtons);
connect(DelGoal_Butt, SIGNAL(clicked()), SLOT(slotDeleteGoal()));
// gp3->setRowStretch(4,5);
t->addTab(Tab3, tr("Goals"));
// ...........................................................
@ -132,78 +175,175 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
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()));
OkButt->setDefault(true);
connect(CancelButt, SIGNAL(clicked()), SLOT(slotCancel()));
// ...........................................................
NameEdit->setText(Comp->Name);
Property *pp;
for(pp = Comp->Props.first(); pp != 0; pp = Comp->Props.next()) {
if(pp->Name != "Var") break;
new QListViewItem(VarList, pp->Value.section('|',0,0),
pp->Value.section('|',1,1), pp->Value.section('|',2,2),
pp->Value.section('|',3,3), pp->Value.section('|',4,4));
}
for( ; pp != 0; pp = Comp->Props.next()) {
if(pp->Name != "Goal") break;
new QListViewItem(GoalList, pp->Value.section('|',0,0),
pp->Value.section('|',1,1), pp->Value.section('|',2,2));
}
resize(300, 200);
}
OptimizeDialog::~OptimizeDialog()
{
delete all;
delete numVal;
delete Validator;
}
// -----------------------------------------------------------
void OptimizeDialog::slotEditVariable(QListViewItem*)
void OptimizeDialog::slotEditVariable(QListViewItem *Item)
{
}
if(Item == 0) {
VarNameEdit->clear();
VarActiveCheck->setChecked(true);
VarInitEdit->clear();
VarMinEdit->clear();
VarMaxEdit->clear();
return;
}
// -----------------------------------------------------------
void OptimizeDialog::slotEditGoal(QListViewItem*)
{
VarNameEdit->setText(Item->text(0));
VarActiveCheck->setChecked(Item->text(1) == tr("yes"));
VarInitEdit->setText(Item->text(2));
VarMinEdit->setText(Item->text(3));
VarMaxEdit->setText(Item->text(4));
}
// -----------------------------------------------------------
void OptimizeDialog::slotAddVariable()
{
if(VarNameEdit->text().isEmpty() || VarInitEdit->text().isEmpty() ||
VarMinEdit->text().isEmpty() || VarMaxEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Error"),
tr("Every text field must be non-empty!"));
return;
}
new QListViewItem(VarList, VarNameEdit->text(),
VarActiveCheck->isChecked() ? tr("yes") : tr("no"),
VarInitEdit->text(), VarMinEdit->text(), VarMaxEdit->text());
changed = true;
}
// -----------------------------------------------------------
void OptimizeDialog::slotDeleteVariable()
{
QListViewItem *next_item = 0;
QListViewItem *Item = VarList->selectedItem();
if(Item) {
next_item = Item->itemBelow();
if(next_item == 0) next_item = Item->itemAbove();
VarList->takeItem(Item); // remove from ListView
delete Item; // delete item
changed = true;
}
slotEditVariable(next_item);
}
// -----------------------------------------------------------
void OptimizeDialog::slotChangeVarName()
{
QListViewItem *Item = VarList->selectedItem();
if(Item == 0) return;
Item->setText(0, VarNameEdit->text());
VarInitEdit->setFocus();
changed = true;
}
// -----------------------------------------------------------
void OptimizeDialog::slotChangeVarInit()
{
QListViewItem *Item = VarList->selectedItem();
if(Item == 0) return;
Item->setText(0, VarInitEdit->text());
VarMinEdit->setFocus();
changed = true;
}
// -----------------------------------------------------------
void OptimizeDialog::slotChangeVarMin()
{
QListViewItem *Item = VarList->selectedItem();
if(Item == 0) return;
Item->setText(0, VarMinEdit->text());
VarMaxEdit->setFocus();
changed = true;
}
// -----------------------------------------------------------
void OptimizeDialog::slotChangeVarMax()
{
QListViewItem *Item = VarList->selectedItem();
if(Item == 0) return;
Item->setText(0, VarMaxEdit->text());
VarNameEdit->setFocus();
changed = true;
}
// -----------------------------------------------------------
void OptimizeDialog::slotEditGoal(QListViewItem *Item)
{
if(Item == 0) {
GoalNameEdit->clear();
GoalTypeCombo->setCurrentItem(0);
GoalNumEdit->clear();
return;
}
GoalNameEdit->setText(Item->text(0));
GoalTypeCombo->setCurrentText(Item->text(1));
GoalNumEdit->setText(Item->text(2));
}
// -----------------------------------------------------------
void OptimizeDialog::slotAddGoal()
{
/* QListViewItem *Item = List_Suffix->selectedItem();
if(Item) {
Item->setText(0, Input_Suffix->text());
Item->setText(1, Input_Program->text());
if(GoalNameEdit->text().isEmpty() || GoalNumEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Error"),
tr("Every text field must be non-empty!"));
return;
}
for(Item = List_Suffix->firstChild(); Item!=0; Item = Item->itemBelow())
if(Item->text(0) == Input_Suffix->text()) {
QMessageBox::critical(this, tr("Error"),
tr("This suffix is already registered!"));
return;
}
List_Suffix->ensureItemVisible(
new QListViewItem(List_Suffix, List_Suffix->lastItem(),
Input_Suffix->text(), Input_Program->text()));
Input_Suffix->setFocus();
Input_Suffix->setText("");
Input_Program->setText("");*/
new QListViewItem(GoalList, GoalNameEdit->text(),
GoalTypeCombo->currentText(), GoalNumEdit->text());
changed = true;
}
// -----------------------------------------------------------
void OptimizeDialog::slotDeleteGoal()
{
/* QListViewItem *Item = List_Suffix->selectedItem();
if(Item == 0) return;
QListViewItem *next_item = 0;
List_Suffix->takeItem(Item); // remove from ListView
delete Item;
QListViewItem *Item = GoalList->selectedItem();
if(Item) {
next_item = Item->itemBelow();
if(next_item == 0) next_item = Item->itemAbove();
GoalList->takeItem(Item); // remove from ListView
delete Item; // delete item
changed = true;
}
Input_Suffix->setText("");
Input_Program->setText("");*/
slotEditGoal(next_item);
}
// -----------------------------------------------------------
@ -216,77 +356,47 @@ void OptimizeDialog::slotOK()
// -----------------------------------------------------------
void OptimizeDialog::slotApply()
{
/* bool changed = false;
if(QucsSettings.BGColor != BGColorButton->paletteBackgroundColor()) {
QucsSettings.BGColor = BGColorButton->paletteBackgroundColor();
int No=0;
QWidget *w;
while((w=App->DocumentTab->page(No++)) != 0)
if(w->inherits("QTextEdit"))
((TextDoc*)w)->viewport()->setPaletteBackgroundColor(
QucsSettings.BGColor);
else
((Schematic*)w)->viewport()->setPaletteBackgroundColor(
QucsSettings.BGColor);
changed = true;
Component *pc;
if(NameEdit->text().isEmpty())
NameEdit->setText(Comp->Name);
else
if(NameEdit->text() != Comp->Name) {
for(pc = Doc->Components->first(); pc!=0; pc = Doc->Components->next())
if(pc->Name == NameEdit->text())
break; // found component with the same name ?
if(pc)
NameEdit->setText(Comp->Name);
else {
Comp->Name = NameEdit->text();
changed = true;
}
}
if(savingFont != Font) {
savingFont = Font;
changed = true;
QString Prop;
Comp->Props.clear();
QListViewItem *item;
// apply all the new property values in the ListView
for(item = VarList->firstChild(); item != 0; item = item->itemBelow()) {
Prop = item->text(0) + "|" + item->text(1) + "|" +
item->text(2) + "|" + item->text(3) + "|" +
item->text(4);
Comp->Props.append(new Property("Var", Prop, false, ""));
}
for(item = GoalList->firstChild(); item != 0; item = item->itemBelow()) {
Prop = item->text(0) + "|" + item->text(1) + "|" +
item->text(2);
Comp->Props.append(new Property("Goal", Prop, false, ""));
}
QucsSettings.Language =
LanguageCombo->currentText().section('(',1,1).remove(')');
if(QucsSettings.VHDL_Comment != ColorComment->paletteForegroundColor()) {
QucsSettings.VHDL_Comment = ColorComment->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_String != ColorString->paletteForegroundColor()) {
QucsSettings.VHDL_String = ColorString->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Integer != ColorInteger->paletteForegroundColor()) {
QucsSettings.VHDL_Integer = ColorInteger->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Real != ColorReal->paletteForegroundColor()) {
QucsSettings.VHDL_Real = ColorReal->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Character != ColorCharacter->paletteForegroundColor()) {
QucsSettings.VHDL_Character = ColorCharacter->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Types != ColorDataType->paletteForegroundColor()) {
QucsSettings.VHDL_Types = ColorDataType->paletteForegroundColor();
changed = true;
}
if(QucsSettings.VHDL_Attributes != ColorAttributes->paletteForegroundColor()) {
QucsSettings.VHDL_Attributes = ColorAttributes->paletteForegroundColor();
changed = true;
}
bool ok;
if(QucsSettings.maxUndo != undoNumEdit->text().toUInt(&ok)) {
QucsSettings.maxUndo = undoNumEdit->text().toInt(&ok);
changed = true;
}
if(QucsSettings.Editor != editorEdit->text()) {
QucsSettings.Editor = editorEdit->text();
changed = true;
}
QListViewItem *Item;
QucsSettings.FileTypes.clear();
for(Item = List_Suffix->firstChild(); Item!=0; Item = Item->itemBelow())
QucsSettings.FileTypes.append(Item->text(0)+"/"+Item->text(1));
saveApplSettings(App); // also sets the small and large font
if(changed)
App->repaint();*/
Doc->viewport()->repaint();
}
// -------------------------------------------------------------------------
// Is called if the "Cancel"-button is pressed.
void OptimizeDialog::slotCancel()
{
if(changed) done(1); // changed could have been done before
else done(0); // (by "Apply"-button)
}

14
qucs/components/optimizedialog.h
View File

@ -26,14 +26,16 @@ class Optimize_Sim;
class QListView;
class QListViewItem;
class QCheckBox;
class QComboBox;
class QLineEdit;
class QPushButton;
class QVBoxLayout;
class QRegExpValidator;
class QDoubleValidator;
class OptimizeDialog : public QDialog {
Q_OBJECT
Q_OBJECT
public:
OptimizeDialog(Optimize_Sim*, Schematic*);
~OptimizeDialog();
@ -41,12 +43,17 @@ public:
private slots:
void slotOK();
void slotApply();
void slotCancel();
void slotAddVariable();
void slotDeleteVariable();
void slotAddGoal();
void slotDeleteGoal();
void slotEditGoal(QListViewItem*);
void slotEditVariable(QListViewItem*);
void slotChangeVarName();
void slotChangeVarInit();
void slotChangeVarMin();
void slotChangeVarMax();
public:
Optimize_Sim *Comp;
@ -55,12 +62,15 @@ public:
QVBoxLayout *all;
QLineEdit *NameEdit, *VarNameEdit,
*VarInitEdit, *VarMinEdit, *VarMaxEdit;
*VarInitEdit, *VarMinEdit, *VarMaxEdit,
*GoalNameEdit, *GoalNumEdit;
QCheckBox *VarActiveCheck;
QComboBox *GoalTypeCombo;
QListView *VarList, *GoalList;
QRegExp Expr;
QRegExpValidator *Validator;
QDoubleValidator *numVal;
};
#endif

19
qucs/diagrams/diagram.cpp
View File

@ -329,12 +329,9 @@ void Diagram::rectClip(int* &p)
p++;
*(p-5) = STROKEEND;
}
if(code1 & code2) { // line not visible at all ?
*(p-4) = x_2;
*(p-3) = y_2;
p -= 2;
return;
}
if(code1 & code2) // line not visible at all ?
goto endWithHidden;
if(code2 != 0) {
*p = STROKEEND;
*(p+1) = x_2;
@ -349,7 +346,7 @@ void Diagram::rectClip(int* &p)
if(code1) code = code1;
else code = code2;
dx = x_2 - x_1;
dx = x_2 - x_1; // dx and dy never equals zero !
dy = y_2 - y_1;
if(code & 1) {
y = y_1 - dy * x_1 / dx;
@ -378,6 +375,8 @@ void Diagram::rectClip(int* &p)
y_2 = y;
code2 = regionCode(x, y);
}
if(code1 & code2)
goto endWithHidden; // line not visible at all ?
}
*(p-4) = x_1;
@ -385,6 +384,12 @@ void Diagram::rectClip(int* &p)
*(p-2) = x_2;
*(p-1) = y_2;
p += z;
return;
endWithHidden:
*(p-4) = x_2;
*(p-3) = y_2;
p -= 2;
}
// ------------------------------------------------------------

66
qucs/dialogs/simmessage.cpp
View File

@ -121,17 +121,17 @@ bool SimMessage::startProcess()
}
Collect.clear(); // clear list for NodeSets, SPICE components etc.
ProgText->insert(tr("creating netlist... "));
NetlistFile.setName(QucsHomeDir.filePath("netlist.txt"));
if(!NetlistFile.open(IO_WriteOnly)) {
ErrText->insert(tr("ERROR: Cannot write netlist file!"));
FinishSimulation(-1);
return false;
}
Stream.setDevice(&NetlistFile);
if(!DocWidget->inherits("QTextEdit")) {
ProgText->insert(tr("creating netlist... "));
NetlistFile.setName(QucsHomeDir.filePath("netlist.txt"));
if(!NetlistFile.open(IO_WriteOnly)) {
ErrText->insert(tr("ERROR: Cannot write netlist file!"));
FinishSimulation(-1);
return false;
}
Stream.setDevice(&NetlistFile);
SimPorts =
((Schematic*)DocWidget)->prepareNetlist(Stream, Collect, ErrText);
if(SimPorts < -5) {
@ -294,11 +294,11 @@ void SimMessage::startSimulator()
#endif
if(DocWidget->inherits("QTextEdit")) {
if(copyFile(DocName, QucsHomeDir.filePath("netlist.txt")) < 0) {
ErrText->insert(tr("ERROR: Cannot copy \"%1\" !").arg(DocName));
FinishSimulation(-1);
return;
}
// Take VHDL file in memory as it could contain unsaved changes.
Stream << ((TextDoc*)DocWidget)->text();
NetlistFile.close();
ProgText->insert(tr("done.\n")); // of "creating netlist...
SimTime = ((TextDoc*)DocWidget)->SimTime;
#ifdef __MINGW32__
CommandLine << getShortPathName(QucsSettings.BinDir + QucsDigi)
@ -484,39 +484,3 @@ void SimMessage::slotDisplayButton()
emit displayDataPage(DocName, DataDisplay);
accept();
}
// ------------------------------------------------------------------------
int SimMessage::copyFile(const QString& SrcName, const QString& DestName)
{
char *Buffer = (char*)malloc(0x10000);
if(!Buffer) return -10; // should never happen
QFile origFile, destFile;
origFile.setName(SrcName);
destFile.setName(DestName);
if(!origFile.open(IO_ReadOnly)) {
free(Buffer);
return -1;
}
if(!destFile.open(IO_WriteOnly)) {
origFile.close();
free(Buffer);
return -2;
}
int Num;
do { // copy data
Num = origFile.readBlock(Buffer, 0x10000);
if(Num < 0) break;
Num = destFile.writeBlock(Buffer, Num);
if(Num < 0) break;
} while(Num == 0x10000);
origFile.close();
destFile.close();
free(Buffer);
if(Num < 0) return -3;
return 0;
}

3
qucs/dialogs/simmessage.h
View File

@ -32,7 +32,7 @@ class QProgressBar;
class SimMessage : public QDialog {
Q_OBJECT
Q_OBJECT
public:
SimMessage(QWidget*, QWidget *parent=0);
~SimMessage();
@ -68,7 +68,6 @@ private:
void FinishSimulation(int);
void nextSPICE();
void startSimulator();
int copyFile(const QString&, const QString&);
public:
QWidget *DocWidget;

6
qucs/qucs.cpp
View File

@ -2091,12 +2091,6 @@ void QucsApp::slotSymbolEdit()
changeSchematicSymbolMode(Doc);
Doc->becomeCurrent(true);
// This can only be true when switching to the symbol the first time.
if(Doc->UndoSymbol.isEmpty()) {
Doc->setChanged(false, true); // "not changed" state, but put on undo stack
Doc->UndoSymbol.current()->at(1) = 'i'; // state of being unchanged
}
Doc->viewport()->update();
view->drawn = false;
}

17
qucs/schematic.cpp
View File

@ -79,6 +79,7 @@ Schematic::Schematic(QucsApp *App_, const QString& Name_)
UndoSymbol.setAutoDelete(true);
// The 'i' means state for being unchanged.
UndoStack.append(new QString(" i\n</>\n</>\n</>\n</>\n"));
UndoSymbol.append(new QString(" i\n</>\n</>\n</>\n</>\n"));
QFileInfo Info(Name_);
if(App) {
@ -188,8 +189,10 @@ void Schematic::becomeCurrent(bool update)
Components = &SymbolComps;
// if no symbol yet exists -> create one
if(createSubcircuitSymbol())
if(createSubcircuitSymbol()) {
sizeOfAll(UsedX1, UsedY1, UsedX2, UsedY2);
setChanged(true, true);
}
ps = UndoSymbol.current();
if(ps != UndoSymbol.getFirst()) App->undo->setEnabled(true);
@ -368,7 +371,8 @@ void Schematic::drawContents(QPainter *p, int, int, int, int)
paintGrid(&Painter, contentsX(), contentsY(),
visibleWidth(), visibleHeight());
paintFrame(&Painter);
if(!symbolMode)
paintFrame(&Painter);
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
pc->paint(&Painter);
@ -496,7 +500,8 @@ void Schematic::print(QPrinter*, QPainter *Painter, bool printAll, bool fitToPag
p.init(Painter, PrintScale * float(metrics.logicalDpiX()) / 72.0,
-StartX, -StartY, -marginX, -marginY, PrintScale);
paintFrame(&p);
if(!symbolMode)
paintFrame(&p);
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
if(pc->isSelected || printAll) {
@ -1111,6 +1116,11 @@ bool Schematic::load()
if(!loadDocument()) return false;
lastSaved = QDateTime::currentDateTime();
UndoStack.clear();
UndoSymbol.clear();
symbolMode = true;
setChanged(false, true); // "not changed" state, but put on undo stack
UndoSymbol.current()->at(1) = 'i';
symbolMode = false;
setChanged(false, true); // "not changed" state, but put on undo stack
UndoStack.current()->at(1) = 'i'; // state of being unchanged
@ -1142,7 +1152,6 @@ int Schematic::save()
UndoStack.findRef(ps); // back to current
ps = UndoSymbol.current();
if(!ps) return result;
for(p = UndoSymbol.first(); p != 0; p = UndoSymbol.next())
p->at(1) = ' '; // state of being changed
ps->at(1) = 'i'; // state of being unchanged