]> sigrok.org Git - pulseview.git/blobdiff - pv/view/view.hpp
View: Optimize header pane sizing
[pulseview.git] / pv / view / view.hpp
index 2f5d7020f05011c70594589ca95c4d50bae2bb65..76a38f16630b672cdd2a5ba1ebcc2378ca363277 100644 (file)
@@ -20,8 +20,7 @@
 #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
 #define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <memory>
 #include <set>
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
-#include <QTimer>
+#include <QSplitter>
 
 #include <pv/data/signaldata.hpp>
-#include <pv/views/viewbase.hpp>
 #include <pv/util.hpp>
+#include <pv/views/viewbase.hpp>
 
 #include "cursorpair.hpp"
 #include "flag.hpp"
 #include "tracetreeitemowner.hpp"
 
+using std::list;
+using std::unordered_map;
+using std::unordered_set;
+using std::set;
+using std::shared_ptr;
+using std::vector;
+
 namespace sigrok {
 class ChannelGroup;
 }
@@ -48,6 +54,10 @@ namespace pv {
 
 class Session;
 
+namespace data {
+class Logic;
+}
+
 namespace views {
 
 namespace TraceView {
@@ -61,16 +71,17 @@ class Trace;
 class Viewport;
 class TriggerMarker;
 
-class CustomAbstractScrollArea : public QAbstractScrollArea {
+class CustomScrollArea : public QAbstractScrollArea
+{
        Q_OBJECT
 
 public:
-       CustomAbstractScrollArea(QWidget *parent = 0);
-       void setViewportMargins(int left, int top, int right, int bottom);
+       CustomScrollArea(QWidget *parent = nullptr);
        bool viewportEvent(QEvent *event);
 };
 
-class View : public ViewBase, public TraceTreeItemOwner {
+class View : public ViewBase, public TraceTreeItemOwner
+{
        Q_OBJECT
 
 private:
@@ -84,12 +95,11 @@ private:
        static const pv::util::Timestamp MinScale;
 
        static const int MaxScrollValue;
-       static const int MaxViewAutoUpdateRate;
 
        static const int ScaleUnits[3];
 
 public:
-       explicit View(Session &session, QWidget *parent = 0);
+       explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr);
 
        Session& session();
        const Session& session() const;
@@ -97,18 +107,18 @@ public:
        /**
         * Returns the signals contained in this view.
         */
-       std::unordered_set< std::shared_ptr<Signal> > signals() const;
+       unordered_set< shared_ptr<Signal> > signals() const;
 
        virtual void clear_signals();
 
-       virtual void add_signal(const std::shared_ptr<Signal> signal);
+       void add_signal(const shared_ptr<Signal> signal);
 
 #ifdef ENABLE_DECODE
        virtual void clear_decode_signals();
 
-       virtual void add_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+       virtual void add_decode_signal(shared_ptr<data::SignalBase> signalbase);
 
-       virtual void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+       virtual void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
 #endif
 
        /**
@@ -132,7 +142,7 @@ public:
        /**
         * Gets a list of time markers.
         */
-       std::vector< std::shared_ptr<TimeItem> > time_items() const;
+       vector< shared_ptr<TimeItem> > time_items() const;
 
        /**
         * Returns the view time scale in seconds per pixel.
@@ -194,16 +204,9 @@ public:
         */
        void set_scale_offset(double scale, const pv::util::Timestamp& offset);
 
-       std::set< std::shared_ptr<pv::data::SignalData> >
-               get_visible_data() const;
+       set< shared_ptr<pv::data::SignalData> > get_visible_data() const;
 
-       std::pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
-
-       /**
-        * Enables or disables sticky scrolling, i.e. the view always shows
-        * the most recent samples when capturing data.
-        */
-       void enable_sticky_scrolling(bool state);
+       pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
        /**
         * Enables or disables coloured trace backgrounds. If they're not
@@ -211,6 +214,21 @@ public:
         */
        void enable_coloured_bg(bool state);
 
+       /**
+        * Returns true if the trace background should be drawn with a coloured background.
+        */
+       bool coloured_bg() const;
+
+       /**
+        * Enable or disable showing sampling points.
+        */
+       void enable_show_sampling_points(bool state);
+
+       /**
+        * Enable or disable showing the analog minor grid.
+        */
+       void enable_show_analog_minor_grid(bool state);
+
        /**
         * Returns true if cursors are displayed. false otherwise.
         */
@@ -229,7 +247,7 @@ public:
        /**
         * Returns a reference to the pair of cursors.
         */
-       std::shared_ptr<CursorPair> cursors() const;
+       shared_ptr<CursorPair> cursors() const;
 
        /**
         * Adds a new flag at a specified time.
@@ -239,12 +257,12 @@ public:
        /**
         * Removes a flag from the list.
         */
-       void remove_flag(std::shared_ptr<Flag> flag);
+       void remove_flag(shared_ptr<Flag> flag);
 
        /**
         * Gets the list of flags.
         */
-       std::vector< std::shared_ptr<Flag> > flags() const;
+       vector< shared_ptr<Flag> > flags() const;
 
        const QPoint& hover_point() const;
 
@@ -297,25 +315,31 @@ private:
         */
        void calculate_tick_spacing();
 
+       void adjust_top_margin();
+
        void update_scroll();
 
        void reset_scroll();
 
        void set_scroll_default();
 
+       bool header_was_shrunk() const;
+
+       void expand_header_to_fit();
+
        void update_layout();
 
        TraceTreeItemOwner* find_prevalent_trace_group(
-               const std::shared_ptr<sigrok::ChannelGroup> &group,
-               const std::unordered_map<std::shared_ptr<data::SignalBase>,
-                       std::shared_ptr<Signal> > &signal_map);
+               const shared_ptr<sigrok::ChannelGroup> &group,
+               const unordered_map<shared_ptr<data::SignalBase>,
+                       shared_ptr<Signal> > &signal_map);
 
-       static std::vector< std::shared_ptr<Trace> >
+       static vector< shared_ptr<Trace> >
                extract_new_traces_for_channels(
-               const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
-               const std::unordered_map<std::shared_ptr<data::SignalBase>,
-                       std::shared_ptr<Signal> > &signal_map,
-               std::set< std::shared_ptr<Trace> > &add_list);
+               const vector< shared_ptr<sigrok::Channel> > &channels,
+               const unordered_map<shared_ptr<data::SignalBase>,
+                       shared_ptr<Signal> > &signal_map,
+               set< shared_ptr<Trace> > &add_list);
 
        void determine_time_unit();
 
@@ -331,14 +355,14 @@ public:
 
 private Q_SLOTS:
 
+       void on_splitter_moved();
        void h_scroll_value_changed(int value);
        void v_scroll_value_changed();
 
        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();
 
@@ -381,18 +405,18 @@ private Q_SLOTS:
        void set_time_unit(pv::util::TimeUnit time_unit);
 
 private:
+       CustomScrollArea *scrollarea_;
        Viewport *viewport_;
        Ruler *ruler_;
        Header *header_;
+       QSplitter *splitter_;
 
-       std::unordered_set< std::shared_ptr<Signal> > signals_;
+       unordered_set< shared_ptr<Signal> > signals_;
 
 #ifdef ENABLE_DECODE
-       std::vector< std::shared_ptr<DecodeTrace> > decode_traces_;
+       vector< shared_ptr<DecodeTrace> > decode_traces_;
 #endif
 
-       CustomAbstractScrollArea scrollarea_;
-
        /// The view time scale in seconds per pixel.
        double scale_;
 
@@ -401,8 +425,8 @@ private:
 
        bool updating_scroll_;
        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_;
@@ -410,12 +434,12 @@ private:
        util::TimeUnit time_unit_;
 
        bool show_cursors_;
-       std::shared_ptr<CursorPair> cursors_;
+       shared_ptr<CursorPair> cursors_;
 
-       std::list< std::shared_ptr<Flag> > flags_;
+       list< shared_ptr<Flag> > flags_;
        char next_flag_text_;
 
-       std::vector< std::shared_ptr<TriggerMarker> > trigger_markers_;
+       vector< shared_ptr<TriggerMarker> > trigger_markers_;
 
        QPoint hover_point_;
 
@@ -423,7 +447,10 @@ private:
        QTimer lazy_event_handler_;
 
        // This is true when the defaults couldn't be set due to insufficient info
-       bool scroll_needs_defaults;
+       bool scroll_needs_defaults_;
+
+       // A nonzero value indicates the v offset to restore. See View::resizeEvent()
+       int saved_v_offset_;
 };
 
 } // namespace TraceView