X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=f378e9116c24a6ccb0b3376cf2fe7d77ac18b7ba;hb=ef8311a4296a2dc85c82b063de61efa4eb7a8404;hp=fb52f530fcb1dccae46ac2bdc773875f7adb7d4e;hpb=491536836d878a3abf7959800f56641ac093bd11;p=pulseview.git diff --git a/pv/view/view.h b/pv/view/view.h index fb52f530..f378e911 100644 --- a/pv/view/view.h +++ b/pv/view/view.h @@ -23,12 +23,12 @@ #include -#include +#include #include #include -#include "cursor.h" +#include "cursorpair.h" namespace pv { @@ -54,6 +54,7 @@ private: public: static const int SignalHeight; + static const int SignalMargin; static const int SignalSnapGridSize; static const QColor CursorAreaColour; @@ -87,6 +88,8 @@ public: */ void set_scale_offset(double scale, double offset); + std::list > selected_items() const; + /** * Returns true if cursors are displayed. false otherwise. */ @@ -97,23 +100,37 @@ public: */ void show_cursors(bool show = true); + /** + * Moves the cursors to a convenient position in the view. + */ + void centre_cursors(); + + /** + * Returns a reference to the pair of cursors. + */ + CursorPair& cursors(); + /** * Returns a reference to the pair of cursors. */ - std::pair& cursors(); + const CursorPair& cursors() const; const QPoint& hover_point() const; + void normalize_layout(); + signals: void hover_point_changed(); + void signals_moved(); + + void selection_changed(); + private: void get_scroll_layout(double &length, double &offset) const; void update_scroll(); - void reset_signal_layout(); - private: bool eventFilter(QObject *object, QEvent *event); @@ -126,11 +143,12 @@ private slots: void h_scroll_value_changed(int value); void v_scroll_value_changed(int value); + void signals_changed(); void data_updated(); void marker_time_changed(); - void signals_moved(); + void on_signals_moved(); private: SigSession &_session; @@ -148,9 +166,10 @@ private: double _offset; int _v_offset; + bool _updating_scroll; bool _show_cursors; - std::pair _cursors; + CursorPair _cursors; QPoint _hover_point; };