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

10
Software/PC_Application/Traces/traceplot.h
View file

@ -50,14 +50,14 @@ protected:
bool markedForDeletion;
static std::set<TracePlot*> plots;
virtual QPoint markerToPixel(TraceMarker *m) = 0;
virtual QPoint markerToPixel(Marker *m) = 0;
virtual double nearestTracePoint(Trace *t, QPoint pixel, double *distance = nullptr) = 0;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void leaveEvent(QEvent *event) override;
TraceMarker *markerAtPosition(QPoint p, bool onlyMovable = false);
Marker *markerAtPosition(QPoint p, bool onlyMovable = false);
void createMarkerAtPosition(QPoint p);
@ -74,8 +74,8 @@ protected slots:
void traceDeleted(Trace *t);
void triggerReplot();
void checkIfStillSupported(Trace *t);
virtual void markerAdded(TraceMarker *m);
virtual void markerRemoved(TraceMarker *m);
virtual void markerAdded(Marker *m);
virtual void markerRemoved(Marker *m);
virtual bool xCoordinateVisible(double x) = 0;
protected:
static constexpr unsigned int marginTop = 20;
@ -87,7 +87,7 @@ protected:
double sweep_fmin, sweep_fmax;
TraceModel &model;
TraceMarker *selectedMarker;
Marker *selectedMarker;
bool dropPending;
QPoint dropPosition;