Proper cleanup of delta marker connections
This commit is contained in:
parent
37ed63fc6a
commit
79a990af47
@ -351,6 +351,15 @@ void TraceMarker::checkDeltaMarker()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TraceMarker::deltaDeleted()
|
||||||
|
{
|
||||||
|
// the delta marker of this marker has been deleted, find new match
|
||||||
|
delta = nullptr;
|
||||||
|
qDebug() << "assigned delta deleted";
|
||||||
|
assignDeltaMarker(bestDeltaCandidate());
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
std::set<TraceMarker::Type> TraceMarker::getSupportedTypes()
|
std::set<TraceMarker::Type> TraceMarker::getSupportedTypes()
|
||||||
{
|
{
|
||||||
set<TraceMarker::Type> supported;
|
set<TraceMarker::Type> supported;
|
||||||
@ -447,12 +456,7 @@ void TraceMarker::assignDeltaMarker(TraceMarker *m)
|
|||||||
// this marker has to be updated when the delta marker changes
|
// this marker has to be updated when the delta marker changes
|
||||||
connect(delta, &TraceMarker::rawDataChanged, this, &TraceMarker::update);
|
connect(delta, &TraceMarker::rawDataChanged, this, &TraceMarker::update);
|
||||||
connect(delta, &TraceMarker::domainChanged, this, &TraceMarker::checkDeltaMarker);
|
connect(delta, &TraceMarker::domainChanged, this, &TraceMarker::checkDeltaMarker);
|
||||||
connect(delta, &TraceMarker::deleted, [=](){
|
connect(delta, &TraceMarker::deleted, this, &TraceMarker::deltaDeleted);
|
||||||
delta = nullptr;
|
|
||||||
qDebug() << "assigned delta deleted";
|
|
||||||
assignDeltaMarker(bestDeltaCandidate());
|
|
||||||
update();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
emit assignedDeltaChanged(this);
|
emit assignedDeltaChanged(this);
|
||||||
}
|
}
|
||||||
|
@ -92,6 +92,7 @@ private slots:
|
|||||||
void traceDataChanged();
|
void traceDataChanged();
|
||||||
void updateSymbol();
|
void updateSymbol();
|
||||||
void checkDeltaMarker();
|
void checkDeltaMarker();
|
||||||
|
void deltaDeleted();
|
||||||
signals:
|
signals:
|
||||||
void rawDataChanged();
|
void rawDataChanged();
|
||||||
void domainChanged();
|
void domainChanged();
|
||||||
|
Loading…
Reference in New Issue
Block a user