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

Merge pull request #66 from sophiekovalevsky/xyplot-markers

Browse Source 
gui/plotxy: fix hidden description in filter markers related
This commit is contained in:
jankae 2021-11-13 19:36:14 +01:00 committed by GitHub
commit e3ce765e64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,13 +165,12 @@ void TracePlot::paintEvent(QPaintEvent *event)
continue; continue;
} }
// Trace name
auto textArea = QRect(x, areaTextTop, width() - x, marginTop); 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());
auto space = " "; auto space = " ";
auto label = space + t.first->name() + space; auto label = space + t.first->name() + space;
QRectF usedLabelArea = p.boundingRect(textArea, 0, label); QRectF usedLabelArea = p.boundingRect(textArea, 0, label);
@ -185,9 +184,6 @@ void TracePlot::paintEvent(QPaintEvent *event)
x += usedLabelArea.width()+labelMarginRight; x += usedLabelArea.width()+labelMarginRight;
auto tmarkers = t.first->getMarkers(); auto tmarkers = t.first->getMarkers();
font.setPixelSize(12);
p.setFont(font);
for(auto m : tmarkers) { for(auto m : tmarkers) {
if(!xCoordinateVisible(m->getPosition())) { if(!xCoordinateVisible(m->getPosition())) {
// marker not visible with current plot settings // marker not visible with current plot settings
@ -199,9 +195,9 @@ void TracePlot::paintEvent(QPaintEvent *event)
} }
hasMarkerData = true; hasMarkerData = true;
// Rounded box
auto space = " "; auto space = " ";
auto textArea = QRect(width() - marginRight - marginMarkerData, y, width() - marginRight, y + 100); auto textArea = QRect(width() - marginRight - marginMarkerData, y, width() - marginRight, y + 100);
auto description = m->getSuffix() + space + m->readablePosition();
auto label = space + QString::number(m->getNumber()) + space; auto label = space + QString::number(m->getNumber()) + space;
QRectF textAreaConsumed = p.boundingRect(textArea, 0, label); QRectF textAreaConsumed = p.boundingRect(textArea, 0, label);
QPainterPath pathM; QPainterPath pathM;
@ -209,10 +205,14 @@ void TracePlot::paintEvent(QPaintEvent *event)
p.fillPath(pathM, t.first->color()); p.fillPath(pathM, t.first->color());
p.drawPath(pathM); p.drawPath(pathM);
// Over box
p.setPen(Util::getFontColorFromBackground(t.first->color())); p.setPen(Util::getFontColorFromBackground(t.first->color()));
p.drawText(textArea, 0, label); p.drawText(textArea, 0, label);
// Non-rounded description
auto description = m->getSuffix() + space + m->readablePosition();
p.setPen(t.first->color()); p.setPen(t.first->color());
p.drawText(textAreaConsumed.x()+textAreaConsumed.width(), textAreaConsumed.y(), textArea.width(), textArea.height(), 0, description); p.drawText(width() - marginRight - marginMarkerData + textAreaConsumed.width() + 5, textAreaConsumed.y(), width() - marginRight, textArea.height(), 0, description);
y += textAreaConsumed.height(); y += textAreaConsumed.height();
for(auto f : m->getGraphDisplayFormats()) { for(auto f : m->getGraphDisplayFormats()) {