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

More fixed in paintings

Browse Source
This commit is contained in:
Vadim Kuznetsov 2022-02-23 22:54:50 +01:00
parent 269315eac2
commit c6003e97af
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qucs/extsimkernels/abstractspicekernel.cpp
View File

@ -27,7 +27,10 @@
#include "main.h"
#include "../paintings/id_text.h"
#include "dialogs/sweepdialog.h"
#include <QPlainTextEdit>
#include <algorithm>
/*!
\file abstractspicekernel.cpp
@ -234,7 +237,7 @@ void AbstractSpiceKernel::createSubNetlsit(QTextStream &stream, bool lib)
pc->Ports.first()->Connection->Name));
}
}
qSort(ports);
std::sort(ports.begin(), ports.end());
QPair<int,QString> pp;
if (lib) header += " gnd "; // Ground node forwarding for Library
foreach(pp,ports) {

10
qucs/paintings/graphictext.cpp
View File

@ -51,10 +51,10 @@ void GraphicText::paint(ViewPainter *p)
// keep track of painter state
p->Painter->save();
QMatrix wm = p->Painter->worldMatrix();
QMatrix Mat(1.0, 0.0, 0.0, 1.0, p->DX + float(cx) * p->Scale,
p->DY + float(cy) * p->Scale);
p->Painter->setWorldMatrix(Mat);
QTransform wm = p->Painter->worldTransform();
QTransform Mat(1.0, 0.0, 0.0, 1.0, p->DX + qreal(cx) * p->Scale,
p->DY + qreal(cy) * p->Scale);
p->Painter->setWorldTransform(Mat);
p->Painter->rotate(-Angle); // automatically enables transformation
int Size = Font.pointSize();
@ -77,7 +77,7 @@ void GraphicText::paint(ViewPainter *p)
}
Font.setPointSize(Size); // restore real font size
p->Painter->setWorldMatrix(wm);
p->Painter->setWorldTransform(wm);
p->Painter->setWorldMatrixEnabled(false);
// restore painter state

2
qucs/paintings/id_text.cpp
View File

@ -62,7 +62,7 @@ void ID_Text::paint(ViewPainter *p)
if(isSelected) {
p->Painter->setPen(QPen(Qt::darkGray,3));
p->Painter->drawRoundRect(x-4, y-4, x2+8, y2+8);
p->Painter->drawRoundedRect(x-4, y-4, x2+8, y2+8, 4.0, 4.0);
}
x2 = int(float(x2) / p->Scale);

8
qucs/paintings/portsymbol.cpp
View File

@ -60,10 +60,10 @@ void PortSymbol::paint(ViewPainter *p)
x2 = Unit - x1;
y2 = r.height() + Unit;
QMatrix wm = p->Painter->worldMatrix();
QMatrix Mat(1.0, 0.0, 0.0, 1.0, p->DX + float(cx) * p->Scale,
QTransform wm = p->Painter->worldTransform();
QTransform Mat(1.0, 0.0, 0.0, 1.0, p->DX + float(cx) * p->Scale,
p->DY + float(cy) * p->Scale);
p->Painter->setWorldMatrix(Mat);
p->Painter->setWorldTransform(Mat);
int tmp, tx, ty;
tx = x1 + (Unit >> 1);
@ -91,7 +91,7 @@ void PortSymbol::paint(ViewPainter *p)
p->Painter->drawText(tx, ty, 0, 0, Qt::TextDontClip, nameStr);
p->Painter->setWorldMatrix(wm);
p->Painter->setWorldTransform(wm);
p->Painter->setWorldMatrixEnabled(false);
// restore painter state

2
qucs/qt3_compat/q3scrollview.cpp
View File

@ -1372,7 +1372,7 @@ void Q3ScrollView::addChild(QWidget* child, int x, int y)
setResizePolicy(Manual);
}
if (child->parentWidget() != viewport()) {
child->setParent(viewport(),0);
child->setParent(viewport(), Qt::WindowFlags());
child->move(QPoint(0,0));
child->hide();
// child->reparent(viewport(), 0, QPoint(0,0), false);