X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=8ef8812cf5443aaaf1553343eeda27df6b77073b;hb=8a5fd81fea577663e8c0f17e53d5928599d0926d;hp=9fac1a67f8d400933d4a95b2c2b12eca29c483d0;hpb=489953884c0d7692fa20748314751e114ae54cf2;p=pulseview.git diff --git a/pv/view/view.hpp b/pv/view/view.hpp index 9fac1a6..8ef8812 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -54,6 +53,10 @@ namespace pv { class Session; +namespace data { +class Logic; +} + namespace views { namespace TraceView { @@ -92,7 +95,6 @@ private: static const pv::util::Timestamp MinScale; static const int MaxScrollValue; - static const int MaxViewAutoUpdateRate; static const int ScaleUnits[3]; @@ -109,7 +111,7 @@ public: virtual void clear_signals(); - virtual void add_signal(const shared_ptr signal); + void add_signal(const shared_ptr signal); #ifdef ENABLE_DECODE virtual void clear_decode_signals(); @@ -313,6 +315,8 @@ private: */ void calculate_tick_spacing(); + void adjust_top_margin(); + void update_scroll(); void reset_scroll(); @@ -352,9 +356,8 @@ private Q_SLOTS: void signals_changed(); void capture_state_updated(int state); - void data_updated(); - void perform_delayed_view_update(); + virtual void perform_delayed_view_update(); void process_sticky_events(); @@ -419,7 +422,6 @@ private: bool sticky_scrolling_; bool coloured_bg_; bool always_zoom_to_fit_; - QTimer delayed_view_updater_; pv::util::Timestamp tick_period_; pv::util::SIPrefix tick_prefix_; @@ -444,8 +446,6 @@ private: // A nonzero value indicates the v offset to restore. See View::resizeEvent() int saved_v_offset_; - - bool size_finalized_; }; } // namespace TraceView