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 #1121

Browse Source
This commit is contained in:
dsm 2024-12-11 18:53:56 +03:00
parent 0fe4bc40c9
commit 8a9c64004f
3 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qucs/misc.cpp
View File

@ -856,3 +856,22 @@ void misc::draw_resize_handle(QPainter* painter, const QPointF& center) {
painter->drawRect(resize_handle);
painter->restore();
}
QString misc::formatValue(const QString& input, int precision) {
QRegularExpression regex(R"(([+-]?\d*\.?\d+)([a-zA-Z%]+)?)");
QRegularExpressionMatch match = regex.match(input);
if (match.hasMatch()) {
QString numberPart = match.captured(1);
QString unitPart = match.captured(2);
double value = numberPart.toDouble();
QString formattedNumber = QString::number(value, 'f', precision);
formattedNumber = formattedNumber.remove(QRegularExpression(R"(0+$)"));
formattedNumber = formattedNumber.remove(QRegularExpression(R"(\.$)"));
return formattedNumber + unitPart;
}
return input;
}

2
qucs/misc.h
View File

@ -97,6 +97,8 @@ namespace misc {
void draw_resize_handle(QPainter* painter, const QPointF& center);
void getSymbolPatternsList(QStringList &symbols);
QString formatValue(const QString& input, int precision);
}
/*! handle the application version string

44
qucs/schematic.cpp
View File

@ -44,6 +44,7 @@
#include <QUrl>
#include <QWheelEvent>
#include <qt3_compat/qt_compat.h>
#include <QRegularExpression>
#include "components/vafile.h"
#include "components/verilogfile.h"
@ -516,30 +517,47 @@ void Schematic::drawElements(QPainter* painter) {
void Schematic::drawDcBiasPoints(QPainter* painter) {
painter->save();
int x, y, z;
const int xOffset = 10;
const int yOffset = 10;
for (auto* pn : *a_Nodes) {
if (pn->Name.isEmpty())
continue;
QString value = misc::formatValue(pn->Name, 4);
x = pn->cx;
y = pn->cy + 4;
z = pn->x1;
if (z & 1)
x -= painter->fontMetrics().boundingRect(pn->Name).width();
if (!(z & 2)) {
y -= (painter->fontMetrics().lineSpacing() >> 1) + 4;
if (z & 1)
x -= 4;
else
x += 4;
QRect textRect = painter->fontMetrics().boundingRect(value);
int rectWidth = textRect.width() + 6;
int rectHeight = textRect.height() + 4;
if (z & 0x10) {
x += xOffset;
y -= yOffset;
} else {
x -= xOffset;
y -= yOffset;
}
if (z & 0x10)
painter->setPen(Qt::darkGreen); // green for currents
else
painter->setPen(Qt::blue); // blue for voltages
painter->drawText(x, y, pn->Name);
int rectX = x - rectWidth / 2;
int rectY = y - rectHeight / 2;
painter->setBrush(QBrush(QColor(230,230,230)));
painter->setPen(Qt::NoPen);
painter->drawRoundedRect( QRectF(rectX, rectY, rectWidth, rectHeight),15,15,Qt::RelativeSize);
painter->setPen(z & 0x10 ? Qt::darkGreen : Qt::blue);
painter->drawText(x - textRect.width() / 2, y + textRect.height() / 4, value);
}
painter->restore();
}
void Schematic::drawPostPaintEvents(QPainter* painter) {
painter->save();
/*