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

Fix more warnings in components

Browse Source
This commit is contained in:
Vadim Kuznetsov 2022-02-24 00:13:12 +01:00
parent c6003e97af
commit 189802ab0d
20 changed files with 73 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qucs/components/component.cpp
View File

@ -91,14 +91,14 @@ int Component::textSize(int& _dx, int& _dy)
int tmp, count=0;
_dx = _dy = 0;
if(showName) {
_dx = metrics.width(Name);
_dx = metrics.boundingRect(Name).width();
_dy = metrics.height();
count++;
}
for(Property *pp = Props.first(); pp != 0; pp = Props.next())
if(pp->display) {
// get width of text
tmp = metrics.width(pp->Name+"="+pp->Value);
tmp = metrics.boundingRect(pp->Name+"="+pp->Value).width();
if(tmp > _dx) _dx = tmp;
_dy += metrics.height();
count++;
@ -170,7 +170,7 @@ int Component::getTextSelected(int x_, int y_, float Corr)
if(!pp) return -1;
// get width of text
w = metrics.width(pp->Name+"="+pp->Value);
w = metrics.boundingRect(pp->Name+"="+pp->Value).width();
if(x_ > w) return -1; // clicked past the property text end - selection invalid
return Props.at()+1; // number the property
}
@ -264,11 +264,11 @@ void Component::paint(ViewPainter *p)
// keep track of painter state
p->Painter->save();
QMatrix wm = p->Painter->worldMatrix();
QTransform wm = p->Painter->worldTransform();
// write all text
foreach(Text *pt, Texts) {
p->Painter->setWorldMatrix(
QMatrix(pt->mCos, -pt->mSin, pt->mSin, pt->mCos,
p->Painter->setWorldTransform(
QTransform(pt->mCos, -pt->mSin, pt->mSin, pt->mCos,
p->DX + float(cx+pt->x) * p->Scale,
p->DY + float(cy+pt->y) * p->Scale));
newFont.setPointSizeF(p->Scale * pt->Size);
@ -284,7 +284,7 @@ void Component::paint(ViewPainter *p)
Q_UNUSED(w);
}
}
p->Painter->setWorldMatrix(wm);
p->Painter->setWorldTransform(wm);
p->Painter->setWorldMatrixEnabled(false);
// restore painter state
@ -477,13 +477,13 @@ void Component::rotate()
QFontMetrics metrics(QucsSettings.font, 0); // get size of text
dx = dy = 0;
if(showName) {
dx = metrics.width(Name);
dx = metrics.boundingRect(Name).width();
dy = metrics.lineSpacing();
}
for(Property *pp = Props.first(); pp != 0; pp = Props.next())
if(pp->display) {
// get width of text
tmp = metrics.width(pp->Name+"="+pp->Value);
tmp = metrics.boundingRect(pp->Name+"="+pp->Value).width();
if(tmp > dx) dx = tmp;
dy += metrics.lineSpacing();
}
@ -610,11 +610,11 @@ void Component::mirrorY()
QFontMetrics metrics(QucsSettings.font, 0); // get size of text
int dx = 0;
if(showName)
dx = metrics.width(Name);
dx = metrics.boundingRect(Name).width();
for(Property *pp = Props.first(); pp != 0; pp = Props.next())
if(pp->display) {
// get width of text
tmp = metrics.width(pp->Name+"="+pp->Value);
tmp = metrics.boundingRect(pp->Name+"="+pp->Value).width();
if(tmp > dx) dx = tmp;
}
if((ty > y1) && (ty < y2)) tx = -tx-dx; // mirror text position

4
qucs/components/mutual2.cpp
View File

@ -56,9 +56,9 @@ Mutual2::Mutual2()
Lines.append(new qucs::Line(-10, 10,-30, 10,QPen(Qt::darkBlue,2)));
Lines.append(new qucs::Line(-10, 10,-10, 22,QPen(Qt::darkBlue,2)));
stmp = "1"; w = smallmetrics.width(stmp); // compute width to right-align
stmp = "1"; w = smallmetrics.boundingRect(stmp).width(); // compute width to right-align
Texts.append(new Text(-13-w,-61,stmp));
stmp = "2"; w = smallmetrics.width(stmp); // compute width to right-align
stmp = "2"; w = smallmetrics.boundingRect(stmp).width(); // compute width to right-align
Texts.append(new Text(-13-w, 18,stmp));
Texts.append(new Text( 13,-22,"3")); // left-aligned, no need to compute width

4
qucs/components/rfedd.cpp
View File

@ -158,7 +158,7 @@ void RFedd::createSymbol()
// component text name, centered
tmp = QObject::tr("RF");
w = smallmetrics.width(tmp);
w = smallmetrics.boundingRect(tmp).width();
Texts.append(new Text(-w/2, -fHeight/2, tmp)); // text centered in box
i = 0;
@ -168,7 +168,7 @@ void RFedd::createSymbol()
Lines.append(new qucs::Line(-30, y,-HALFWIDTH, y,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-30, y));
tmp = QString::number(i+1);
w = smallmetrics.width(tmp);
w = smallmetrics.boundingRect(tmp).width();
Texts.append(new Text(-25-w, y-fHeight-2, tmp)); // text right-aligned
i++;

4
qucs/components/rfedd2p.cpp
View File

@ -125,7 +125,7 @@ void RFedd2P::createSymbol()
// component text name
tmp = Props.at(0)->Value;
w = smallmetrics.width(tmp);
w = smallmetrics.boundingRect(tmp).width();
Texts.append(new Text(-w/2, -fHeight/2, tmp)); // text centered in the box
// add port numbers text
@ -134,7 +134,7 @@ void RFedd2P::createSymbol()
Lines.append(new qucs::Line(-30, y,-HALFWIDTH, y,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-30, y));
tmp = QString::number(i+1);
w = smallmetrics.width(tmp);
w = smallmetrics.boundingRect(tmp).width();
Texts.append(new Text(-25-w, y-fHeight-2, tmp)); // text right-aligned
i++;

4
qucs/components/sparamfile.cpp
View File

@ -163,7 +163,7 @@ void SParamFile::createSymbol()
Lines.append(new qucs::Line(-15, h, 15, h,QPen(Qt::darkBlue,2)));
Lines.append(new qucs::Line(-15, -h,-15, h,QPen(Qt::darkBlue,2)));
stmp = QObject::tr("file");
w = smallmetrics.width(stmp); // compute text size to center it
w = smallmetrics.boundingRect(stmp).width(); // compute text size to center it
Texts.append(new Text(-w/2, -fHeight/2, stmp));
int i=0, y = 15-h;
@ -172,7 +172,7 @@ void SParamFile::createSymbol()
Lines.append(new qucs::Line(-30, y,-15, y,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-30, y));
stmp = QString::number(i);
w = smallmetrics.width(stmp);
w = smallmetrics.boundingRect(stmp).width();
Texts.append(new Text(-25-w, y-fHeight-2, stmp)); // text right-aligned
if(i == Num) break; // if odd number of ports there will be one port less on the right side

13
qucs/components/spicedialog.cpp
View File

@ -350,11 +350,12 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
piping = false;
}
script = QucsSettings.BinDir + script;
QString spiceCommand;
QString spiceExe;
QStringList spiceArgs;
SpicePrep = new QProcess(this);
spiceCommand+=interpreter + " ";
spiceCommand+=script + " ";
spiceCommand+=FileInfo.filePath() + " ";
spiceExe=interpreter;
spiceArgs.append(script);
spiceArgs.append(FileInfo.filePath());
QFile PrepFile;
QFileInfo PrepInfo(QucsSettings.QucsWorkDir, s + ".pre");
@ -362,7 +363,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
if (!piping)
{
spiceCommand += PrepName + " ";
spiceArgs.append(PrepName);
connect(SpicePrep, SIGNAL(readyReadStandardOutput()), SLOT(slotSkipOut()));
connect(SpicePrep, SIGNAL(readyReadStandardError()), SLOT(slotGetPrepErr()));
}
@ -391,7 +392,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
}
prestream = new QTextStream(&PrepFile);
}
SpicePrep->start(spiceCommand);
SpicePrep->start(spiceExe, spiceArgs);
if ((SpicePrep->state() != QProcess::Starting) &&
(SpicePrep->state() != QProcess::Running))
{

4
qucs/components/verilogfile.cpp
View File

@ -131,7 +131,7 @@ void Verilog_File::createSymbol()
Lines.append(new qucs::Line(-HALFWIDTH, -h,-HALFWIDTH, h,QPen(Qt::darkBlue,2)));
tmp = QObject::tr("verilog");
int w = metrics.width(tmp);
int w = metrics.boundingRect(tmp).width();
Texts.append(new Text(w/-2, fHeight/-2, tmp));
@ -140,7 +140,7 @@ void Verilog_File::createSymbol()
Lines.append(new qucs::Line(-30, y,-HALFWIDTH, y,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-30, y));
tmp = PortNames.section(',', i, i);
w = metrics.width(tmp);
w = metrics.boundingRect(tmp).width();
Texts.append(new Text(-26-w, y-fHeight-2, tmp));
i++;

4
qucs/components/vhdlfile.cpp
View File

@ -143,7 +143,7 @@ void VHDL_File::createSymbol()
Lines.append(new qucs::Line(-HALFWIDTH, -h,-HALFWIDTH, h,QPen(Qt::darkBlue,2)));
tmp = QObject::tr("vhdl");
int w = metrics.width(tmp);
int w = metrics.boundingRect(tmp).width();
Texts.append(new Text(w/-2, fHeight/-2, tmp));
int y = 15-h, i = 0;
@ -154,7 +154,7 @@ void VHDL_File::createSymbol()
Ports.append(pp);
pp->Type = TypeNames.section(',', i, i);
tmp = PortNames.section(',', i, i);
w = metrics.width(tmp);
w = metrics.boundingRect(tmp).width();
Texts.append(new Text(-19-w, y-fHeight-2, tmp));
i++;

4
qucs/diagrams/curvediagram.cpp
View File

@ -167,7 +167,7 @@ if(xAxis.log) {
if((zD < 1.5*zDstep) || (z == 0) || (z == x2)) {
tmp = misc::StringNiceNum(zD);
if(xAxis.up < 0.0) tmp = '-'+tmp;
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
// center text horizontally under the x tick mark
Texts.append(new Text(z-(w>>1), -y1, tmp));
Lines.append(new qucs::Line(z, 5, z, -5, QPen(Qt::black,0))); // x tick marks
@ -195,7 +195,7 @@ else { // not logarithmical
while((z <= x2) && (z >= 0)) { // create all grid lines
if(fabs(GridNum) < 0.01*pow(10.0, Expo)) GridNum = 0.0;// make 0 really 0
tmp = misc::StringNiceNum(GridNum);
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
// center text horizontally under the x tick mark
Texts.append(new Text(z-(w>>1), -y1, tmp)); // Text(x, y, str, ...)
GridNum += GridStep;

34
qucs/diagrams/diagram.cpp
View File

@ -117,17 +117,17 @@ void Diagram::paintDiagram(ViewPainter *p)
p->Painter->save();
// write whole text (axis label inclusively)
QMatrix wm = p->Painter->worldMatrix();
QTransform wm = p->Painter->worldTransform();
foreach(Text *pt, Texts) {
p->Painter->setWorldMatrix(
QMatrix(pt->mCos, -pt->mSin, pt->mSin, pt->mCos,
p->Painter->setWorldTransform(
QTransform(pt->mCos, -pt->mSin, pt->mSin, pt->mCos,
p->DX + float(cx+pt->x) * p->Scale,
p->DY + float(cy-pt->y) * p->Scale));
p->Painter->setPen(pt->Color);
p->Painter->drawText(0, 0, pt->s);
}
p->Painter->setWorldMatrix(wm);
p->Painter->setWorldTransform(wm);
p->Painter->setWorldMatrixEnabled(false);
// restore painter state
@ -186,12 +186,12 @@ void Diagram::createAxisLabels()
if(!pD) continue;
y -= LineSpacing;
if(Name[0] != 'C') { // locus curve ?
w = metrics.width(pD->Var) >> 1;
w = metrics.boundingRect(pD->Var).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x-w, y, pD->Var, pg->Color, 12.0));
}
else {
w = metrics.width("real("+pg->Var+")") >> 1;
w = metrics.boundingRect("real("+pg->Var+")").width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x-w, y, "real("+pg->Var+")",
pg->Color, 12.0));
@ -201,7 +201,7 @@ void Diagram::createAxisLabels()
else {
y -= LineSpacing;
encode_String(xAxis.Label, Str);
w = metrics.width(Str) >> 1;
w = metrics.boundingRect(Str).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x-w, y, Str, Qt::black, 12.0));
}
@ -221,19 +221,19 @@ void Diagram::createAxisLabels()
if(pg->yAxisNo != 0) continue;
if(pg->cPointsY) {
if(Name[0] != 'C') { // location curve ?
w = metrics.width(pg->Var) >> 1;
w = metrics.boundingRect(pg->Var).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y-w, pg->Var, pg->Color, 12.0, 0.0, 1.0));
}
else {
w = metrics.width("imag("+pg->Var+")") >> 1;
w = metrics.boundingRect("imag("+pg->Var+")").width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y-w, "imag("+pg->Var+")",
pg->Color, 12.0, 0.0, 1.0));
}
}
else { // if no data => <invalid>
w = metrics.width(pg->Var+INVALID_STR) >> 1;
w = metrics.boundingRect(pg->Var+INVALID_STR).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y-w, pg->Var+INVALID_STR,
pg->Color, 12.0, 0.0, 1.0));
@ -243,7 +243,7 @@ void Diagram::createAxisLabels()
}
else {
encode_String(yAxis.Label, Str);
w = metrics.width(Str) >> 1;
w = metrics.boundingRect(Str).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y-w, Str, Qt::black, 12.0, 0.0, 1.0));
x -= LineSpacing;
@ -259,20 +259,20 @@ void Diagram::createAxisLabels()
if(pg->yAxisNo != 1) continue;
if(pg->cPointsY) {
if(Name[0] != 'C') { // location curve ?
w = metrics.width(pg->Var) >> 1;
w = metrics.boundingRect(pg->Var).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y+w, pg->Var,
pg->Color, 12.0, 0.0, -1.0));
}
else {
w = metrics.width("imag("+pg->Var+")") >> 1;
w = metrics.boundingRect("imag("+pg->Var+")").width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y+w, "imag("+pg->Var+")",
pg->Color, 12.0, 0.0, -1.0));
}
}
else { // if no data => <invalid>
w = metrics.width(pg->Var+INVALID_STR) >> 1;
w = metrics.boundingRect(pg->Var+INVALID_STR).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y+w, pg->Var+INVALID_STR,
pg->Color, 12.0, 0.0, -1.0));
@ -282,7 +282,7 @@ void Diagram::createAxisLabels()
}
else {
encode_String(zAxis.Label, Str);
w = metrics.width(Str) >> 1;
w = metrics.boundingRect(Str).width() >> 1;
if(w > wmax) wmax = w;
Texts.append(new Text(x, y+w, Str, Qt::black, 12.0, 0.0, -1.0));
}
@ -1923,7 +1923,7 @@ if(Axis->log) {
tmp = misc::StringNiceNum(zD);
if(Axis->up < 0.0) tmp = '-'+tmp;
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
if(maxWidth < w) maxWidth = w;
if(x0 > 0)
Texts.append(new Text(x0+7, z-6, tmp)); // text aligned left
@ -1957,7 +1957,7 @@ else { // not logarithmical
if(fabs(GridNum) < 0.01*pow(10.0, Expo)) GridNum = 0.0;// make 0 really 0
tmp = misc::StringNiceNum(GridNum);
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
if(maxWidth < w) maxWidth = w;
if(x0 > 0)
Texts.append(new Text(x0+8, z-6, tmp)); // text aligned left

6
qucs/diagrams/marker.cpp
View File

@ -355,8 +355,8 @@ void Marker::paint(ViewPainter *p, int x0, int y0)
// Workaround for bug in Qt: If WorldMatrix is turned off, \n in the
// text creates a terrible mess.
p->Painter->setWorldMatrixEnabled(true);
QMatrix wm = p->Painter->worldMatrix();
p->Painter->setWorldMatrix(QMatrix());
QTransform wm = p->Painter->worldTransform();
p->Painter->setWorldTransform(QTransform());
int x2_, y2_;
p->Painter->setPen(QPen(Qt::black,1));
@ -367,7 +367,7 @@ void Marker::paint(ViewPainter *p, int x0, int y0)
p->eraseRect(x0+x1, y0+y1, x2_, y2_);
p->drawText(Text, x0+x1+3, y0+y1+3);
}
p->Painter->setWorldMatrix(wm);
p->Painter->setWorldTransform(wm);
p->Painter->setWorldMatrixEnabled(false);
// restore painter state

8
qucs/diagrams/rect3ddiagram.cpp
View File

@ -699,7 +699,7 @@ int Rect3DDiagram::calcAxis(Axis *Axis, int x, int y,
tmp = misc::StringNiceNum(yD);
if(Axis->up < 0.0) tmp = '-'+tmp;
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
if(maxWidth < w) maxWidth = w;
xLen = int(ystepD * cos(phi) + 0.5) + x;
@ -735,7 +735,7 @@ int Rect3DDiagram::calcAxis(Axis *Axis, int x, int y,
if(fabs(GridNum) < 0.01*pow(10.0, Expo)) GridNum = 0.0; // make 0 really 0
tmp = misc::StringNiceNum(GridNum);
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
if(maxWidth < w) maxWidth = w;
// if(Qt::DockRight)
Texts.append(new Text(x+3+gx, y-6+gy, tmp)); // place text right
@ -804,7 +804,7 @@ void Rect3DDiagram::createAxis(Axis *Axis, bool Right,
}
x += int(double(metrics.lineSpacing())*sin_phi);
y -= int(double(metrics.lineSpacing())*cos_phi);
w = metrics.width(s);
w = metrics.boundingRect(s).width();
Texts.append(new Text(x+int(double((z-w)>>1)*cos_phi),
y+int(double((z-w)>>1)*sin_phi),
s, pg->Color, 12.0, cos_phi, sin_phi));
@ -813,7 +813,7 @@ void Rect3DDiagram::createAxis(Axis *Axis, bool Right,
else {
x += int(double(metrics.lineSpacing())*sin_phi);
y -= int(double(metrics.lineSpacing())*cos_phi);
w = metrics.width(Axis->Label);
w = metrics.boundingRect(Axis->Label).width();
Texts.append(new Text(x+int(double((z-w)>>1)*cos_phi),
y+int(double((z-w)>>1)*sin_phi),
Axis->Label, Qt::black, 12.0, cos_phi, sin_phi));

4
qucs/diagrams/rectdiagram.cpp
View File

@ -176,7 +176,7 @@ if(xAxis.log) {
if((zD < 1.5*zDstep) || (z == 0) || (z == x2)) {
tmp = misc::StringNiceNum(zD);
if(xAxis.up < 0.0) tmp = '-'+tmp;
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
// center text horizontally under the x tick mark
Texts.append(new Text(z-(w>>1), -y1, tmp));
Lines.append(new qucs::Line(z, 5, z, -5, QPen(Qt::black,0))); // x tick marks
@ -204,7 +204,7 @@ else { // not logarithmical
while((z <= x2) && (z >= 0)) { // create all grid lines
if(fabs(GridNum) < 0.01*pow(10.0, Expo)) GridNum = 0.0;// make 0 really 0
tmp = misc::StringNiceNum(GridNum);
w = metrics.width(tmp); // width of text
w = metrics.boundingRect(tmp).width(); // width of text
// center text horizontally under the x tick mark
Texts.append(new Text(z-(w>>1), -y1, tmp)); // Text(x, y, str, ...)
GridNum += GridStep;

4
qucs/diagrams/timingdiagram.cpp
View File

@ -200,7 +200,7 @@ int TimingDiagram::calcDiagram()
colWidth = z;
}
}
int TimeStepWidth = colWidth * metrics.width("X") + 8;
int TimeStepWidth = colWidth * metrics.boundingRect("X").width() + 8;
if(TimeStepWidth < 40)
TimeStepWidth = 40;
@ -259,7 +259,7 @@ if(!firstGraph->isEmpty()) {
z = pD->count - z;
for( ; z>0; z--) {
Str = misc::num2str(*(px++));
colWidth = metrics.width(Str); // width of text
colWidth = metrics.boundingRect(Str).width(); // width of text
if(x+colWidth+2 >= x2) break;
Texts.append(new Text( x, y2-2, Str));

6
qucs/diagrams/truthdiagram.cpp
View File

@ -120,8 +120,8 @@ int TruthDiagram::calcDiagram()
colWidth = 0;
Texts.append(new Text(x-4, y2-2, Str)); // independent variable
if(NumAll != 0) {
z = metrics.width("1");
colWidth = metrics.width("0");
z = metrics.boundingRect("1").width();
colWidth = metrics.boundingRect("0").width();
if(z > colWidth) colWidth = z;
colWidth += 2;
counting = int(log(double(NumAll)) / log(2.0) + 0.9999); // number of bits
@ -188,7 +188,7 @@ int TruthDiagram::calcDiagram()
py = (char*)g->cPointsY;
counting = strlen((char*)py); // count number of "bits"
digitWidth = metrics.width("X") + 2;
digitWidth = metrics.boundingRect("X").width() + 2;
if((x+digitWidth*counting) >= x2) { // enough space for "bit vector" ?
checkColumnWidth("0", metrics, 0, x2, y);
goto funcEnd;

6
qucs/extsimkernels/codemodelgen.cpp
View File

@ -459,7 +459,7 @@ bool CodeModelGen::executeGinacCmd(QString &cmd, QString &result)
} else return false;
ginac.setStandardInputFile(ginac_task.fileName());
ginac.start("ginsh");
ginac.start("ginsh",QStringList());
ginac.waitForFinished();
result = ginac.readAllStandardOutput();
result.chop(1); // remove newline char
@ -620,8 +620,8 @@ void CodeModelGen::scanEquations(Schematic *sch,QStringList &pars,
} else {
int Nv = init_pars.count(); // Reverse init parameters list before exit
for(int i = 0; i < (Nv/2); i++) {
init_pars.swap(i,Nv-(1+i));
InitEqns.swap(i,Nv-(1+i));
init_pars.swapItemsAt(i,Nv-(1+i));
InitEqns.swapItemsAt(i,Nv-(1+i));
}
return;
}

6
qucs/main.cpp
View File

@ -116,8 +116,8 @@ bool loadSettings()
//if(settings.contains("BinDir"))QucsSettings.BinDir = settings.value("BinDir").toString();
//if(settings.contains("LangDir"))QucsSettings.LangDir = settings.value("LangDir").toString();
//if(settings.contains("LibDir"))QucsSettings.LibDir = settings.value("LibDir").toString();
if(settings.contains("AdmsXmlBinDir"))QucsSettings.AdmsXmlBinDir = settings.value("AdmsXmlBinDir").toString();
if(settings.contains("AscoBinDir"))QucsSettings.AscoBinDir = settings.value("AscoBinDir").toString();
if(settings.contains("AdmsXmlBinDir"))QucsSettings.AdmsXmlBinDir.setPath(settings.value("AdmsXmlBinDir").toString());
if(settings.contains("AscoBinDir"))QucsSettings.AscoBinDir.setPath(settings.value("AscoBinDir").toString());
//if(settings.contains("OctaveDir"))QucsSettings.OctaveDir = settings.value("OctaveDir").toString();
//if(settings.contains("ExamplesDir"))QucsSettings.ExamplesDir = settings.value("ExamplesDir").toString();
//if(settings.contains("DocDir"))QucsSettings.DocDir = settings.value("DocDir").toString();
@ -581,7 +581,7 @@ void createIcons() {
image.fill(Qt::transparent);
QPainter painter(&image);
QPainter::RenderHints hints = 0;
QPainter::RenderHints hints = QPainter::RenderHints();
// Ask to antialias drawings if requested
if (QucsSettings.GraphAntiAliasing) hints |= QPainter::Antialiasing;
// Ask to antialias text if requested

2
qucs/spicecomponents/spicegeneric.cpp
View File

@ -99,7 +99,7 @@ void SpiceGeneric::createSymbol()
Lines.append(new qucs::Line(-40, y,-HALFWIDTH, y,QPen(Qt::darkBlue,2)));
Ports.append(new Port(-40, y));
tmp = QString::number(i+1);
w = smallmetrics.width(tmp);
w = smallmetrics.boundingRect(tmp).width();
Texts.append(new Text(-40-w, y-fHeight-2, tmp)); // text right-aligned
i++;

2
qucs/textdoc.cpp
View File

@ -256,7 +256,7 @@ void TextDoc::becomeCurrent (bool)
bool TextDoc::baseSearch(const QString &str, bool CaseSensitive, bool wordOnly, bool backward)
{
QTextDocument::FindFlags flag = 0;
QTextDocument::FindFlags flag = QTextDocument::FindFlags();
bool finded;
if (CaseSensitive) {

4
qucs/viewpainter.cpp
View File

@ -58,7 +58,7 @@ void ViewPainter::init(QPainter *p, float Scale_, int DX_, int DY_,
LineSpacing = p->fontMetrics().lineSpacing();
p-> setMatrixEnabled(false); // we use our own coordinate transformation
QPainter::RenderHints hints = 0;
QPainter::RenderHints hints = QPainter::RenderHints();
// Ask to to antialias drawings if requested
if (QucsSettings.GraphAntiAliasing) hints |= QPainter::Antialiasing;
// Ask to antialias text if requested
@ -289,7 +289,7 @@ void ViewPainter::drawRoundRect(int x1i, int y1i, int dxi, int dyi)
dx = float(dxi)*Scale;
dy = float(dyi)*Scale;
Painter->drawRoundRect(QRectF(x1, y1, dx, dy));
Painter->drawRoundedRect(QRectF(x1, y1, dx, dy),4,4);
}
// -------------------------------------------------------------