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

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

16
Software/PC_Application/Traces/trace.h
View file

@ -11,7 +11,7 @@
#include "Device/device.h"
#include "Math/tracemath.h"
class TraceMarker;
class Marker;
class Trace : public TraceMath
{
@ -88,7 +88,7 @@ public:
/* Returns the noise in dbm/Hz for spectrum analyzer measurements. May return NaN if calculation not possible */
double getNoise(double frequency);
int index(double x);
std::set<TraceMarker *> getMarkers() const;
std::set<Marker *> getMarkers() const;
void setCalibration(bool value);
void setReflection(bool value);
@ -146,8 +146,8 @@ public:
public slots:
void setVisible(bool visible);
void setColor(QColor color);
void addMarker(TraceMarker *m);
void removeMarker(TraceMarker *m);
void addMarker(Marker *m);
void removeMarker(Marker *m);
signals:
void cleared(Trace *t);
@ -158,9 +158,9 @@ signals:
void nameChanged();
void pauseChanged();
void colorChanged(Trace *t);
void markerAdded(TraceMarker *m);
void markerRemoved(TraceMarker *m);
void markerFormatChanged(TraceMarker *m);
void markerAdded(Marker *m);
void markerRemoved(Marker *m);
void markerFormatChanged(Marker *m);
private:
QString _name;
@ -176,7 +176,7 @@ private:
bool timeDomain;
QString filename;
unsigned int fileParemeter;
std::set<TraceMarker*> markers;
std::set<Marker*> markers;
struct {
union {
Protocol::SweepSettings VNA;