CursorPair: Derived from TimeItem

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 12b7bc341160b90f391b2c8d3df3056e3696a67f..0370793d0407b9a9d8db11dc55e592f50ef53732 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -38,12 +38,17 @@ namespace view {
 const int CursorPair::DeltaPadding = 8;
 
 CursorPair::CursorPair(View &view) :
+       TimeItem(view),
        first_(new Cursor(view, 0.0)),
-       second_(new Cursor(view, 1.0)),
-       view_(view)
+       second_(new Cursor(view, 1.0))
 {
 }
 
+bool CursorPair::enabled() const
+{
+       return view_.cursors_shown();
+}
+
 shared_ptr<Cursor> CursorPair::first() const
 {
        return first_;
@@ -54,6 +59,17 @@ shared_ptr<Cursor> CursorPair::second() const
        return second_;
 }
 
+QPoint CursorPair::point() const
+{
+       return first_->point();
+}
+
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
+{
+       (void)parent;
+       return nullptr;
+}
+
 QRectF CursorPair::get_label_rect(const QRect &rect) const
 {
        const QSizeF label_size(

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index 84737d21693ffc048e13db86f0abddb8c83f404f..12ed76af9ce18012a74a18456cb889c292163e54 100644 (file)
--- a/pv/view/cursorpair.hpp
+++ b/pv/view/cursorpair.hpp
@@ -32,7 +32,7 @@ class QPainter;
 namespace pv {
 namespace view {
 
-class CursorPair
+class CursorPair : public TimeItem
 {
 private:
        static const int DeltaPadding;
@@ -44,6 +44,12 @@ public:
         */
        CursorPair(View &view);
 
+public:
+       /**
+        * Returns true if the item is visible and enabled.
+        */
+       bool enabled() const;
+
        /**
         * Returns a pointer to the first cursor.
         */
@@ -54,6 +60,10 @@ public:
         */
        std::shared_ptr<Cursor> second() const;
 
+       QPoint point() const;
+
+       pv::widgets::Popup* create_popup(QWidget *parent);
+
 public:
        QRectF get_label_rect(const QRect &rect) const;
 
@@ -69,7 +79,6 @@ public:
 
 private:
        std::shared_ptr<Cursor> first_, second_;
-       const View &view_;
 
        QSizeF text_size_;
 };