X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=a179cef1c6ca572609e12ad10ad3ad2de2eef59e;hp=ac494272de8705522a6c1ca43e073dbd3f9d23d0;hb=5ed05b699e5367bae21828f533e3d169b9bab348;hpb=34ec096859764f71c210ec7c271fcac2b96374cc

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index ac494272..a179cef1 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,13 +14,12 @@
  * 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 <algorithm>
 #include <cassert>
 #include <cmath>
-#include <algorithm>
 #include <limits>
 
 #include "signal.hpp"
@@ -32,20 +31,20 @@
 
 #include <QMouseEvent>
 
+#include <QDebug>
+
 using std::abs;
 using std::back_inserter;
 using std::copy;
 using std::dynamic_pointer_cast;
-using std::max;
-using std::min;
-using std::none_of;
-using std::numeric_limits;
+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),
@@ -60,15 +59,14 @@ 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(pp).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)
+	if (item && item->is_draggable())
 		setCursor(dynamic_pointer_cast<RowItem>(item) ?
 			Qt::SizeVerCursor : Qt::SizeHorCursor);
 	else
@@ -78,6 +76,7 @@ void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 void Viewport::drag()
 {
 	drag_offset_ = view_.offset();
+	drag_v_offset_ = view_.owner_visual_v_offset();
 }
 
 void Viewport::drag_by(const QPoint &delta)
@@ -87,6 +86,8 @@ void Viewport::drag_by(const QPoint &delta)
 
 	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()
@@ -97,7 +98,7 @@ void Viewport::drag_release()
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
 	vector< shared_ptr<ViewItem> > items;
-	const std::vector< shared_ptr<ViewItem> > view_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());
@@ -152,6 +153,12 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
+	typedef void (ViewItem::*LayerPaintFunc)(
+		QPainter &p, ViewItemPaintParams &pp);
+	LayerPaintFunc layer_paint_funcs[] = {
+		&ViewItem::paint_back, &ViewItem::paint_mid,
+		&ViewItem::paint_fore, nullptr};
+
 	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; }));
@@ -167,24 +174,16 @@ void Viewport::paintEvent(QPaintEvent*)
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
-	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
-
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_back(p, pp);
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_back(p, pp);
-
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_mid(p, pp);
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_mid(p, pp);
-
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_fore(p, pp);
+	for (LayerPaintFunc *paint_func = layer_paint_funcs;
+			*paint_func; paint_func++) {
+		ViewItemPaintParams time_pp(rect(), view_.scale(), view_.offset());
+		for (const shared_ptr<TimeItem> t : time_items)
+			(t.get()->*(*paint_func))(p, time_pp);
 
-	p.setRenderHint(QPainter::Antialiasing, false);
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_fore(p, pp);
+		ViewItemPaintParams row_pp(rect(), view_.scale(), view_.offset());
+		for (const shared_ptr<RowItem> r : row_items)
+			(r.get()->*(*paint_func))(p, row_pp);
+	}
 
 	p.end();
 }
@@ -199,29 +198,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 		view_.zoom(-2.0, event->x());
 }
 
-void Viewport::wheelEvent(QWheelEvent *e)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
-	assert(e);
+	assert(event);
 
-	if (e->orientation() == Qt::Vertical)
-	{
-		if (e->modifiers() & Qt::ControlModifier) {
+	if (event->orientation() == Qt::Vertical) {
+		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() -
-				(e->delta() * height()) / (8 * 120));
+				(event->delta() * height()) / (8 * 120));
 		} else {
 			// Vertical scrolling is interpreted as zooming in/out
-			view_.zoom(e->delta() / 120, e->x());
+			view_.zoom(event->delta() / 120, event->x());
 		}
-	}
-	else if (e->orientation() == Qt::Horizontal)
-	{
+	} else if (event->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
-			e->delta() * view_.scale() + view_.offset());
+			event->delta() * view_.scale() + view_.offset());
 	}
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv