CursorHeader: Handle all TimeItems instead of TimeMarkers

[pulseview.git] / pv / view / cursorheader.cpp

diff --git a/pv/view/cursorheader.cpp b/pv/view/cursorheader.cpp
index 3f25e2123b5aa87043d53285ebcffde4353a130d..22c1259f99622fb94d53d74ab41098f0ff265ac7 100644 (file)
--- a/pv/view/cursorheader.cpp
+++ b/pv/view/cursorheader.cpp
@@ -18,18 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursorheader.h"
+#include "cursorheader.hpp"
 
-#include "ruler.h"
-#include "view.h"
+#include "ruler.hpp"
+#include "view.hpp"
 
 #include <QApplication>
 #include <QFontMetrics>
 #include <QMouseEvent>
 
-#include <pv/widgets/popup.h>
+#include <pv/widgets/popup.hpp>
 
 using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -59,9 +60,9 @@ QSize CursorHeader::sizeHint() const
 
 void CursorHeader::clear_selection()
 {
-       CursorPair &cursors = view_.cursors();
-       cursors.first()->select(false);
-       cursors.second()->select(false);
+       const vector< shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto &i : items)
+               i->select(false);
        update();
 }
 
@@ -70,17 +71,14 @@ void CursorHeader::paintEvent(QPaintEvent*)
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
 
-       unsigned int prefix = pv::view::Ruler::calculate_tick_spacing(
-               p, view_.scale(), view_.offset()).second;
+       // The cursor labels are not drawn with the arrows exactly on the
+       // bottom line of the widget, because then the selection shadow
+       // would be clipped away.
+       const QRect r = rect().adjusted(0, 0, 0, -BaselineOffset);
 
        // Draw the cursors
-       if (view_.cursors_shown()) {
-               // The cursor labels are not drawn with the arrows exactly on the
-               // bottom line of the widget, because then the selection shadow
-               // would be clipped away.
-               const QRect r = rect().adjusted(0, 0, 0, -BaselineOffset);
-               view_.cursors().draw_markers(p, r, prefix);
-       }
+       if (view_.cursors_shown())
+               view_.cursors()->draw_markers(p, r);
 }
 
 void CursorHeader::mouseMoveEvent(QMouseEvent *e)
@@ -92,11 +90,15 @@ void CursorHeader::mouseMoveEvent(QMouseEvent *e)
                QApplication::startDragDistance())
                return;
 
+       // Do the drag
        dragging_ = true;
 
-       if (shared_ptr<TimeMarker> m = grabbed_marker_.lock())
-               m->set_time(view_.offset() +
-                       ((double)e->x() + 0.5) * view_.scale());
+       const int delta = e->pos().x() - mouse_down_point_.x();
+       const vector< shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto &i : items)
+               if (i->dragging())
+                       i->set_time(view_.offset() +
+                               (i->drag_point().x() + delta) * view_.scale());
 }
 
 void CursorHeader::mousePressEvent(QMouseEvent *e)
@@ -104,22 +106,21 @@ void CursorHeader::mousePressEvent(QMouseEvent *e)
        if (e->buttons() & Qt::LeftButton) {
                mouse_down_point_ = e->pos();
 
-               grabbed_marker_.reset();
+               mouse_down_item_.reset();
 
                clear_selection();
 
-               if (view_.cursors_shown()) {
-                       CursorPair &cursors = view_.cursors();
-                       if (cursors.first()->get_label_rect(
-                               rect()).contains(e->pos()))
-                               grabbed_marker_ = cursors.first();
-                       else if (cursors.second()->get_label_rect(
-                               rect()).contains(e->pos()))
-                               grabbed_marker_ = cursors.second();
-               }
+               const vector< shared_ptr<TimeItem> > items(view_.time_items());
+               for (auto &i : items)
+                       if (i && i->label_rect(rect()).contains(e->pos())) {
+                               mouse_down_item_ = i;
+                               break;
+                       }
 
-               if (shared_ptr<TimeMarker> m = grabbed_marker_.lock())
-                       m->select();
+               if (mouse_down_item_) {
+                       mouse_down_item_->select();
+                       mouse_down_item_->drag();
+               }
 
                selection_changed();
        }
@@ -129,16 +130,20 @@ void CursorHeader::mouseReleaseEvent(QMouseEvent *)
 {
        using pv::widgets::Popup;
 
-       if (!dragging_)
-               if (shared_ptr<TimeMarker> m = grabbed_marker_.lock()) {
-                       Popup *const p = m->create_popup(&view_);
-                       const QPoint arrpos(m->get_x(), height() - BaselineOffset);
-                       p->set_position(mapToGlobal(arrpos), Popup::Bottom);
-                       p->show();
-               }
+       if (!dragging_ && mouse_down_item_) {
+               Popup *const p = mouse_down_item_->create_popup(&view_);
+               const QPoint arrpos(mouse_down_item_->get_x(),
+                       height() - BaselineOffset);
+               p->set_position(mapToGlobal(arrpos), Popup::Bottom);
+               p->show();
+       }
 
        dragging_ = false;
-       grabbed_marker_.reset();
+       mouse_down_item_.reset();
+
+       const vector< shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto &i : items)
+               i->drag_release();
 }
 
 } // namespace view