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

Migrate drawing primitives coordinates from int to double

Browse Source
This commit is contained in:
Andrey Kalmykov 2024-06-04 09:14:59 +03:00
parent 638467f130
commit c9d147c7c4
6 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qucs/diagrams/diagram.cpp
View File

@ -111,12 +111,12 @@ void Diagram::paintDiagram(QPainter *painter) {
for (qucs::Line* line : Lines) {
painter->setPen(line->penHint());
painter->drawLine(line->x1, - line->y1, line->x2, - line->y2);
painter->drawLine(QLineF{line->x1, - line->y1, line->x2, - line->y2});
}
for (qucs::Arc* arc : Arcs) {
painter->setPen(arc->penHint());
painter->drawArc(arc->x, - arc->y, arc->w, arc->h, arc->angle, arc->arclen);
painter->drawArc(QRectF{arc->x, - arc->y, arc->w, arc->h}, arc->angle, arc->arclen);
}
painter->scale(1.0, -1.0); // make Y-axis grow upwards

10
qucs/element.cpp
View File

@ -23,19 +23,19 @@
namespace qucs {
void Line::draw(QPainter* painter) const {
painter->drawLine(x1, y1, x2, y2);
painter->drawLine(QPointF{x1, y1}, QPointF{x2, y2});
}
void Arc::draw(QPainter* painter) const {
painter->drawArc(x, y, w, h, angle, arclen);
painter->drawArc(QRectF{x, y, w, h}, angle, arclen);
}
void Rect::draw(QPainter* painter) const {
painter->drawRect(x, y, w, h);
painter->drawRect(QRectF{x, y, w, h});
}
void Ellips::draw(QPainter* painter) const {
painter->drawEllipse(x, y, w, h);
painter->drawEllipse(QRectF{x, y, w, h});
}
} // namespace qucs
@ -44,7 +44,7 @@ void Text::draw(QPainter *painter) const {
draw(painter, nullptr);
}
void Text::draw(QPainter *painter, QRect* br) const {
void Text::draw(QPainter *painter, QRectF* br) const {
painter->save();
painter->translate(x, y);

27
qucs/element.h
View File

@ -54,29 +54,30 @@ public:
};
struct Line : DrawingPrimitive {
Line(int _x1, int _y1, int _x2, int _y2, QPen _style)
Line(double _x1, double _y1, double _x2, double _y2, QPen _style)
: x1(_x1), y1(_y1), x2(_x2), y2(_y2), style(_style) {};
int x1, y1, x2, y2;
double x1, y1, x2, y2;
QPen style;
void draw(QPainter* painter) const override;
QPen penHint() const override { return style; }
};
struct Arc : DrawingPrimitive {
Arc(int _x, int _y, int _w, int _h, int _angle, int _arclen, QPen _style)
Arc(double _x, double _y, double _w, double _h, int _angle, int _arclen, QPen _style)
: x(_x), y(_y), w(_w), h(_h), angle(_angle),
arclen(_arclen), style(_style) {};
int x, y, w, h, angle, arclen;
double x, y, w, h;
int angle, arclen;
QPen style;
void draw(QPainter* painter) const override;
QPen penHint() const override { return style; }
};
struct Rect : DrawingPrimitive {
Rect(int _x, int _y, int _w, int _h, QPen _Pen,
Rect(double _x, double _y, double _w, double _h, QPen _Pen,
QBrush _Brush = QBrush(Qt::NoBrush))
: x(_x), y(_y), w(_w), h(_h), Pen(_Pen), Brush(_Brush) {};
int x, y, w, h;
double x, y, w, h;
QPen Pen;
QBrush Brush; // filling style/color
void draw(QPainter* painter) const override;
@ -86,10 +87,10 @@ struct Rect : DrawingPrimitive {
// 'ellipse' conflicts 'ellipse' defined in paintings.h in the same namespace
struct Ellips : DrawingPrimitive {
Ellips(int _x, int _y, int _w, int _h, QPen _Pen,
Ellips(double _x, double _y, double _w, double _h, QPen _Pen,
QBrush _Brush = QBrush(Qt::NoBrush))
: x(_x), y(_y), w(_w), h(_h), Pen(_Pen), Brush(_Brush) {};
int x, y, w, h;
double x, y, w, h;
QPen Pen;
QBrush Brush; // filling style/color
void draw(QPainter* painter) const override;
@ -110,17 +111,17 @@ struct Port {
};
struct Text : qucs::DrawingPrimitive {
Text(int _x, int _y, const QString& _s, QColor _Color = QColor(0,0,0),
float _Size = 10.0, float _mCos=1.0, float _mSin=0.0)
Text(double _x, double _y, const QString& _s, QColor _Color = QColor(0,0,0),
double _Size = 10.0, double _mCos=1.0, double _mSin=0.0)
: x(_x), y(_y), s(_s), Color(_Color), Size(_Size),
mSin(_mSin), mCos(_mCos) { over = under = false; };
int x, y;
double x, y;
QString s;
QColor Color;
float Size, mSin, mCos; // font size and rotation coefficients
double Size, mSin, mCos; // font size and rotation coefficients
bool over, under; // text attributes
void draw(QPainter *painter) const override;
void draw(QPainter* painter, QRect* br) const;
void draw(QPainter* painter, QRectF* br) const;
QPen penHint() const override { return Color; }
double angle() const;
};

4
qucs/misc.cpp
View File

@ -788,8 +788,8 @@ QString VersionTriplet::toString() {
//
// The implementation is taken from ViewPainter::drawTextMapped and adapted
// to work with QPainter and as standalone function outside of class.
void misc::draw_richtext(QPainter* painter, int x, int y, const QString &text, QRect* br) {
QRect all_bounding_rect;
void misc::draw_richtext(QPainter* painter, int x, int y, const QString &text, QRectF* br) {
QRectF all_bounding_rect;
int current_text_x = x;
int current_text_y = y;
int i = 0;

2
qucs/misc.h
View File

@ -93,7 +93,7 @@ namespace misc {
bool simulatorExists(const QString &exe_file);
QString unwrapExePath(const QString &exe_file);
void draw_richtext(QPainter* painter, int x, int y, const QString& text, QRect* br = nullptr);
void draw_richtext(QPainter* painter, int x, int y, const QString& text, QRectF* br = nullptr);
void draw_resize_handle(QPainter* painter, const QPointF& center);
}

2
qucs/paintings/graphictext.cpp
View File

@ -53,7 +53,7 @@ void GraphicText::paint(QPainter* painter) {
f.setPixelSize(QFontInfo{Font}.pixelSize());
painter->setFont(f);
QRect br;
QRectF br;
misc::draw_richtext(painter, 0, 0, Text, &br);
if (isSelected) {