jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-07 07:23:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Marker improvements: linked marker groups

Browse source
This commit is contained in:
Jan Käberich 2021-06-19 15:33:43 +02:00
parent cf401fcb01
commit a232be3443
31 changed files with 755 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Software/PC_Application/Traces/traceplot.cpp
View file

@ -1,11 +1,11 @@
#include "traceplot.h"
#include "tracemarker.h"
#include "Marker/marker.h"
#include "preferences.h"
#include <QPainter>
#include <QMimeData>
#include <QDebug>
#include "unit.h"
#include "tracemarkermodel.h"
#include "Marker/markermodel.h"
std::set<TracePlot*> TracePlot::plots;
@ -229,12 +229,12 @@ void TracePlot::leaveEvent(QEvent *event)
selectedMarker = nullptr;
}
TraceMarker *TracePlot::markerAtPosition(QPoint p, bool onlyMovable)
Marker *TracePlot::markerAtPosition(QPoint p, bool onlyMovable)
{
auto clickPoint = p - QPoint(marginLeft, marginTop);
// check if click was near a marker
unsigned int closestDistance = numeric_limits<unsigned int>::max();
TraceMarker *closestMarker = nullptr;
Marker *closestMarker = nullptr;
for(auto t : traces) {
if(!t.second) {
// this trace is disabled, skip
@ -378,16 +378,16 @@ void TracePlot::checkIfStillSupported(Trace *t)
}
}
void TracePlot::markerAdded(TraceMarker *m)
void TracePlot::markerAdded(Marker *m)
{
connect(m, &TraceMarker::dataChanged, this, &TracePlot::triggerReplot);
connect(m, &TraceMarker::symbolChanged, this, &TracePlot::triggerReplot);
connect(m, &Marker::dataChanged, this, &TracePlot::triggerReplot);
connect(m, &Marker::symbolChanged, this, &TracePlot::triggerReplot);
triggerReplot();
}
void TracePlot::markerRemoved(TraceMarker *m)
void TracePlot::markerRemoved(Marker *m)
{
disconnect(m, &TraceMarker::dataChanged, this, &TracePlot::triggerReplot);
disconnect(m, &TraceMarker::symbolChanged, this, &TracePlot::triggerReplot);
disconnect(m, &Marker::dataChanged, this, &TracePlot::triggerReplot);
disconnect(m, &Marker::symbolChanged, this, &TracePlot::triggerReplot);
triggerReplot();
}