X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftabular_decoder%2Fview.hpp;h=891c227cd8e6a6446af7b32aab7f1279483383f4;hb=f9a0fd83226d97af7458d8c9dac0b88c83a54d29;hp=9c251382c675bbb2e2cb074dbde47016eb02afc7;hpb=6d46525fb5566856d01deac5a7787699b17cc4e4;p=pulseview.git

diff --git a/pv/views/tabular_decoder/view.hpp b/pv/views/tabular_decoder/view.hpp
index 9c251382..891c227c 100644
--- a/pv/views/tabular_decoder/view.hpp
+++ b/pv/views/tabular_decoder/view.hpp
@@ -21,11 +21,12 @@
 #define PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
 
 #include <QAction>
+#include <QCheckBox>
 #include <QComboBox>
 #include <QTableView>
 #include <QToolButton>
 
-#include "pv/globalsettings.hpp"
+#include "pv/metadata_obj.hpp"
 #include "pv/views/viewbase.hpp"
 #include "pv/data/decodesignal.hpp"
 
@@ -43,16 +44,26 @@ enum SaveType {
 	SaveTypeCount  // Indicates how many save types there are, must always be last
 };
 
+// When adding an entry here, don't forget to update ViewModeNames as well
+enum ViewModeType {
+	ViewModeAll,
+	ViewModeLatest,
+	ViewModeVisible,
+	ViewModeCount // Indicates how many view mode types there are, must always be last
+};
+
 extern const char* SaveTypeNames[SaveTypeCount];
+extern const char* ViewModeNames[ViewModeCount];
 
 
-class AnnotationCollectionModel : public QAbstractTableModel, public GlobalSettingsInterface
+class AnnotationCollectionModel : public QAbstractTableModel
 {
 	Q_OBJECT
 
 public:
 	AnnotationCollectionModel(QObject* parent = nullptr);
 
+	int get_hierarchy_level(const Annotation* ann) const;
 	QVariant data_from_ann(const Annotation* ann, int index) const;
 	QVariant data(const QModelIndex& index, int role) const override;
 	Qt::ItemFlags flags(const QModelIndex& index) const override;
@@ -68,16 +79,28 @@ public:
 	int columnCount(const QModelIndex& parent_idx = QModelIndex()) const override;
 
 	void set_signal_and_segment(data::DecodeSignal* signal, uint32_t current_segment);
+	void set_sample_range(uint64_t start_sample, uint64_t end_sample);
+	void set_hide_hidden(bool hide_hidden);
+
+	void update_annotations_without_hidden();
+	void update_highlighted_rows(QModelIndex first, QModelIndex last,
+		int64_t sample_num);
 
-	void on_setting_changed(const QString &key, const QVariant &value) override;
+private Q_SLOTS:
+	void on_annotation_visibility_changed();
 
 private:
 	vector<QVariant> header_data_;
 	const deque<const Annotation*>* all_annotations_;
+	deque<const Annotation*> all_annotations_without_hidden_;
+	const deque<const Annotation*>* dataset_;
 	data::DecodeSignal* signal_;
 	uint32_t prev_segment_;
 	uint64_t prev_last_row_;
-	bool theme_is_dark_;
+	uint64_t start_sample_, end_sample_, start_index_, end_index_;
+	int64_t highlight_sample_num_;
+	bool had_highlight_before_;
+	bool hide_hidden_;
 };
 
 
@@ -91,12 +114,13 @@ public:
 };
 
 
-class View : public ViewBase
+class View : public ViewBase, public MetadataObjObserverInterface
 {
 	Q_OBJECT
 
 public:
 	explicit View(Session &session, bool is_main_view=false, QMainWindow *parent = nullptr);
+	~View();
 
 	virtual ViewType get_type() const;
 
@@ -121,6 +145,9 @@ private:
 
 private Q_SLOTS:
 	void on_selected_decoder_changed(int index);
+	void on_hide_hidden_changed(bool checked);
+	void on_view_mode_changed(int index);
+
 	void on_signal_name_changed(const QString &name);
 	void on_signal_color_changed(const QColor &color);
 	void on_new_annotations();
@@ -136,12 +163,17 @@ private Q_SLOTS:
 	void on_table_header_requested(const QPoint& pos);
 	void on_table_header_toggled(bool checked);
 
+	virtual void on_metadata_object_changed(MetadataObject* obj,
+		MetadataValueType value_type);
+
 	virtual void perform_delayed_view_update();
 
 private:
 	QWidget* parent_;
 
 	QComboBox* decoder_selector_;
+	QCheckBox* hide_hidden_cb_;
+	QComboBox* view_mode_selector_;
 
 	QToolButton* save_button_;
 	QAction* save_action_;