X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=4b5fe245e0c11a9c6af77fdd038201d4427e997e;hp=971eb755228f978a1355677adbfb9d6f5668615d;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=c9743553584975b338890c16ef22943d7beaacdd

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 971eb755..4b5fe245 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,13 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
 #include <cmath>
 #include <algorithm>
+#include <limits>
 
 #include "signal.hpp"
 #include "view.hpp"
@@ -31,22 +31,23 @@
 
 #include <QMouseEvent>
 
+#include <QDebug>
+
 using std::abs;
 using std::back_inserter;
 using std::copy;
-using std::max;
-using std::min;
-using std::none_of;
+using std::dynamic_pointer_cast;
+using std::none_of; // Used in assert()s.
 using std::shared_ptr;
 using std::stable_sort;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 Viewport::Viewport(View &parent) :
 	ViewWidget(parent),
-	mouse_down_valid_(false),
 	pinch_zoom_active_(false)
 {
 	setAutoFillBackground(true);
@@ -55,17 +56,51 @@ Viewport::Viewport(View &parent) :
 
 shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 {
+	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
 	const vector< shared_ptr<ViewItem> > items(this->items());
 	for (auto i = items.rbegin(); i != items.rend(); i++)
-		if ((*i)->enabled() &&
-			(*i)->hit_box_rect(rect()).contains(pt))
+		if ((*i)->enabled() && (*i)->hit_box_rect(pp).contains(pt))
 			return *i;
 	return nullptr;
 }
 
+void Viewport::item_hover(const shared_ptr<ViewItem> &item)
+{
+	if (item && item->is_draggable())
+		setCursor(dynamic_pointer_cast<RowItem>(item) ?
+			Qt::SizeVerCursor : Qt::SizeHorCursor);
+	else
+		unsetCursor();
+}
+
+void Viewport::drag()
+{
+	drag_offset_ = view_.offset();
+	drag_v_offset_ = view_.owner_visual_v_offset();
+}
+
+void Viewport::drag_by(const QPoint &delta)
+{
+	if (drag_offset_ == boost::none)
+		return;
+
+	view_.set_scale_offset(view_.scale(),
+		(*drag_offset_ - delta.x() * view_.scale()));
+
+	view_.set_v_offset(-drag_v_offset_ - delta.y());
+}
+
+void Viewport::drag_release()
+{
+	drag_offset_ = boost::none;
+}
+
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
-	vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+	vector< shared_ptr<ViewItem> > items;
+	const vector< shared_ptr<ViewItem> > view_items(
+		view_.list_by_type<ViewItem>());
+	copy(view_items.begin(), view_items.end(), back_inserter(items));
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	copy(time_items.begin(), time_items.end(), back_inserter(items));
 	return items;
@@ -85,16 +120,15 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 	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_offset0_ = (view_.offset() + view_.scale() * touchPoint0.pos().x()).convert_to<double>();
+		pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to<double>();
 		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;
+		const double scale =
+			fabs((pinch_offset1_ - pinch_offset0_) / w);
 		double offset = pinch_offset0_ - touchPoint0.pos().x() * scale;
 		if (scale > 0)
 			view_.set_scale_offset(scale, offset);
@@ -105,13 +139,12 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 		if (touchPoint0.state() & Qt::TouchPointReleased) {
 			// Primary touch released
-			mouse_down_valid_ = false;
+			drag_release();
 		} 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;
+			drag();
 		}
 	}
 
@@ -120,13 +153,13 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+	vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
 	assert(none_of(row_items.begin(), row_items.end(),
 		[](const shared_ptr<RowItem> &r) { return !r; }));
 
 	stable_sort(row_items.begin(), row_items.end(),
 		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-			return a->visual_v_offset() < b->visual_v_offset(); });
+			return a->point(QRect()).y() < b->point(QRect()).y(); });
 
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	assert(none_of(time_items.begin(), time_items.end(),
@@ -149,49 +182,14 @@ void Viewport::paintEvent(QPaintEvent*)
 
 	for (const shared_ptr<RowItem> r : row_items)
 		r->paint_fore(p, pp);
+
+	p.setRenderHint(QPainter::Antialiasing, false);
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_fore(p, pp);
 
 	p.end();
 }
 
-void Viewport::mousePressEvent(QMouseEvent *event)
-{
-	assert(event);
-
-	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 (!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() *
-			view_.scale());
-	}
-}
-
 void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 {
 	assert(event);
@@ -207,15 +205,22 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	assert(event);
 
 	if (event->orientation() == Qt::Vertical) {
-		// Vertical scrolling is interpreted as zooming in/out
-		view_.zoom(event->delta() / 120, event->x());
+		if (event->modifiers() & Qt::ControlModifier) {
+			// Vertical scrolling with the control key pressed
+			// is intrepretted as vertical scrolling
+			view_.set_v_offset(-view_.owner_visual_v_offset() -
+				(event->delta() * height()) / (8 * 120));
+		} else {
+			// Vertical scrolling is interpreted as zooming in/out
+			view_.zoom(event->delta() / 120, event->x());
+		}
 	} else if (event->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
-				       event->delta() * view_.scale()
-				       + view_.offset());
+			event->delta() * view_.scale() + view_.offset());
 	}
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv