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 b19ba61450fbe59248f9a6950fc55794585ef324..2d0ce54a1a50feda50db19aefe04b44016b12226 100644 (file)
--- a/pv/views/tabular_decoder/view.hpp
+++ b/pv/views/tabular_decoder/view.hpp
@@ -17,14 +17,17 @@
  * 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>
 
+#include "pv/metadata_obj.hpp"
 #include "pv/views/viewbase.hpp"
 #include "pv/data/decodesignal.hpp"
 
@@ -35,6 +38,25 @@ namespace views {
 
 namespace tabular_decoder {
 
+// When adding an entry here, don't forget to update SaveTypeNames as well
+enum SaveType {
+       SaveTypeCSVEscaped,
+       SaveTypeCSVQuoted,
+       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
 {
        Q_OBJECT
@@ -42,9 +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,
@@ -56,16 +81,51 @@ public:
        int columnCount(const QModelIndex& parent_idx = QModelIndex()) const override;
 
        void set_signal_and_segment(data::DecodeSignal* signal, uint32_t current_segment);
+       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();
 
 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_;
+       uint8_t first_hidden_column_;
        uint32_t prev_segment_;
        uint64_t prev_last_row_;
+       int64_t highlight_sample_num_;
+       bool had_highlight_before_;
+       bool hide_hidden_;
+};
+
+
+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 QCustomTableView : public QTableView
+class CustomTableView : public QTableView
 {
        Q_OBJECT
 
@@ -75,12 +135,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;
 
@@ -101,39 +162,53 @@ private:
        void reset_data();
        void update_data();
 
-       void save_data() const;
+       void save_data_as_csv(unsigned int save_type) const;
 
 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();
 
+       void on_decoder_reset();
        void on_decoder_stacked(void* decoder);
        void on_decoder_removed(void* decoder);
 
        void on_actionSave_triggered(QAction* action = nullptr);
 
+       void on_table_item_clicked(const QModelIndex& index);
+       void on_table_item_double_clicked(const QModelIndex& index);
+       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_;
 
-       QCustomTableView* table_view_;
-
+       CustomTableView* table_view_;
        AnnotationCollectionModel* model_;
+       CustomFilterProxyModel* filter_proxy_model_;
 
        data::DecodeSignal* signal_;
        const data::decode::Decoder* decoder_;
-       bool updating_data_;
 };
 
 } // namespace tabular_decoder
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP