using pv::util::Timestamp;
using std::make_shared;
+using std::max;
using std::shared_ptr;
namespace pv {
"CSV, fields quoted"
};
-QSize QCustomTableView::minimumSizeHint() const
+const char* ViewModeNames[ViewModeCount] = {
+ "Show all",
+ "Show all and focus on newest",
+ "Show visible in main view"
+};
+
+
+CustomFilterProxyModel::CustomFilterProxyModel(QObject* parent) :
+ QSortFilterProxyModel(parent),
+ range_filtering_enabled_(false)
+{
+}
+
+bool CustomFilterProxyModel::filterAcceptsRow(int sourceRow,
+ const QModelIndex &sourceParent) const
+{
+ (void)sourceParent;
+ assert(sourceModel() != nullptr);
+
+ bool result = true;
+
+ if (range_filtering_enabled_) {
+ const QModelIndex ann_start_sample_idx = sourceModel()->index(sourceRow, 0);
+ const uint64_t ann_start_sample =
+ sourceModel()->data(ann_start_sample_idx, Qt::DisplayRole).toULongLong();
+
+ const QModelIndex ann_end_sample_idx = sourceModel()->index(sourceRow, 6);
+ const uint64_t ann_end_sample =
+ sourceModel()->data(ann_end_sample_idx, Qt::DisplayRole).toULongLong();
+
+ // We consider all annotations as visible that either
+ // a) begin to the left of the range and end within the range or
+ // b) begin and end within the range or
+ // c) begin within the range and end to the right of the range
+ // ...which is equivalent to the negation of "begins and ends outside the range"
+
+ const bool left_of_range = (ann_end_sample < range_start_sample_);
+ const bool right_of_range = (ann_start_sample > range_end_sample_);
+ const bool entirely_outside_of_range = left_of_range || right_of_range;
+
+ result = !entirely_outside_of_range;
+ }
+
+ return result;
+}
+
+void CustomFilterProxyModel::set_sample_range(uint64_t start_sample,
+ uint64_t end_sample)
+{
+ range_start_sample_ = start_sample;
+ range_end_sample_ = end_sample;
+
+ invalidateFilter();
+}
+
+void CustomFilterProxyModel::enable_range_filtering(bool value)
+{
+ range_filtering_enabled_ = value;
+
+ invalidateFilter();
+}
+
+
+QSize CustomTableView::minimumSizeHint() const
{
QSize size(QTableView::sizeHint());
return size;
}
-QSize QCustomTableView::sizeHint() const
+QSize CustomTableView::sizeHint() const
{
return minimumSizeHint();
}
+void CustomTableView::keyPressEvent(QKeyEvent *event)
+{
+ if ((event->key() == Qt::Key_Return) || (event->key() == Qt::Key_Enter))
+ activatedByKey(currentIndex());
+ else
+ QTableView::keyPressEvent(event);
+}
+
View::View(Session &session, bool is_main_view, QMainWindow *parent) :
ViewBase(session, is_main_view, parent),
// Note: Place defaults in View::reset_view_state(), not here
parent_(parent),
decoder_selector_(new QComboBox()),
+ hide_hidden_cb_(new QCheckBox()),
+ view_mode_selector_(new QComboBox()),
save_button_(new QToolButton()),
save_action_(new QAction(this)),
- table_view_(new QCustomTableView()),
- model_(new AnnotationCollectionModel()),
+ table_view_(new CustomTableView()),
+ model_(new AnnotationCollectionModel(this)),
+ filter_proxy_model_(new CustomFilterProxyModel(this)),
signal_(nullptr)
{
QVBoxLayout *root_layout = new QVBoxLayout(this);
toolbar->addWidget(decoder_selector_);
toolbar->addSeparator();
toolbar->addWidget(save_button_);
+ toolbar->addSeparator();
+ toolbar->addWidget(view_mode_selector_);
+ toolbar->addSeparator();
+ toolbar->addWidget(hide_hidden_cb_);
connect(decoder_selector_, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_selected_decoder_changed(int)));
+ connect(view_mode_selector_, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_view_mode_changed(int)));
+ connect(hide_hidden_cb_, SIGNAL(toggled(bool)),
+ this, SLOT(on_hide_hidden_changed(bool)));
// Configure widgets
decoder_selector_->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+ for (int i = 0; i < ViewModeCount; i++)
+ view_mode_selector_->addItem(ViewModeNames[i], QVariant::fromValue(i));
+
+ hide_hidden_cb_->setText(tr("Hide Hidden Rows/Classes"));
+ hide_hidden_cb_->setChecked(true);
+
// Configure actions
save_action_->setText(tr("&Save..."));
save_action_->setIcon(QIcon::fromTheme("document-save-as",
for (int i = 0; i < SaveTypeCount; i++) {
QAction *const action = save_menu->addAction(tr(SaveTypeNames[i]));
- action->setData(qVariantFromValue(i));
+ action->setData(QVariant::fromValue(i));
}
save_button_->setMenu(save_menu);
save_button_->setDefaultAction(save_action_);
save_button_->setPopupMode(QToolButton::MenuButtonPopup);
- // Set up the table view
- table_view_->setModel(model_);
+ // Set up the models and the table view
+ filter_proxy_model_->setSourceModel(model_);
+ table_view_->setModel(filter_proxy_model_);
+
table_view_->setSelectionBehavior(QAbstractItemView::SelectRows);
table_view_->setSelectionMode(QAbstractItemView::ContiguousSelection);
table_view_->setSortingEnabled(true);
table_view_->sortByColumn(0, Qt::AscendingOrder);
+ for (uint8_t i = model_->first_hidden_column(); i < model_->columnCount(); i++)
+ table_view_->setColumnHidden(i, true);
+
const int font_height = QFontMetrics(QApplication::font()).height();
table_view_->verticalHeader()->setDefaultSectionSize((font_height * 5) / 4);
table_view_->verticalHeader()->setVisible(false);
this, SLOT(on_table_item_clicked(const QModelIndex&)));
connect(table_view_, SIGNAL(doubleClicked(const QModelIndex&)),
this, SLOT(on_table_item_double_clicked(const QModelIndex&)));
+ connect(table_view_, SIGNAL(activatedByKey(const QModelIndex&)),
+ this, SLOT(on_table_item_double_clicked(const QModelIndex&)));
connect(table_view_->horizontalHeader(), SIGNAL(customContextMenuRequested(const QPoint&)),
this, SLOT(on_table_header_requested(const QPoint&)));
+ // Set up metadata event handler
+ session_.metadata_obj_manager()->add_observer(this);
+
reset_view_state();
}
+View::~View()
+{
+ session_.metadata_obj_manager()->remove_observer(this);
+}
+
ViewType View::get_type() const
{
return ViewTypeTabularDecoder;
void View::save_settings(QSettings &settings) const
{
ViewBase::save_settings(settings);
+
+ settings.setValue("view_mode", view_mode_selector_->currentIndex());
+ settings.setValue("hide_hidden", hide_hidden_cb_->isChecked());
}
void View::restore_settings(QSettings &settings)
{
- // Note: It is assumed that this function is only called once,
- // immediately after restoring a previous session.
ViewBase::restore_settings(settings);
+
+ if (settings.contains("view_mode"))
+ view_mode_selector_->setCurrentIndex(settings.value("view_mode").toInt());
+
+ if (settings.contains("hide_hidden"))
+ hide_hidden_cb_->setChecked(settings.value("hide_hidden").toBool());
}
void View::reset_data()
if (table_view_->horizontalHeader()->isSectionHidden(column))
continue;
- const QString title = model_->headerData(column, Qt::Horizontal, Qt::DisplayRole).toString();
+ const QString title = filter_proxy_model_->headerData(column, Qt::Horizontal, Qt::DisplayRole).toString();
if (save_type == SaveTypeCSVEscaped)
out_stream << title;
if (table_view_->horizontalHeader()->isSectionHidden(column))
continue;
- const QModelIndex idx = model_->index(row, column, QModelIndex());
- QString s = model_->data(idx, Qt::DisplayRole).toString();
+ const QModelIndex idx = filter_proxy_model_->index(row, column);
+ QString s = filter_proxy_model_->data(idx, Qt::DisplayRole).toString();
if (save_type == SaveTypeCSVEscaped)
out_stream << s.replace(",", "\\,");
}
update_data();
+
+ // Force repaint, otherwise the new selection isn't shown for some reason
+ table_view_->viewport()->update();
+}
+
+void View::on_hide_hidden_changed(bool checked)
+{
+ model_->set_hide_hidden(checked);
+
+ // Force repaint, otherwise the new selection isn't shown for some reason
+ table_view_->viewport()->update();
+}
+
+void View::on_view_mode_changed(int index)
+{
+ if (index == ViewModeAll)
+ filter_proxy_model_->enable_range_filtering(false);
+
+ if (index == ViewModeVisible) {
+ MetadataObject *md_obj =
+ session_.metadata_obj_manager()->find_object_by_type(MetadataObjMainViewRange);
+ assert(md_obj);
+
+ int64_t start_sample = md_obj->value(MetadataValueStartSample).toLongLong();
+ int64_t end_sample = md_obj->value(MetadataValueEndSample).toLongLong();
+
+ filter_proxy_model_->enable_range_filtering(true);
+ filter_proxy_model_->set_sample_range(max((int64_t)0, start_sample),
+ max((int64_t)0, end_sample));
+ }
+
+ if (index == ViewModeLatest) {
+ filter_proxy_model_->enable_range_filtering(false);
+
+ table_view_->scrollTo(
+ filter_proxy_model_->mapFromSource(model_->index(model_->rowCount() - 1, 0)),
+ QAbstractItemView::PositionAtBottom);
+ }
}
void View::on_signal_name_changed(const QString &name)
{
(void)color;
- table_view_->update();
+ // Force immediate repaint, otherwise it's updated after the header popup is closed
+ table_view_->viewport()->update();
}
void View::on_new_annotations()
{
- if (!delayed_view_updater_.isActive())
- delayed_view_updater_.start();
+ if (view_mode_selector_->currentIndex() == ViewModeLatest) {
+ update_data();
+ table_view_->scrollTo(
+ filter_proxy_model_->index(filter_proxy_model_->rowCount() - 1, 0),
+ QAbstractItemView::PositionAtBottom);
+ } else {
+ if (!delayed_view_updater_.isActive())
+ delayed_view_updater_.start();
+ }
}
void View::on_decoder_reset()
void View::on_table_item_double_clicked(const QModelIndex& index)
{
- const Annotation* ann = static_cast<const Annotation*>(index.internalPointer());
+ const QModelIndex src_idx = filter_proxy_model_->mapToSource(index);
+
+ const Annotation* ann = static_cast<const Annotation*>(src_idx.internalPointer());
+ assert(ann);
shared_ptr<views::ViewBase> main_view = session_.main_view();
for (int i = 0; i < table_view_->horizontalHeader()->count(); i++) {
int column = table_view_->horizontalHeader()->logicalIndex(i);
- const QString title = model_->headerData(column, Qt::Horizontal, Qt::DisplayRole).toString();
+ const QString title =
+ filter_proxy_model_->headerData(column, Qt::Horizontal, Qt::DisplayRole).toString();
QAction* action = new QAction(title, this);
action->setCheckable(true);
table_view_->horizontalHeader()->setSectionHidden(column, !checked);
}
+void View::on_metadata_object_changed(MetadataObject* obj,
+ MetadataValueType value_type)
+{
+ // Check if we need to update the model's data range. We only work on the
+ // end sample value because the start sample value is updated first and
+ // we don't want to update the model twice
+
+ if ((view_mode_selector_->currentIndex() == ViewModeVisible) &&
+ (obj->type() == MetadataObjMainViewRange) &&
+ (value_type == MetadataValueEndSample)) {
+
+ int64_t start_sample = obj->value(MetadataValueStartSample).toLongLong();
+ int64_t end_sample = obj->value(MetadataValueEndSample).toLongLong();
+
+ filter_proxy_model_->set_sample_range(max((int64_t)0, start_sample),
+ max((int64_t)0, end_sample));
+ }
+
+ if (obj->type() == MetadataObjMousePos) {
+ QModelIndex first_visible_idx =
+ filter_proxy_model_->mapToSource(filter_proxy_model_->index(0, 0));
+ QModelIndex last_visible_idx =
+ filter_proxy_model_->mapToSource(filter_proxy_model_->index(filter_proxy_model_->rowCount() - 1, 0));
+
+ if (first_visible_idx.isValid()) {
+ const QModelIndex first_highlighted_idx =
+ model_->update_highlighted_rows(first_visible_idx, last_visible_idx,
+ obj->value(MetadataValueStartSample).toLongLong());
+
+ if (view_mode_selector_->currentIndex() == ViewModeVisible) {
+ const QModelIndex idx = filter_proxy_model_->mapFromSource(first_highlighted_idx);
+ table_view_->scrollTo(idx, QAbstractItemView::EnsureVisible);
+ }
+
+ // Force repaint, otherwise the table doesn't immediately update for some reason
+ table_view_->viewport()->update();
+ }
+ }
+}
+
void View::perform_delayed_view_update()
{
update_data();