Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mon GUI: Fixed Column labels in signal plotting widget #1326

Merged
merged 2 commits into from
Jan 22, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/mon/mon_plugins/signals_plotting/src/signal_tree_model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,16 @@ Qt::ItemFlags SignalTreeModel::flags(const QModelIndex& index) const
QVariant SignalTreeModel::data(const QModelIndex& index, int role) const
{
QAbstractTreeItem* tree_item = item(index);
if (tree_item)
return (index.column() >= 0 ? tree_item->data(index.column(), (Qt::ItemDataRole)role) : QVariant());
else
return QVariant();
if (tree_item != nullptr)
{
int const item_column = mapColumnToItem(index.column(), tree_item->type());
if (item_column >= 0)
{
return tree_item->data(item_column, (Qt::ItemDataRole)role);
}
}

return QVariant();
}

void SignalTreeModel::setCheckedState(SignalTreeItem* item, int index_column)
Expand Down
Loading