Fix two errors with clang 3.6.

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index a06c8888761f6c1237ffde3c5aecc8ceb2ff5df1..b141c38ae35ab29b2b44233bff6e8d13be16de3d 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <cassert>
+
 #include "view.h"
 #include "viewport.h"
 
@@ -26,18 +28,23 @@
 
 #include <QMouseEvent>
 
-#include <boost/foreach.hpp>
-
-using namespace boost;
-using namespace std;
+using std::abs;
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace view {
 
 Viewport::Viewport(View &parent) :
        QWidget(&parent),
-        _view(parent)
+       _view(parent),
+       _mouse_down_valid(false),
+       _pinch_zoom_active(false)
 {
+       setAttribute(Qt::WA_AcceptTouchEvents, true);
+
        setMouseTracking(true);
        setAutoFillBackground(true);
        setBackgroundRole(QPalette::Base);
@@ -47,13 +54,17 @@ Viewport::Viewport(View &parent) :
 
        connect(&_view, SIGNAL(signals_moved()),
                this, SLOT(on_signals_moved()));
+
+       // Trigger the initial event manually. The default device has signals
+       // which were created before this object came into being
+       on_signals_changed();
 }
 
 int Viewport::get_total_height() const
 {
        int h = 0;
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+       for (const shared_ptr<Trace> t : traces) {
                assert(t);
                h = max(t->get_v_offset() + View::SignalHeight, h);
        }
@@ -72,16 +83,16 @@ void Viewport::paintEvent(QPaintEvent*)
                _view.cursors().draw_viewport_background(p, rect());
 
        // Plot the signal
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
        {
                assert(t);
                t->paint_back(p, 0, width());
        }
 
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
                t->paint_mid(p, 0, width());
 
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
                t->paint_fore(p, 0, width());
 
        if (_view.cursors_shown())
@@ -90,20 +101,53 @@ void Viewport::paintEvent(QPaintEvent*)
        p.end();
 }
 
+bool Viewport::event(QEvent *event)
+{
+       switch (event->type()) {
+       case QEvent::TouchBegin:
+       case QEvent::TouchUpdate:
+       case QEvent::TouchEnd:
+               if (touchEvent(static_cast<QTouchEvent *>(event)))
+                       return true;
+               break;
+
+       default:
+               break;
+       }
+
+       return QWidget::event(event);
+}
+
 void Viewport::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
 
-       _mouse_down_point = event->pos();
-       _mouse_down_offset = _view.offset();
+       if (event->button() == Qt::LeftButton) {
+               _mouse_down_point = event->pos();
+               _mouse_down_offset = _view.offset();
+               _mouse_down_valid = true;
+       }
+}
+
+void Viewport::mouseReleaseEvent(QMouseEvent *event)
+{
+       assert(event);
+
+       if (event->button() == Qt::LeftButton)
+               _mouse_down_valid = false;
 }
 
 void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
        assert(event);
 
-       if (event->buttons() & Qt::LeftButton)
-       {
+       if (event->buttons() & Qt::LeftButton) {
+               if (!_mouse_down_valid) {
+                       _mouse_down_point = event->pos();
+                       _mouse_down_offset = _view.offset();
+                       _mouse_down_valid = true;
+               }
+
                _view.set_scale_offset(_view.scale(),
                        _mouse_down_offset +
                        (_mouse_down_point - event->pos()).x() *
@@ -111,6 +155,16 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
        }
 }
 
+void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
+{
+       assert(event);
+
+       if (event->buttons() & Qt::LeftButton)
+               _view.zoom(2.0, event->x());
+       else if (event->buttons() & Qt::RightButton)
+               _view.zoom(-2.0, event->x());
+}
+
 void Viewport::wheelEvent(QWheelEvent *event)
 {
        assert(event);
@@ -126,10 +180,57 @@ void Viewport::wheelEvent(QWheelEvent *event)
        }
 }
 
+bool Viewport::touchEvent(QTouchEvent *event)
+{
+       QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
+
+       if (touchPoints.count() != 2) {
+               _pinch_zoom_active = false;
+               return false;
+       }
+
+       const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
+       const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
+
+       if (!_pinch_zoom_active ||
+           (event->touchPointStates() & Qt::TouchPointPressed)) {
+               _pinch_offset0 = _view.offset() + _view.scale() * touchPoint0.pos().x();
+               _pinch_offset1 = _view.offset() + _view.scale() * touchPoint1.pos().x();
+               _pinch_zoom_active = true;
+       }
+
+       double w = touchPoint1.pos().x() - touchPoint0.pos().x();
+       if (abs(w) >= 1.0) {
+               double scale = (_pinch_offset1 - _pinch_offset0) / w;
+               if (scale < 0)
+                       scale = -scale;
+               double offset = _pinch_offset0 - touchPoint0.pos().x() * scale;
+               if (scale > 0)
+                       _view.set_scale_offset(scale, offset);
+       }
+
+       if (event->touchPointStates() & Qt::TouchPointReleased) {
+               _pinch_zoom_active = false;
+
+               if (touchPoint0.state() & Qt::TouchPointReleased) {
+                       // Primary touch released
+                       _mouse_down_valid = false;
+               } else {
+                       // Update the mouse down fields so that continued
+                       // dragging with the primary touch will work correctly
+                       _mouse_down_point = touchPoint0.pos().toPoint();
+                       _mouse_down_offset = _view.offset();
+                       _mouse_down_valid = true;
+               }
+       }
+
+       return true;
+}
+
 void Viewport::on_signals_changed()
 {
        const vector< shared_ptr<Trace> > traces(_view.get_traces());
-       BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+       for (shared_ptr<Trace> t : traces) {
                assert(t);
                connect(t.get(), SIGNAL(visibility_changed()),
                        this, SLOT(update()));