caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash when deleting delta markers (partial)

Browse Source
This commit is contained in:
Zoran Kostic 2020-12-10 04:07:52 +01:00
parent 4545efaf7a
commit 69c64458af
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/PC_Application/Traces/tracemarker.cpp
View File

@ -11,7 +11,7 @@
using namespace std; using namespace std;
TraceMarker::TraceMarker(TraceMarkerModel *model, int number, TraceMarker *parent, QString descr) TraceMarker::TraceMarker(TraceMarkerModel *model, int number, TraceMarker *parent, QString descr)
: editingFrequeny(false), : editingFrequency(false),
model(model), model(model),
parentTrace(nullptr), parentTrace(nullptr),
position(1000000000), position(1000000000),

2
Software/PC_Application/Traces/tracemarker.h
View File

@ -33,7 +33,7 @@ public:
int getNumber() const; int getNumber() const;
void setNumber(int value); void setNumber(int value);
bool editingFrequeny; bool editingFrequency;
Trace *getTrace() const; Trace *getTrace() const;
enum class Type { enum class Type {

10
Software/PC_Application/Traces/tracemarkermodel.cpp
View File

@ -88,11 +88,15 @@ void TraceMarkerModel::addMarker(TraceMarker *t)
connect(t, &TraceMarker::beginRemoveHelperMarkers, [=](TraceMarker *m) { connect(t, &TraceMarker::beginRemoveHelperMarkers, [=](TraceMarker *m) {
auto row = find(markers.begin(), markers.end(), m) - markers.begin(); auto row = find(markers.begin(), markers.end(), m) - markers.begin();
auto modelIndex = createIndex(row, 0, root); auto modelIndex = createIndex(row, 0, root);
if(!m->getHelperMarkers().empty()){
beginRemoveRows(modelIndex, 0, m->getHelperMarkers().size() - 1); beginRemoveRows(modelIndex, 0, m->getHelperMarkers().size() - 1);
}
}); });
connect(t, &TraceMarker::endRemoveHelperMarkers, [=](TraceMarker *m) { connect(t, &TraceMarker::endRemoveHelperMarkers, [=](TraceMarker *m) {
markerDataChanged(m); markerDataChanged(m);
if(!m->getHelperMarkers().empty()){
endRemoveRows(); endRemoveRows();
}
}); });
connect(t, &TraceMarker::deleted, this, qOverload<TraceMarker*>(&TraceMarkerModel::removeMarker)); connect(t, &TraceMarker::deleted, this, qOverload<TraceMarker*>(&TraceMarkerModel::removeMarker));
emit markerAdded(t); emit markerAdded(t);
@ -118,7 +122,7 @@ void TraceMarkerModel::removeMarker(TraceMarker *m)
void TraceMarkerModel::markerDataChanged(TraceMarker *m) void TraceMarkerModel::markerDataChanged(TraceMarker *m)
{ {
auto row = find(markers.begin(), markers.end(), m) - markers.begin(); auto row = find(markers.begin(), markers.end(), m) - markers.begin();
if(m->editingFrequeny) { if(m->editingFrequency) {
// only update the other columns, do not override editor data // only update the other columns, do not override editor data
emit dataChanged(index(row, ColIndexData), index(row, ColIndexData)); emit dataChanged(index(row, ColIndexData), index(row, ColIndexData));
} else { } else {
@ -373,14 +377,14 @@ QSize MarkerSettingsDelegate::sizeHint(const QStyleOptionViewItem &, const QMode
QWidget *MarkerSettingsDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &index) const QWidget *MarkerSettingsDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &index) const
{ {
auto marker = static_cast<const TraceMarkerModel*>(index.model())->markerFromIndex(index); auto marker = static_cast<const TraceMarkerModel*>(index.model())->markerFromIndex(index);
marker->editingFrequeny = true; marker->editingFrequency = true;
auto e = marker->getSettingsEditor(); auto e = marker->getSettingsEditor();
if(e) { if(e) {
e->setMaximumHeight(rowHeight); e->setMaximumHeight(rowHeight);
e->setParent(parent); e->setParent(parent);
connect(e, &SIUnitEdit::valueUpdated, this, &MarkerSettingsDelegate::commitData); connect(e, &SIUnitEdit::valueUpdated, this, &MarkerSettingsDelegate::commitData);
connect(e, &SIUnitEdit::focusLost, [=](){ connect(e, &SIUnitEdit::focusLost, [=](){
marker->editingFrequeny = false; marker->editingFrequency = false;
}); });
} }
return e; return e;