X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=7108638588b054a42562b556984236302704c6a9;hb=18f7104f875a71bceeb152398b682737528a4ad7;hp=9f60c1a82ad123897d93b4a6b3360045ffa074ea;hpb=4b4f1c0dc17b481b798e60bbc3fa639c09a9c788;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 9f60c1a8..71086385 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <cassert>
+#include <cmath>
 
 #include "view.h"
 #include "viewport.h"
@@ -28,6 +29,7 @@
 
 #include <QMouseEvent>
 
+using std::abs;
 using std::max;
 using std::min;
 using std::shared_ptr;
@@ -38,7 +40,7 @@ namespace view {
 
 Viewport::Viewport(View &parent) :
 	QWidget(&parent),
-        _view(parent),
+	_view(parent),
 	_mouse_down_valid(false),
 	_pinch_zoom_active(false)
 {
@@ -65,7 +67,7 @@ int Viewport::get_total_height() const
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 	for (const shared_ptr<Trace> t : traces) {
 		assert(t);
-		h = max(t->get_v_offset() + View::SignalHeight, h);
+		h = max(t->v_offset() + View::SignalHeight, h);
 	}
 
 	return h;
@@ -102,7 +104,7 @@ void Viewport::paintEvent(QPaintEvent*)
 
 bool Viewport::event(QEvent *event)
 {
-	switch(event->type()) {
+	switch (event->type()) {
 	case QEvent::TouchBegin:
 	case QEvent::TouchUpdate:
 	case QEvent::TouchEnd:
@@ -121,8 +123,7 @@ void Viewport::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if (event->button() == Qt::LeftButton)
-	{
+	if (event->button() == Qt::LeftButton) {
 		_mouse_down_point = event->pos();
 		_mouse_down_offset = _view.offset();
 		_mouse_down_valid = true;
@@ -134,18 +135,15 @@ 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 (! _mouse_down_valid) {
+	if (event->buttons() & Qt::LeftButton) {
+		if (!_mouse_down_valid) {
 			_mouse_down_point = event->pos();
 			_mouse_down_offset = _view.offset();
 			_mouse_down_valid = true;