jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 15:04:11 +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

12
Software/PC_Application/Traces/trace.cpp
View file

@ -6,7 +6,7 @@
#include <QSettings>
#include <functional>
#include "unit.h"
#include "tracemarker.h"
#include "Marker/marker.h"
using namespace std;
@ -261,16 +261,16 @@ void Trace::setColor(QColor color) {
}
}
void Trace::addMarker(TraceMarker *m)
void Trace::addMarker(Marker *m)
{
markers.insert(m);
connect(m, &TraceMarker::dataFormatChanged, this, &Trace::markerFormatChanged);
connect(m, &Marker::dataFormatChanged, this, &Trace::markerFormatChanged);
emit markerAdded(m);
}
void Trace::removeMarker(TraceMarker *m)
void Trace::removeMarker(Marker *m)
{
disconnect(m, &TraceMarker::dataFormatChanged, this, &Trace::markerFormatChanged);
disconnect(m, &Marker::dataFormatChanged, this, &Trace::markerFormatChanged);
markers.erase(m);
emit markerRemoved(m);
}
@ -652,7 +652,7 @@ void Trace::setCalibration(bool value)
calibration = value;
}
std::set<TraceMarker *> Trace::getMarkers() const
std::set<Marker *> Trace::getMarkers() const
{
return markers;
}