X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.hpp;h=eff962311cc549434e51dc48db45f6bda704c5bc;hb=999869aa676f7077b7181355eee28e9b025d4cea;hp=9621f35117bd47a702eb9e397afa7e8a54fc9d7c;hpb=0a952555b9d153f42912e47f35fac5dd4643fca9;p=pulseview.git diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp index 9621f351..eff96231 100644 --- a/pv/views/viewbase.hpp +++ b/pv/views/viewbase.hpp @@ -38,7 +38,7 @@ #endif using std::shared_ptr; -using std::unordered_set; +using std::vector; namespace pv { @@ -55,7 +55,8 @@ namespace views { enum ViewType { ViewTypeTrace, #ifdef ENABLE_DECODE - ViewTypeDecoderOutput, + ViewTypeDecoderBinary, + ViewTypeTabularDecoder, #endif ViewTypeCount // Indicates how many view types there are, must always be last }; @@ -66,7 +67,7 @@ class ViewBase : public QWidget { Q_OBJECT -private: +public: static const int MaxViewAutoUpdateRate; public: @@ -84,16 +85,15 @@ public: Session& session(); const Session& session() const; - virtual void clear_signals(); - /** * Returns the signal bases contained in this view. */ - unordered_set< shared_ptr > signalbases() const; + vector< shared_ptr > signalbases() const; virtual void clear_signalbases(); virtual void add_signalbase(const shared_ptr signalbase); + virtual void remove_signalbase(const shared_ptr signalbase); #ifdef ENABLE_DECODE virtual void clear_decode_signals(); @@ -104,9 +104,10 @@ public: #endif virtual void save_settings(QSettings &settings) const; - virtual void restore_settings(QSettings &settings); + virtual void focus_on_range(uint64_t start_sample, uint64_t end_sample); + public Q_SLOTS: virtual void trigger_event(int segment_id, util::Timestamp location); virtual void signals_changed(); @@ -128,9 +129,9 @@ protected: util::TimeUnit time_unit_; - unordered_set< shared_ptr > signalbases_; + vector< shared_ptr > signalbases_; #ifdef ENABLE_DECODE - unordered_set< shared_ptr > decode_signals_; + vector< shared_ptr > decode_signals_; #endif /// The ID of the currently displayed segment