caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui/traces: highlight traces and markers name in xyplot

Browse Source 
When a trace is added to any plot it will appear as a label
within a rounded colored box. The same applies for any marker
added highlighting only marker number.
This commit is contained in:
Kiara Navarro 2021-10-19 20:32:30 -03:00
parent ea8693566f
commit 39c8a1f3a7
No known key found for this signature in database
GPG Key ID: CDEFDCA3F6E04955
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Software/PC_Application/Traces/traceplot.cpp
View File

@ -2,6 +2,7 @@
#include "Marker/marker.h" #include "Marker/marker.h"
#include "preferences.h" #include "preferences.h"
#include <QPainter> #include <QPainter>
#include <QPainterPath>
#include <QMimeData> #include <QMimeData>
#include <QDebug> #include <QDebug>
#include "unit.h" #include "unit.h"
@ -153,18 +154,32 @@ void TracePlot::paintEvent(QPaintEvent *event)
bool hasMarkerData = false; bool hasMarkerData = false;
int x = 1; // xcoordinate for the next trace name int x = 1; // xcoordinate for the next trace name
int y = marginTop; // ycoordinate for the next marker data int y = marginTop; // ycoordinate for the next marker data
auto areaTextTop = 5;
auto labelMarginRight = 4;
auto borderRadius = 5;
for(auto t : traces) { for(auto t : traces) {
if(!t.second || !t.first->isVisible()) { if(!t.second || !t.first->isVisible()) {
continue; continue;
} }
auto textArea = QRect(x, 0, width() - x, marginTop);
QRect usedArea; auto textArea = QRect(x, areaTextTop, width() - x, marginTop);
QFont font = p.font(); QFont font = p.font();
font.setPixelSize(12); font.setPixelSize(12);
p.setFont(font); p.setFont(font);
p.setPen(t.first->color()); p.setPen(t.first->color());
p.drawText(textArea, 0, t.first->name() + " ", &usedArea);
x += usedArea.width(); auto space = " ";
auto label = space + t.first->name() + space;
QRectF usedLabelArea = p.boundingRect(textArea, 0, label);
QPainterPath path;
path.addRoundedRect(usedLabelArea, borderRadius, borderRadius);
p.fillPath(path, t.first->color());
p.drawPath(path);
p.setPen(QColor(Qt::white));
p.drawText(textArea, 0, label);
p.setPen(t.first->color());
x += usedLabelArea.width()+labelMarginRight;
auto tmarkers = t.first->getMarkers(); auto tmarkers = t.first->getMarkers();
@ -181,17 +196,29 @@ void TracePlot::paintEvent(QPaintEvent *event)
} }
hasMarkerData = true; hasMarkerData = true;
auto space = " ";
auto textArea = QRect(width() - marginRight - marginMarkerData, y, width() - marginRight, y + 100); auto textArea = QRect(width() - marginRight - marginMarkerData, y, width() - marginRight, y + 100);
p.drawText(textArea, 0, "Marker "+QString::number(m->getNumber())+m->getSuffix()+": "+m->readablePosition(), &usedArea); auto description = m->getSuffix() + space + m->readablePosition();
y += usedArea.height(); auto label = space + QString::number(m->getNumber()) + space;
QRectF textAreaConsumed = p.boundingRect(textArea, 0, label);
QPainterPath pathM;
pathM.addRoundedRect(textAreaConsumed, borderRadius, borderRadius);
p.fillPath(pathM, t.first->color());
p.drawPath(pathM);
p.setPen(QColor(Qt::white));
p.drawText(textArea, 0, label);
p.setPen(t.first->color());
p.drawText(textAreaConsumed.x()+textAreaConsumed.width(), textAreaConsumed.y(), textArea.width(), textArea.height(), 0, description);
y += textAreaConsumed.height();
for(auto f : m->getGraphDisplayFormats()) { for(auto f : m->getGraphDisplayFormats()) {
auto textArea = QRect(width() - marginRight - marginMarkerData, y, width() - marginRight, y + 100); auto textArea = QRect(width() - marginRight - marginMarkerData, y, width() - marginRight, y + 100);
p.drawText(textArea, 0, m->readableData(f), &usedArea); p.drawText(textArea, 0, m->readableData(f), &textAreaConsumed);
y += usedArea.height(); y += textAreaConsumed.height();
} }
// leave one row empty between markers // leave one row empty between markers
y += usedArea.height(); y += textAreaConsumed.height();
} }
} }