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-07-24 06:12:23 +00:00
parent e55760ca2d
commit b8acb4c45e
36 changed files with 192 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qucs/ChangeLog
View File

@ -8,6 +8,14 @@
* qucsdigi, qucsdigi.bat: Added -q argument to enable quiet
mode of the simulation binary.
2006-07-15 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* new import file format: ZVR ASCII format
* resize rectangles are scale-independent
* number of print copies
* label dialog rejects two "_" together
* several frame formats
2006-07-15 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* fixed bug at "zoom 1" on empty page

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 subcircuit.png
vhdlfile.png subcircuit.png optimize.png
# toolbar pictures
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \

4
qucs/components/Makefile.am
View File

@ -44,7 +44,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
logical_nor.cpp logical_and.cpp logical_nand.cpp logical_xor.cpp \
logical_xnor.cpp logical_inv.cpp digi_sim.cpp digi_source.cpp coupler.cpp \
rs_flipflop.cpp d_flipflop.cpp jk_flipflop.cpp coaxialline.cpp vprobe.cpp \
switch.cpp relais.cpp am_modulator.cpp pm_modulator.cpp
switch.cpp relais.cpp am_modulator.cpp pm_modulator.cpp opt_sim.cpp
nodist_libcomponents_a_SOURCES = $(MOCFILES)
@ -62,7 +62,7 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
noise_vv.h logical_or.h logical_nor.h logical_and.h logical_nand.h \
logical_xor.h logical_xnor.h logical_inv.h digi_sim.h digi_source.h \
coupler.h rs_flipflop.h d_flipflop.h jk_flipflop.h coaxialline.h vprobe.h \
switch.h relais.h am_modulator.h pm_modulator.h
switch.h relais.h am_modulator.h pm_modulator.h opt_sim.h
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs

2
qucs/components/capacitor.cpp
View File

@ -40,6 +40,8 @@ Capacitor::Capacitor()
Props.append(new Property("C", "1 pF", true,
QObject::tr("capacitance in Farad")));
Props.append(new Property("V", "", false,
QObject::tr("initial voltage for transient simulation (t=0)")));
}
Capacitor::~Capacitor()

1
qucs/components/component.cpp
View File

@ -1364,6 +1364,7 @@ Component* getComponentFromName(QString& Line)
else if(cstr == "HB") c = new HB_Sim();
else if(cstr == "SW") c = new Param_Sweep();
else if(cstr == "Digi") c = new Digi_Sim();
else if(cstr == "Opt") c = new Optimize_Sim();
break;
case '_' : if(cstr == "BJT") c = new BJT();
else if(cstr == "MOSFET") c = new MOSFET();

1
qucs/components/components.h
View File

@ -80,6 +80,7 @@
#include "tr_sim.h"
#include "sp_sim.h"
#include "hb_sim.h"
#include "opt_sim.h"
#include "param_sweep.h"
#include "iprobe.h"
#include "vprobe.h"

2
qucs/components/inductor.cpp
View File

@ -41,6 +41,8 @@ Inductor::Inductor()
Props.append(new Property("L", "1 nH", true,
QObject::tr("inductance in Henry")));
Props.append(new Property("I", "", false,
QObject::tr("initial current for transient simulation (t=0)")));
}
Inductor::~Inductor()

22
qucs/diagrams/diagram.cpp
View File

@ -641,18 +641,18 @@ bool Diagram::getSelected(int x_, int y_)
// ------------------------------------------------------------
// Checks if the resize area was clicked. If so return "true" and sets
// x1/y1 and x2/y2 to the border coordinates to draw a rectangle.
bool Diagram::ResizeTouched(int x, int y)
bool Diagram::ResizeTouched(int x, int y, int len)
{
if(x < cx-5) return false;
if(x > cx+x2+5) return false;
if(y < cy-y2-5) return false;
if(y > cy+5) return false;
if(x < cx-len) return false;
if(x > cx+x2+len) return false;
if(y < cy-y2-len) return false;
if(y > cy+len) return false;
State = 0;
if(x < cx+5) State = 1;
else if(x <= cx+x2-5) return false;
if(y > cy-5) State |= 2;
else if(y >= cy-y2+5) return false;
if(x < cx+len) State = 1;
else if(x <= cx+x2-len) return false;
if(y > cy-len) State |= 2;
else if(y >= cy-y2+len) return false;
return true;
}
@ -998,8 +998,8 @@ else { // of "if not digital"
*(pc++) = *(pPos++);
if(pEnd <= pc) {
counting = pc - (char*)g->cPointsY;
g->cPointsY = (double*)realloc(g->cPointsY, counting+1024);
pEnd = pc = (char*)g->cPointsY;
pc = (char*)realloc(g->cPointsY, counting+1024);
(char*)g->cPointsY = pEnd = pc;
pc += counting;
pEnd += counting+1020;
}

2
qucs/diagrams/diagram.h
View File

@ -70,7 +70,7 @@ public:
void paintScheme(QPainter*);
void Bounding(int&, int&, int&, int&);
bool getSelected(int, int);
bool ResizeTouched(int, int);
bool ResizeTouched(int, int, int);
QString save();
bool load(const QString&, QTextStream*);

11
qucs/dialogs/importdialog.cpp
View File

@ -79,10 +79,11 @@ void ImportDialog::slotBrowse()
{
QString s = QFileDialog::getOpenFileName(
lastDir.isEmpty() ? QString(".") : lastDir,
tr("All known")+" (*.s?p *.citi *.cit *.vcd);;"+
tr("Touchstone")+" (*.s?p);;"+
tr("CITI")+" (*.citi *.cit);;"+
tr("VCD")+" (*.vcd);;"+
tr("All known")+" (*.s?p *.citi *.cit *.asc *.vcd);;"+
tr("Touchstone files")+" (*.s?p);;"+
tr("CITI files")+" (*.citi *.cit);;"+
tr("ZVR ASCII files")+" (*.asc);;"+
tr("VCD files")+" (*.vcd);;"+
tr("Any File")+" (*)",
this, 0, tr("Enter a Data File Name"));
@ -119,6 +120,8 @@ void ImportDialog::slotImport()
CommandLine << "citi";
else if(Prefix == "vcd")
CommandLine << "vcd";
else if(Prefix == "asc")
CommandLine << "zvr";
else for(;;) {
if(Prefix.at(0) == 's')
if(Prefix.at(2) == 'p')

4
qucs/dialogs/labeldialog.cpp
View File

@ -33,7 +33,9 @@ LabelDialog::LabelDialog(WireLabel *pl, QWidget *parent)
pLabel = pl;
gbox = new QGridLayout(this,4,3,5,5);
Expr1.setPattern("[a-zA-Z][0-9a-zA-Z_]+"); // valid expression for LineEdit
// valid expression for LineEdit: alpha-numeric, but must start with
// letter and never two "_" together
Expr1.setPattern("[a-zA-Z]([0-9a-zA-Z]|_(?!_))+");
Validator1 = new QRegExpValidator(Expr1, this);
QLabel *Label1 = new QLabel(tr("Enter the label:"),this);

18
qucs/dialogs/settingsdialog.cpp
View File

@ -29,6 +29,7 @@
#include <qlineedit.h>
#include <qtextedit.h>
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qtabwidget.h>
#include <qvalidator.h>
#include <qpushbutton.h>
@ -89,8 +90,15 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
// ...........................................................
QWidget *Tab3 = new QWidget(t);
QGridLayout *gp3 = new QGridLayout(Tab3,5,2,5,5);
Check_showFrame = new QCheckBox(tr("show Frame"),Tab3);
gp3->addMultiCellWidget(Check_showFrame,0,0,0,1);
Combo_Frame = new QComboBox(Tab3);
Combo_Frame->insertItem(tr("no Frame"));
Combo_Frame->insertItem(tr("DIN A5 landscape"));
Combo_Frame->insertItem(tr("DIN A5 portrait"));
Combo_Frame->insertItem(tr("DIN A4 landscape"));
Combo_Frame->insertItem(tr("DIN A4 portrait"));
Combo_Frame->insertItem(tr("DIN A3 landscape"));
Combo_Frame->insertItem(tr("DIN A3 portrait"));
gp3->addMultiCellWidget(Combo_Frame,0,0,0,1);
Input_Frame0 = new QTextEdit(Tab3);
Input_Frame0->setTextFormat(Qt::PlainText);
@ -132,7 +140,7 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
Check_GridOn->setChecked(Doc->GridOn);
Input_GridX->setText(QString::number(Doc->GridX));
Input_GridY->setText(QString::number(Doc->GridY));
Check_showFrame->setChecked(Doc->showFrame);
Combo_Frame->setCurrentItem(Doc->showFrame);
Input_Frame0->setText(Doc->Frame_Text0);
Input_Frame1->setText(Doc->Frame_Text1);
Input_Frame2->setText(Doc->Frame_Text2);
@ -189,8 +197,8 @@ void SettingsDialog::slotApply()
changed = true;
}
if(Doc->showFrame != Check_showFrame->isChecked()) {
Doc->showFrame = Check_showFrame->isChecked();
if(Doc->showFrame != Combo_Frame->currentItem()) {
Doc->showFrame = Combo_Frame->currentItem();
changed = true;
}

4
qucs/dialogs/settingsdialog.h
View File

@ -24,6 +24,7 @@ class Schematic;
class QLineEdit;
class QTextEdit;
class QCheckBox;
class QComboBox;
class QVBoxLayout;
class QRegExpValidator;
@ -41,11 +42,12 @@ private slots:
public:
Schematic *Doc;
QComboBox *Combo_Frame;
QTextEdit *Input_Frame0;
QLineEdit *Input_Frame1, *Input_Frame2, *Input_Frame3;
QLineEdit *Input_DataSet, *Input_DataDisplay;
QLineEdit *Input_GridX, *Input_GridY;
QCheckBox *Check_OpenDpl, *Check_GridOn, *Check_showFrame;
QCheckBox *Check_OpenDpl, *Check_GridOn;
QVBoxLayout *all;
QRegExpValidator *valExpr;

3
qucs/main.cpp
View File

@ -472,7 +472,10 @@ int main(int argc, char *argv[])
tor.load( QString("qucs_") + lang, QucsSettings.LangDir);
a.installTranslator( &tor );
// This seems to be neccessary on a few system to make strtod()
// work properly !???!
setlocale (LC_NUMERIC, "C");
QucsMain = new QucsApp();
a.setMainWidget(QucsMain);
QucsMain->show();

6
qucs/paintings/arrow.cpp
View File

@ -208,14 +208,14 @@ QString Arrow::save()
// --------------------------------------------------------------------------
// Checks if the resize area was clicked.
bool Arrow::ResizeTouched(int x, int y)
bool Arrow::ResizeTouched(int x, int y, int len)
{
if(x < cx+5) if(x > cx-5) if(y < cy+5) if(y > cy-5) {
if(x < cx+len) if(x > cx-len) if(y < cy+len) if(y > cy-len) {
State = 1;
return true;
}
if(x < cx+x2+5) if(x > cx+x2-5) if(y < cy+y2+5) if(y > cy+y2-5) {
if(x < cx+x2+len) if(x > cx+x2-len) if(y < cy+y2+len) if(y > cy+y2-len) {
State = 2;
return true;
}

4
qucs/paintings/arrow.h
View File

@ -26,7 +26,7 @@
class Arrow : public Painting {
public:
Arrow();
~Arrow();
~Arrow();
void paint(ViewPainter*);
void paintScheme(QPainter*);
@ -41,7 +41,7 @@ public:
bool MousePressing();
bool getSelected(int, int);
void Bounding(int&, int&, int&, int&);
bool ResizeTouched(int, int);
bool ResizeTouched(int, int, int);
void MouseResizeMoving(int, int, QPainter*);
void rotate();

18
qucs/paintings/ellipse.cpp
View File

@ -180,19 +180,19 @@ QString Ellipse::save()
// --------------------------------------------------------------------------
// Checks if the resize area was clicked.
bool Ellipse::ResizeTouched(int x, int y)
bool Ellipse::ResizeTouched(int x, int y, int len)
{
State = -1;
if(x < cx-5) return false;
if(y < cy-5) return false;
if(x > cx+x2+5) return false;
if(y > cy+y2+5) return false;
if(x < cx-len) return false;
if(y < cy-len) return false;
if(x > cx+x2+len) return false;
if(y > cy+y2+len) return false;
State = 0;
if(x < cx+5) State = 1;
else if(x <= cx+x2-5) { State = -1; return false; }
if(y < cy+5) State |= 2;
else if(y <= cy+y2-5) { State = -1; return false; }
if(x < cx+len) State = 1;
else if(x <= cx+x2-len) { State = -1; return false; }
if(y < cy+len) State |= 2;
else if(y <= cy+y2-len) { State = -1; return false; }
return true;
}

4
qucs/paintings/ellipse.h
View File

@ -26,7 +26,7 @@
class Ellipse : public Painting {
public:
Ellipse(bool _filled=false);
~Ellipse();
~Ellipse();
void paintScheme(QPainter*);
void getCenter(int&, int&);
@ -42,7 +42,7 @@ public:
bool MousePressing();
bool getSelected(int, int);
void Bounding(int&, int&, int&, int&);
bool ResizeTouched(int, int);
bool ResizeTouched(int, int, int);
void MouseResizeMoving(int, int, QPainter*);
void rotate();

18
qucs/paintings/ellipsearc.cpp
View File

@ -156,19 +156,19 @@ QString EllipseArc::save()
// --------------------------------------------------------------------------
// Checks if the resize area was clicked.
bool EllipseArc::ResizeTouched(int x, int y)
bool EllipseArc::ResizeTouched(int x, int y, int len)
{
State = -1;
if(x < cx-5) return false;
if(y < cy-5) return false;
if(x > cx+x2+5) return false;
if(y > cy+y2+5) return false;
if(x < cx-len) return false;
if(y < cy-len) return false;
if(x > cx+x2+len) return false;
if(y > cy+y2+len) return false;
State = 0;
if(x < cx+5) State = 1;
else if(x <= cx+x2-5) { State = -1; return false; }
if(y < cy+5) State |= 2;
else if(y <= cy+y2-5) { State = -1; return false; }
if(x < cx+len) State = 1;
else if(x <= cx+x2-len) { State = -1; return false; }
if(y < cy+len) State |= 2;
else if(y <= cy+y2-len) { State = -1; return false; }
return true;
}

4
qucs/paintings/ellipsearc.h
View File

@ -26,7 +26,7 @@
class EllipseArc : public Painting {
public:
EllipseArc();
~EllipseArc();
~EllipseArc();
void paintScheme(QPainter*);
void getCenter(int&, int&);
@ -41,7 +41,7 @@ public:
bool MousePressing();
bool getSelected(int, int);
void Bounding(int&, int&, int&, int&);
bool ResizeTouched(int, int);
bool ResizeTouched(int, int, int);
void MouseResizeMoving(int, int, QPainter*);
void rotate();

6
qucs/paintings/graphicline.cpp
View File

@ -147,14 +147,14 @@ QString GraphicLine::save()
// --------------------------------------------------------------------------
// Checks if the resize area was clicked.
bool GraphicLine::ResizeTouched(int x, int y)
bool GraphicLine::ResizeTouched(int x, int y, int len)
{
if(x < cx+5) if(x > cx-5) if(y < cy+5) if(y > cy-5) {
if(x < cx+len) if(x > cx-len) if(y < cy+len) if(y > cy-len) {
State = 1;
return true;
}
if(x < cx+x2+5) if(x > cx+x2-5) if(y < cy+y2+5) if(y > cy+y2-5) {
if(x < cx+x2+len) if(x > cx+x2-len) if(y < cy+y2+len) if(y > cy+y2-len) {
State = 2;
return true;
}

6
qucs/paintings/graphicline.h
View File

@ -24,8 +24,8 @@
class GraphicLine : public Painting {
public:
GraphicLine(int cx_=0, int cy_=0, int x2_=0, int y2_=0,
QPen Pen_=QPen(QColor()));
~GraphicLine();
QPen Pen_=QPen(QColor()));
~GraphicLine();
void paintScheme(QPainter*);
void getCenter(int&, int&);
@ -40,7 +40,7 @@ public:
bool MousePressing();
bool getSelected(int, int);
void Bounding(int&, int&, int&, int&);
bool ResizeTouched(int, int);
bool ResizeTouched(int, int, int);
void MouseResizeMoving(int, int, QPainter*);
void rotate();

4
qucs/paintings/painting.h
View File

@ -37,10 +37,10 @@ public:
virtual QString save();
virtual void paint(ViewPainter*) {};
virtual void MouseMoving(QPainter*, int, int, int, int,
QPainter*, int, int, bool) {};
QPainter*, int, int, bool) {};
virtual bool MousePressing() { return false; };
virtual void Bounding(int&, int&, int&, int&) {};
virtual bool ResizeTouched(int, int) { return false; };
virtual bool ResizeTouched(int, int, int) { return false; };
virtual void MouseResizeMoving(int, int, QPainter*) {};
virtual void rotate() {};

18
qucs/paintings/rectangle.cpp
View File

@ -179,19 +179,19 @@ QString Rectangle::save()
// --------------------------------------------------------------------------
// Checks if the resize area was clicked.
bool Rectangle::ResizeTouched(int x, int y)
bool Rectangle::ResizeTouched(int x, int y, int len)
{
State = -1;
if(x < cx-5) return false;
if(y < cy-5) return false;
if(x > cx+x2+5) return false;
if(y > cy+y2+5) return false;
if(x < cx-len) return false;
if(y < cy-len) return false;
if(x > cx+x2+len) return false;
if(y > cy+y2+len) return false;
State = 0;
if(x < cx+5) State = 1;
else if(x <= cx+x2-5) { State = -1; return false; }
if(y < cy+5) State |= 2;
else if(y <= cy+y2-5) { State = -1; return false; }
if(x < cx+len) State = 1;
else if(x <= cx+x2-len) { State = -1; return false; }
if(y < cy+len) State |= 2;
else if(y <= cy+y2-len) { State = -1; return false; }
return true;
}

4
qucs/paintings/rectangle.h
View File

@ -26,7 +26,7 @@
class Rectangle : public Painting {
public:
Rectangle(bool _filled=false);
~Rectangle();
~Rectangle();
void paintScheme(QPainter*);
void getCenter(int&, int&);
@ -42,7 +42,7 @@ public:
bool MousePressing();
bool getSelected(int, int);
void Bounding(int&, int&, int&, int&);
bool ResizeTouched(int, int);
bool ResizeTouched(int, int, int);
void MouseResizeMoving(int, int, QPainter*);
void rotate();

26
qucs/qucs.cpp
View File

@ -333,7 +333,8 @@ pInfoFunc digitalComps[] =
pInfoFunc Simulations[] =
{&DC_Sim::info, &TR_Sim::info, &AC_Sim::info, &SP_Sim::info,
&HB_Sim::info, &Param_Sweep::info, &Digi_Sim::info, 0};
&HB_Sim::info, &Param_Sweep::info, &Digi_Sim::info, &Optimize_Sim::info,
0};
pInfoFunc FileComponents[] =
{&SpiceFile::info, &SParamFile::info1, &SParamFile::info2,
@ -1481,10 +1482,29 @@ void QucsApp::printCurrentDocument(bool fitToPage)
else
Printer->setOrientation(QPrinter::Landscape);
if(Printer->setup(this)) // printer dialog
getDoc()->print(Printer, Printer->printRange() == QPrinter::AllPages, fitToPage);
if(Printer->setup(this)) { // printer dialog
QPainter Painter(Printer);
if(!Painter.device()) // valid device available ?
goto Error;
for(int z=Printer->numCopies(); z>0 ; z--) {
if(Printer->aborted())
break;
getDoc()->print(Printer, &Painter,
Printer->printRange() == QPrinter::AllPages, fitToPage);
if(z > 1)
if(!Printer->newPage())
goto Error;
}
}
statusBar()->message(tr("Ready."));
return;
Error:
statusBar()->message(tr("Printer Error."));
}
// --------------------------------------------------------------

4
qucs/qucs.h
View File

@ -243,7 +243,8 @@ public:
*showMsg, *showNet, *alignTop, *alignBottom, *alignLeft, *alignRight,
*distrHor, *distrVert, *selectAll, *callLib, *callMatch, *changeProps,
*addToProj, *editFind, *editFindAgain, *insEntity, *selectMarker,
*createLib, *importData, *graph2csv, *createPkg, *extractPkg;
*createLib, *importData, *graph2csv, *createPkg, *extractPkg,
*callAtt;
public slots:
void slotEditRotate(bool); // rotate the selected items
@ -282,6 +283,7 @@ public slots:
void slotCallLine();
void slotCallLibrary();
void slotCallMatch();
void slotCallAtt();
void slotHelpIndex(); // shows a HTML docu: Help Index
void slotGettingStarted(); // shows a HTML docu: Getting started
void slotChangeProps();

17
qucs/qucs_actions.cpp
View File

@ -634,6 +634,23 @@ void QucsApp::slotCallMatch()
d->exec();
}
// ------------------------------------------------------------------------
// Is called to start the attenuator calculation program.
void QucsApp::slotCallAtt()
{
QProcess *QucsAtt =
new QProcess(QString(QucsSettings.BinDir + "qucsattenuator"));
if(!QucsAtt->start()) {
QMessageBox::critical(this, tr("Error"),
tr("Cannot start attenuator calculation program!"));
delete QucsAtt;
return;
}
// to kill it before qucs ends
connect(this, SIGNAL(signalKillEmAll()), QucsAtt, SLOT(kill()));
}
// --------------------------------------------------------------
void QucsApp::slotHelpIndex()
{

8
qucs/qucs_init.cpp
View File

@ -519,6 +519,13 @@ void QucsApp::initActions()
tr("Matching Circuit\n\nDialog for Creating Matching Circuit"));
connect(callMatch, SIGNAL(activated()), SLOT(slotCallMatch()));
callAtt = new QAction("Attenuator synthesis",
tr("Attenuator synthesis"), CTRL+Key_6, this);
callAtt->setStatusTip(tr("Starts QucsAttenuator"));
callAtt->setWhatsThis(
tr("Attenuator synthesis\n\nStarts attenuator calculation program"));
connect(callAtt, SIGNAL(activated()), SLOT(slotCallAtt()));
simulate = new QAction("Simulate",
QIconSet(QImage(QucsSettings.BitmapDir + "gear.png")),
tr("Simulate"), Key_F2, this);
@ -691,6 +698,7 @@ void QucsApp::initMenuBar()
callLine->addTo(toolMenu);
callLib->addTo(toolMenu);
callMatch->addTo(toolMenu);
callAtt->addTo(toolMenu);
simMenu = new QPopupMenu(); // menuBar entry simMenu
simulate->addTo(simMenu);

3
qucs/qucsdoc.h
View File

@ -23,6 +23,7 @@
class QucsApp;
class QPrinter;
class QPainter;
extern const char *smallsave_xpm[];// icon for unsaved files (diskette)
extern const char *empty_xpm[]; // provides same height than "smallsave_xpm"
@ -36,7 +37,7 @@ public:
virtual void setName(const QString&) {};
virtual bool load() { return true; };
virtual int save() { return 0; };
virtual void print(QPrinter*, bool, bool) {};
virtual void print(QPrinter*, QPainter*, bool, bool) {};
virtual void becomeCurrent(bool) {};
virtual float zoom(float) { return 1.0; };
virtual void showAll() {};

33
qucs/schematic.cpp
View File

@ -92,7 +92,7 @@ Schematic::Schematic(QucsApp *App_, const QString& Name_)
// calls indirectly "becomeCurrent"
App->DocumentTab->setCurrentPage(App->DocumentTab->indexOf(this));
showFrame = false;
showFrame = 0; // don't show
Frame_Text0 = tr("Title");
Frame_Text1 = tr("Drawn By:");
Frame_Text2 = tr("Date:");
@ -289,12 +289,19 @@ void Schematic::setChanged(bool c, bool fillStack, char Op)
// -----------------------------------------------------------
void Schematic::paintFrame(ViewPainter *p)
{
if(!showFrame) return;
p->Painter->setPen(QPen(QPen::black,0));
// dimensions: X cm / 2.54 * 144
int xall = 1530;
int yall = 1020;
int xall, yall;
switch(showFrame) {
case 1: xall = 1020; yall = 765; break; // DIN A5 landscape
case 2: xall = 765; yall = 1020; break; // DIN A5 portrait
case 3: xall = 1530; yall = 1020; break; // DIN A4 landscape
case 4: xall = 1020; yall = 1530; break; // DIN A4 portrait
case 5: xall = 2295; yall = 1530; break; // DIN A3 landscape
case 6: xall = 1530; yall = 2295; break; // DIN A3 portrait
default: return;
}
p->Painter->setPen(QPen(QPen::black,0));
int d = p->LineSpacing + int(4.0 * p->Scale);
int x1_, y1_, x2_, y2_;
p->map(xall, yall, x1_, y1_);
@ -456,13 +463,9 @@ void Schematic::contentsMouseDoubleClickEvent(QMouseEvent *Event)
}
// -----------------------------------------------------------
void Schematic::print(QPrinter *Printer, bool printAll, bool fitToPage)
void Schematic::print(QPrinter*, QPainter *Painter, bool printAll, bool fitToPage)
{
QPainter painter(Printer);
if(!painter.device()) // valid device available ?
return;
QPaintDeviceMetrics metrics(painter.device());
QPaintDeviceMetrics metrics(Painter->device());
float PrintScale = 0.5;
sizeOfAll(UsedX1, UsedY1, UsedX2, UsedY2);
int marginX = 40 * metrics.logicalDpiX() / 72;
@ -488,7 +491,9 @@ void Schematic::print(QPrinter *Printer, bool printAll, bool fitToPage)
if(UsedX1 > 0) StartX = 0;
if(UsedY1 > 0) StartY = 0;
}
p.init(&painter, PrintScale * float(metrics.logicalDpiX()) / 72.0,
QFont oldFont = Painter->font();
p.init(Painter, PrintScale * float(metrics.logicalDpiX()) / 72.0,
-StartX, -StartY, -marginX, -marginY, PrintScale);
paintFrame(&p);
@ -570,6 +575,8 @@ void Schematic::print(QPrinter *Printer, bool printAll, bool fitToPage)
pp->paint(&p); // paint all selected paintings
pp->isSelected = selected;
}
Painter->setFont(oldFont);
}
// -----------------------------------------------------------

4
qucs/schematic.h
View File

@ -44,7 +44,7 @@ public:
void setName(const QString&);
void setChanged(bool, bool fillStack=false, char Op='*');
void paintGrid(ViewPainter*, int, int, int, int);
void print(QPrinter*, bool, bool);
void print(QPrinter*, QPainter*, bool, bool);
float textCorr();
void sizeOfAll(int&, int&, int&, int&);
@ -92,7 +92,7 @@ public:
int ViewX1, ViewY1, ViewX2, ViewY2; // size of the document area
int UsedX1, UsedY1, UsedX2, UsedY2; // document area used by elements
bool showFrame;
int showFrame;
QString Frame_Text0, Frame_Text1, Frame_Text2, Frame_Text3;
// Two of those data sets are needed for Schematic and for symbol.

5
qucs/schematic_element.cpp
View File

@ -934,6 +934,7 @@ Element* Schematic::selectElement(int x, int y, bool flag, int *index)
}
Graph *pg;
n = int(5.0 / Scale); // size if area for resizing
// test all diagrams
for(Diagram *pd = Diagrams->last(); pd != 0; pd = Diagrams->prev()) {
@ -952,7 +953,7 @@ Element* Schematic::selectElement(int x, int y, bool flag, int *index)
// resize area clicked ?
if(pd->isSelected)
if(pd->ResizeTouched(x, y))
if(pd->ResizeTouched(x, y, n))
if(pe_1st == 0) {
pd->Type = isDiagramResize;
return pd;
@ -1000,7 +1001,7 @@ Element* Schematic::selectElement(int x, int y, bool flag, int *index)
// test all paintings
for(Painting *pp = Paintings->last(); pp != 0; pp = Paintings->prev()) {
if(pp->isSelected)
if(pp->ResizeTouched(x, y))
if(pp->ResizeTouched(x, y, n))
if(pe_1st == 0) {
pp->Type = isPaintingResize;
return pp;

3
qucs/schematic_file.cpp
View File

@ -298,8 +298,7 @@ bool Schematic::loadProperties(QTextStream *stream)
if(nstr.toInt(&ok) == 0) SimOpenDpl = false;
else SimOpenDpl = true;
else if(cstr == "showFrame")
if(nstr.at(0) == '1') showFrame = true;
else showFrame = false;
showFrame = nstr.at(0).latin1() - '0';
else if(cstr == "FrameText0") {
Frame_Text0 = nstr;
Frame_Text0.replace("\\n", "\n");

19
qucs/textdoc.cpp
View File

@ -162,24 +162,21 @@ int TextDoc::save()
}
// -----------------------------------------------------------
void TextDoc::print(QPrinter *Printer, bool printAll, bool)
void TextDoc::print(QPrinter *Printer, QPainter *Painter, bool printAll, bool)
{
QPainter p(Printer);
if(!p.device()) // valid device available ?
return;
p.setFont(QucsSettings.font);
Painter->setFont(QucsSettings.font);
sync(); // formatting whole text
QPaintDeviceMetrics metrics(p.device());
QPaintDeviceMetrics metrics(Painter->device());
int margin = 54; // margin at each side (unit is point)
int marginX = margin * metrics.logicalDpiX() / 72;
int marginY = margin * metrics.logicalDpiY() / 72;
QRect printArea(
marginX, marginY, metrics.width() - 2*marginX,
metrics.height() - 2*marginY - p.fontMetrics().lineSpacing());
metrics.height() - 2*marginY - Painter->fontMetrics().lineSpacing());
int linesPerPage = printArea.height() / p.fontMetrics().lineSpacing();
int linesPerPage = printArea.height() / Painter->fontMetrics().lineSpacing();
int PageCount, PageNo = 1;
QString s, printText;
@ -202,12 +199,12 @@ void TextDoc::print(QPrinter *Printer, bool printAll, bool)
for(;;) {
if(Printer->aborted())
break;
p.drawText(printArea, 0, printText.section('\n', 0, linesPerPage-1));
Painter->drawText(printArea, 0, printText.section('\n', 0, linesPerPage-1));
printText = printText.section('\n', linesPerPage);
s = tr("Page %1 of %2").arg(PageNo).arg(PageCount);
p.drawText(printArea.right() - p.fontMetrics().width(s),
printArea.bottom() + p.fontMetrics().lineSpacing(), s);
Painter->drawText(printArea.right() - Painter->fontMetrics().width(s),
printArea.bottom() + Painter->fontMetrics().lineSpacing(), s);
if(printText.isEmpty())
break;
Printer->newPage();

2
qucs/textdoc.h
View File

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