X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fview.hpp;h=2d0ce54a1a50feda50db19aefe04b44016b12226;hp=83a4549161bed2d391312aa8db669317ef9be264;hb=939d25cbcf7e6f1581f726dbd3c707d7365329d4;hpb=24d69d27584c7adec70bc0d6db764a3db04fce3c
diff --git a/pv/views/tabular_decoder/view.hpp b/pv/views/tabular_decoder/view.hpp
index 83a45491..2d0ce54a 100644
--- 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 .
*/
-#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
+#include
#include
+#include
#include
#include
+#include "pv/metadata_obj.hpp"
#include "pv/views/viewbase.hpp"
#include "pv/data/decodesignal.hpp"
@@ -35,40 +38,38 @@ namespace views {
namespace tabular_decoder {
-class AnnotationCollectionItem
-{
-public:
- AnnotationCollectionItem(const vector& data,
- shared_ptr parent = nullptr);
-
- void appendSubItem(shared_ptr item);
-
- shared_ptr subItem(int row) const;
- shared_ptr parent() const;
- shared_ptr findSubItem(const QVariant& value, int column);
-
- int subItemCount() const;
- int columnCount() const;
- int row() const;
- QVariant data(int column) const;
+// 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
+};
-private:
- vector< shared_ptr > subItems_;
- vector data_;
- shared_ptr parent_;
+// 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 QAbstractItemModel
+
+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;
+ 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,
@@ -79,17 +80,68 @@ public:
int rowCount(const QModelIndex& parent_idx = QModelIndex()) const override;
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:
- shared_ptr root_;
+ vector header_data_;
+ const deque* all_annotations_;
+ deque all_annotations_without_hidden_;
+ const deque* 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 View : public ViewBase
+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
+
+public:
+ QSize minimumSizeHint() const;
+ QSize sizeHint() const;
+};
+
+
+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;
@@ -110,38 +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_;
+ QComboBox* decoder_selector_;
+ QCheckBox* hide_hidden_cb_;
+ QComboBox* view_mode_selector_;
QToolButton* save_button_;
QAction* save_action_;
- QTableView* table_view_;
-
+ CustomTableView* table_view_;
AnnotationCollectionModel* model_;
+ CustomFilterProxyModel* filter_proxy_model_;
- data::DecodeSignal *signal_;
- const data::decode::Decoder *decoder_;
+ data::DecodeSignal* signal_;
+ const data::decode::Decoder* decoder_;
};
} // namespace tabular_decoder
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TABULARDECODER_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TABULAR_DECODER_VIEW_HPP