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 missing text in schematic after upgrading to Qt-6.8.0

Browse Source
This commit is contained in:
ivandi 2024-10-15 21:18:07 -04:00
parent aae2501748
commit f3a46cb77b
12 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs/components/component.cpp
View File

@ -252,7 +252,7 @@ void Component::paint(QPainter *p) {
QRect text_br{tx, ty, 0, 0};
if (showName) {
p->drawText(tx, ty, 0, 0, Qt::TextDontClip, Name, &text_br);
p->drawText(tx, ty, 1, 1, Qt::TextDontClip, Name, &text_br);
}
for (auto *prop : Props) {

2
qucs/components/simulation.cpp
View File

@ -119,7 +119,7 @@ void SimulationComponent::drawSymbol(QPainter *p)
p->setPen(pen());
p->setFont(label_font);
QRect label_bounds;
p->drawText(0, 0, 0, 0, Qt::TextDontClip, label_text, &label_bounds);
p->drawText(0, 0, 1, 1, Qt::TextDontClip, label_text, &label_bounds);
// Simulation component look like an isometric box
// or a brick, with a label on its top side, being

2
qucs/diagrams/marker.cpp
View File

@ -425,7 +425,7 @@ void Marker::paint(QPainter* painter) {
}
painter->setPen(QPen(Qt::black, 1));
painter->drawText(x1, y1, 0, 0, Qt::TextDontClip, Text);
painter->drawText(x1, y1, 1, 1, Qt::TextDontClip, Text);
painter->setPen(QPen(Qt::darkMagenta, 0));
painter->drawRect(text_box);

2
qucs/diagrams/tabdiagram.cpp
View File

@ -110,7 +110,7 @@ void TabDiagram::paintDiagram(QPainter *painter) {
painter->setPen(Qt::black);
for (Text *pt : Texts) {
painter->drawText(pt->x, -pt->y, 0, 0, Qt::TextDontClip, pt->s);
painter->drawText(pt->x, -pt->y, 1, 1, Qt::TextDontClip, pt->s);
}
if (isSelected) {

2
qucs/diagrams/timingdiagram.cpp
View File

@ -62,7 +62,7 @@ void TimingDiagram::paintDiagram(QPainter *painter) {
painter->setPen(Qt::black);
for (Text *pt : Texts) {
painter->drawText(pt->x, -pt->y, 0, 0, Qt::TextDontClip, pt->s);
painter->drawText(pt->x, -pt->y, 1, 1, Qt::TextDontClip, pt->s);
}
if (y1 > 0) { // paint scroll bar ?

2
qucs/element.cpp
View File

@ -100,7 +100,7 @@ double Text::angle() const {
// x and y are relative to component's x and y
void Property::paint(int x, int y, QPainter* p)
{
p->drawText(x, y, 0, 0, Qt::TextDontClip, Name + "=" + Value, &br);
p->drawText(x, y, 1, 1, Qt::TextDontClip, Name + "=" + Value, &br);
}
Element::Element()

4
qucs/misc.cpp
View File

@ -791,7 +791,7 @@ void misc::draw_richtext(QPainter* painter, int x, int y, const QString &text, Q
QRect fragment_br;
painter->drawText(
current_text_x, current_text_y + (is_sub ? subscript_offset : superscript_offset),
0, 0,
1, 1,
Qt::TextDontClip,
text.mid(i, len ? len : 1),
&fragment_br);
@ -811,7 +811,7 @@ void misc::draw_richtext(QPainter* painter, int x, int y, const QString &text, Q
QRect fragment_br;
painter->drawText(
current_text_x, current_text_y, 0, 0,
current_text_x, current_text_y, 1, 1,
Qt::TextDontClip,
text.mid(i, len),
&fragment_br);

6
qucs/paintings/id_text.cpp
View File

@ -42,18 +42,18 @@ void ID_Text::paint(QPainter* painter) {
painter->setPen(QPen(Qt::black,1));
QRect r;
painter->drawText(QRect(0, 0, 0, 0), Qt::TextDontClip, Prefix, &r);
painter->drawText(QRect(0, 0, 1, 1), Qt::TextDontClip, Prefix, &r);
x2 = r.width();
y2 = r.height();
painter->drawText(QRect(0, y2, 0, 0), Qt::TextDontClip, "File=name", &r);
painter->drawText(QRect(0, y2, 1, 1), Qt::TextDontClip, "File=name", &r);
x2 = std::max(x2, r.width());
y2 += r.height();
QList<SubParameter *>::const_iterator it;
for(it = Parameter.constBegin(); it != Parameter.constEnd(); it++) {
if((*it)->display) {
painter->drawText(QRect(0, y2, 0, 0), Qt::TextDontClip, (*it)->Name, &r);
painter->drawText(QRect(0, y2, 1, 1), Qt::TextDontClip, (*it)->Name, &r);
x2 = std::max(x2, r.width());
y2 += r.height();
}

2
qucs/paintings/portsymbol.cpp
View File

@ -88,7 +88,7 @@ void PortSymbol::paint(QPainter *painter) {
}
painter->setPen(Qt::black);
painter->drawText(0, 0, 0, 0, Qt::TextDontClip, nameStr.isEmpty() ? numberStr : nameStr);
painter->drawText(0, 0, 1, 1, Qt::TextDontClip, nameStr.isEmpty() ? numberStr : nameStr);
}
painter->restore();

12
qucs/schematic.cpp
View File

@ -386,8 +386,8 @@ void Schematic::paintFrame(QPainter* painter) {
auto cn = QString::number(column_number);
auto tx = x - h_step / 2 + 5;
painter->drawText(tx, 3, 0, 0, Qt::TextDontClip, cn);
painter->drawText(tx, frame_height - frame_margin + 3, 0, 0, Qt::TextDontClip, cn);
painter->drawText(tx, 3, 1, 1, Qt::TextDontClip, cn);
painter->drawText(tx, frame_height - frame_margin + 3, 1, 1, Qt::TextDontClip, cn);
column_number++;
}
@ -421,15 +421,15 @@ void Schematic::paintFrame(QPainter* painter) {
const double z = 200.0;
y1_ -= painter->fontMetrics().lineSpacing() + d;
painter->drawLine(x1_, y1_, x2_, y1_);
painter->drawText(x1_ + d, y1_ + (d >> 1), 0, 0, Qt::TextDontClip, Frame_Text2);
painter->drawText(x1_ + d, y1_ + (d >> 1), 1, 1, Qt::TextDontClip, Frame_Text2);
painter->drawLine(x1_ + z, y1_, x1_ + z, y1_ + painter->fontMetrics().lineSpacing() + d);
painter->drawText(x1_ + d + z, y1_ + (d >> 1), 0, 0, Qt::TextDontClip, Frame_Text3);
painter->drawText(x1_ + d + z, y1_ + (d >> 1), 1, 1, Qt::TextDontClip, Frame_Text3);
y1_ -= painter->fontMetrics().lineSpacing() + d;
painter->drawLine(x1_, y1_, x2_, y1_);
painter->drawText(x1_ + d, y1_ + (d >> 1), 0, 0, Qt::TextDontClip, Frame_Text1);
painter->drawText(x1_ + d, y1_ + (d >> 1), 1, 1, Qt::TextDontClip, Frame_Text1);
y1_ -= (Frame_Text0.count('\n') + 1) * painter->fontMetrics().lineSpacing() + d;
painter->drawRect(x2_, y2_, x1_ - x2_ - 1, y1_ - y2_ - 1);
painter->drawText(x1_ + d, y1_ + (d >> 1), 0, 0, Qt::TextDontClip, Frame_Text0);
painter->drawText(x1_ + d, y1_ + (d >> 1), 1, 1, Qt::TextDontClip, Frame_Text0);
painter->restore();
}

8
qucs/symbolwidget.cpp
View File

@ -123,14 +123,14 @@ void SymbolWidget::mouseMoveEvent(QMouseEvent* event)
void SymbolWidget::paintEvent(QPaintEvent*)
{
QPainter Painter(this);
Painter.drawText(2, 2, 0, 0, Qt::AlignLeft | Qt::TextDontClip, PaintText);
Painter.drawText(2, 2, 1, 1, Qt::AlignLeft | Qt::TextDontClip, PaintText);
QFontMetrics metrics(QucsSettings.font, 0);
Painter.drawText(2, metrics.height(), 0, 0, Qt::AlignLeft | Qt::TextDontClip, Warning);
Painter.drawText(2, metrics.height(), 1, 1, Qt::AlignLeft | Qt::TextDontClip, Warning);
int dx = (x2-x1)/2 + TextWidth - DragNDropWidth/2;
if(dx < 2) dx = 2;
Painter.drawText(dx, y2-y1+2, 0, 0, Qt::AlignLeft | Qt::TextDontClip, DragNDropText);
Painter.drawText(dx, y2-y1+2, 1, 1, Qt::AlignLeft | Qt::TextDontClip, DragNDropText);
// paint all lines
for(int i=0; i<Lines.size(); i++) {
@ -171,7 +171,7 @@ void SymbolWidget::paintEvent(QPaintEvent*)
Font.setPointSizeF(pt->Size);
Painter.setFont(Font);
Painter.setPen(pt->Color);
Painter.drawText(cx+pt->x, cy+pt->y, 0, 0, Qt::TextDontClip, pt->s);
Painter.drawText(cx+pt->x, cy+pt->y, 1, 1, Qt::TextDontClip, pt->s);
}
}

2
qucs/wirelabel.cpp
View File

@ -116,7 +116,7 @@ void WireLabel::paint(QPainter *p) const {
});
QRect text_br;
p->drawText(x1, y1, 0, 0, Qt::TextDontClip, Name, &text_br);
p->drawText(x1, y1, 1, 1, Qt::TextDontClip, Name, &text_br);
bool right = text_br.right() < cx;
bool bottom = text_br.bottom() < cy;