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

More user friendly time gate with filter in time domain

Browse source
This commit is contained in:
Jan Käberich 2021-04-25 15:46:34 +02:00
parent bb18dffb55
commit 4f4b2db549
18 changed files with 914 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,16 @@ void TracePlot::initializeTraceInfo()
void TracePlot::contextMenuEvent(QContextMenuEvent *event)
{
contextmenu->exec(event->globalPos());
auto m = markerAtPosition(event->pos());
QMenu *menu;
if(m) {
// right click on marker, execute its contextmenu
menu = m->getContextMenu();
} else {
// no marker, contextmenu of graph
menu = contextmenu;
}
menu->exec(event->globalPos());
if(markedForDeletion) {
emit deleted(this);
delete this;
@ -138,38 +147,7 @@ void TracePlot::paintEvent(QPaintEvent *event)
void TracePlot::mousePressEvent(QMouseEvent *event)
{
auto clickPoint = event->pos() - QPoint(marginLeft, marginTop);
// check if click was near a marker
unsigned int closestDistance = numeric_limits<unsigned int>::max();
TraceMarker *closestMarker = nullptr;
for(auto t : traces) {
if(!t.second) {
// this trace is disabled, skip
continue;
}
auto markers = t.first->getMarkers();
for(auto m : markers) {
if(!m->isMovable()) {
continue;
}
auto markerPoint = markerToPixel(m);
if(markerPoint.isNull()) {
// invalid, skip
continue;
}
auto diff = markerPoint - clickPoint;
unsigned int distance = diff.x() * diff.x() + diff.y() * diff.y();
if(distance < closestDistance) {
closestDistance = distance;
closestMarker = m;
}
}
}
if(closestDistance <= 400) {
selectedMarker = closestMarker;
} else {
selectedMarker = nullptr;
}
selectedMarker = markerAtPosition(event->pos(), true);
}
void TracePlot::mouseReleaseEvent(QMouseEvent *event)
@ -205,6 +183,46 @@ void TracePlot::leaveEvent(QEvent *event)
selectedMarker = nullptr;
}
TraceMarker *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;
for(auto t : traces) {
if(!t.second) {
// this trace is disabled, skip
continue;
}
auto markers = t.first->getMarkers();
for(auto m : markers) {
if(!m->isMovable() && onlyMovable) {
continue;
}
auto markerPoint = markerToPixel(m);
if(markerPoint.isNull()) {
// invalid, skip
continue;
}
auto diff = markerPoint - clickPoint;
unsigned int distance = diff.x() * diff.x() + diff.y() * diff.y();
if(distance < closestDistance) {
closestDistance = distance;
if(m->getParent()) {
closestMarker = m->getParent();
} else {
closestMarker = m;
}
}
}
}
if(closestDistance <= 400) {
return closestMarker;
} else {
return nullptr;
}
}
void TracePlot::dragEnterEvent(QDragEnterEvent *event)
{
if (event->mimeData()->hasFormat("trace/pointer")) {