Merge branch 'jankae:master' into master
This commit is contained in:
commit
186d94fa94
@ -237,13 +237,6 @@ QVariant MarkerModel::data(const QModelIndex &index, int role) const
|
|||||||
return QString::number(marker->getGroup()->getNumber());
|
return QString::number(marker->getGroup()->getNumber());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ColIndexTrace:
|
|
||||||
if(marker->getTrace()) {
|
|
||||||
return marker->getTrace()->name();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ColIndexType:
|
|
||||||
return marker->readableType();
|
|
||||||
case ColIndexSettings:
|
case ColIndexSettings:
|
||||||
return marker->readableSettings();
|
return marker->readableSettings();
|
||||||
case ColIndexData:
|
case ColIndexData:
|
||||||
|
Loading…
Reference in New Issue
Block a user