Revert "Make traces only selectable in the header area"

This reverts commit 35365c66bf6166c5607f1180016528d996a45b66.

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ee0a4f0e921630b986a090bbdca494fb3849010f..f7e7ebf25b8ec00a351bb415f7fe696de155e8b6 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -91,16 +91,6 @@ bool Trace::is_draggable() const
        return (cursor_pos.x() <= view->header_size().width());
 }
 
-void Trace::select(bool select)
-{
-       // Trace can only be selected if the mouse cursor is in the header area;
-       // as is_draggable() checks the same thing, we re-use it here
-       if (is_draggable() && select)
-               selected_ = true;
-       else
-               selected_ = false;
-}
-
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        const int y = get_visual_y();

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 88e54b1a7edcb37a95045a3f4cf4703a9b9dcbc3..acaa341adbadd55f477e32d1f3e01d9cd4c662f6 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -86,11 +86,6 @@ public:
         */
        bool is_draggable() const;
 
-       /**
-        * Selects or deselects the signal.
-        */
-       void select(bool select = true);
-
        /**
         * Computes the outline rectangle of the viewport hit-box.
         * @param rect the rectangle of the viewport area.

diff --git a/pv/view/viewitem.hpp b/pv/view/viewitem.hpp
index c9da948ed03617778ff7caa7bb29b25c3dcde42f..a4eb6aef30423a79beefa6fa616357cdb8f3a483 100644 (file)
--- a/pv/view/viewitem.hpp
+++ b/pv/view/viewitem.hpp
@@ -167,6 +167,8 @@ protected:
 protected:
        QWidget *context_parent_;
        QPoint drag_point_;
+
+private:
        bool selected_;
 };