Merge branch 'jankae:master' into master

This commit is contained in:
William Dillon 2023-12-17 17:29:09 -08:00 committed by GitHub
commit 186d94fa94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -237,13 +237,6 @@ QVariant MarkerModel::data(const QModelIndex &index, int role) const
return QString::number(marker->getGroup()->getNumber());
}
break;
case ColIndexTrace:
if(marker->getTrace()) {
return marker->getTrace()->name();
}
break;
case ColIndexType:
return marker->readableType();
case ColIndexSettings:
return marker->readableSettings();
case ColIndexData: