TabularDecView: Some fixes and refactorings

[pulseview.git] / pv / views / tabular_decoder / view.hpp

diff --git a/pv/views/tabular_decoder/view.hpp b/pv/views/tabular_decoder/view.hpp
index 7d25f700e3089376a12c64fecaed89672f7aa782..2d0ce54a1a50feda50db19aefe04b44016b12226 100644 (file)
--- a/pv/views/tabular_decoder/view.hpp
+++ b/pv/views/tabular_decoder/view.hpp
@@ -17,12 +17,13 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP
 
 #include <QAction>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QSortFilterProxyModel>
 #include <QTableView>
 #include <QToolButton>
 
@@ -63,10 +64,12 @@ class AnnotationCollectionModel : public QAbstractTableModel
 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;
 
+       uint8_t first_hidden_column() const;
        QVariant headerData(int section, Qt::Orientation orientation,
                int role = Qt::DisplayRole) const override;
        QModelIndex index(int row, int column,
@@ -78,10 +81,11 @@ 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();
+       QModelIndex update_highlighted_rows(QModelIndex first, QModelIndex last,
+               int64_t sample_num);
 
 private Q_SLOTS:
        void on_annotation_visibility_changed();
@@ -92,14 +96,36 @@ private:
        deque<const Annotation*> all_annotations_without_hidden_;
        const deque<const Annotation*>* dataset_;
        data::DecodeSignal* signal_;
+       uint8_t first_hidden_column_;
        uint32_t prev_segment_;
        uint64_t prev_last_row_;
-       uint64_t start_sample_, end_sample_, start_index_, end_index_;
+       int64_t highlight_sample_num_;
+       bool had_highlight_before_;
        bool hide_hidden_;
 };
 
 
-class QCustomTableView : public QTableView
+class CustomFilterProxyModel : public QSortFilterProxyModel
+{
+       Q_OBJECT
+
+public:
+       CustomFilterProxyModel(QObject* parent = 0);
+
+       void set_sample_range(uint64_t start_sample, uint64_t end_sample);
+
+       void enable_range_filtering(bool value);
+
+protected:
+       bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+
+private:
+       uint64_t range_start_sample_, range_end_sample_;
+       bool range_filtering_enabled_;
+};
+
+
+class CustomTableView : public QTableView
 {
        Q_OBJECT
 
@@ -173,9 +199,9 @@ private:
        QToolButton* save_button_;
        QAction* save_action_;
 
-       QCustomTableView* table_view_;
-
+       CustomTableView* table_view_;
        AnnotationCollectionModel* model_;
+       CustomFilterProxyModel* filter_proxy_model_;
 
        data::DecodeSignal* signal_;
        const data::decode::Decoder* decoder_;
@@ -185,4 +211,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP