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 f8d568109f3c198f78e145ba0bdc25be041779b7..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,6 +28,7 @@
 
 #include <QMouseEvent>
 
+using std::abs;
 using std::max;
 using std::min;
 using std::shared_ptr;
@@ -36,8 +39,12 @@ 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);
@@ -94,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() *
@@ -140,6 +180,53 @@ 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());