TimeMarker: Replaced time_changed signal with View::time_item_apparance_changed

[pulseview.git] / pv / view / view.hpp

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index a23f284825d17534b6edcf11df3a2e302610d661..6a249c22db4af0742861d5b07aa6315f36e4c017 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -53,8 +53,8 @@ class View : public QAbstractScrollArea, public RowItemOwner {
 
 private:
        enum StickyEvents {
-               SelectableItemHExtentsChanged = 1,
-               SelectableItemVExtentsChanged = 2
+               RowItemHExtentsChanged = 1,
+               RowItemVExtentsChanged = 2
        };
 
 private:
@@ -159,12 +159,7 @@ public:
        /**
         * Returns a reference to the pair of cursors.
         */
-       CursorPair& cursors();
-
-       /**
-        * Returns a reference to the pair of cursors.
-        */
-       const CursorPair& cursors() const;
+       std::shared_ptr<CursorPair> cursors() const;
 
        const QPoint& hover_point() const;
 
@@ -205,19 +200,17 @@ private:
        /**
         * Satisifies RowItem functionality.
         * @param p the QPainter to paint into.
-        * @param right the x-coordinate of the right edge of the header
-        *      area.
+        * @param rect the rectangle of the header area.
         * @param hover true if the label is being hovered over by the mouse.
         */
-       void paint_label(QPainter &p, int right, bool hover);
+       void paint_label(QPainter &p, const QRect &rect, bool hover);
 
        /**
         * Computes the outline rectangle of a label.
-        * @param right the x-coordinate of the right edge of the header
-        *      area.
+        * @param rect the rectangle of the header area.
         * @return Returns the rectangle of the signal label.
         */
-       QRectF label_rect(int right);
+       QRectF label_rect(const QRectF &rect);
 
        static bool add_channels_to_owner(
                const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
@@ -238,7 +231,8 @@ private:
        void resizeEvent(QResizeEvent *e);
 
 public:
-       void appearance_changed(bool label, bool content);
+       void row_item_appearance_changed(bool label, bool content);
+       void time_item_appearance_changed(bool label, bool content);
 
        void extents_changed(bool horz, bool vert);
 
@@ -250,8 +244,6 @@ private Q_SLOTS:
        void signals_changed();
        void data_updated();
 
-       void marker_time_changed();
-
        void on_signals_moved();
 
        void process_sticky_events();
@@ -279,7 +271,7 @@ private:
        unsigned int tick_prefix_;
 
        bool show_cursors_;
-       CursorPair cursors_;
+       std::shared_ptr<CursorPair> cursors_;
 
        QPoint hover_point_;