Use static signal offsets instead of offsets calculated on-the-fly

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 284bb37284cfe7e1a49ce6b11d8662f28d387df8..125d3c2430ba868d95c0f535e162d9279dda9e90 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -21,7 +21,7 @@
 #include "header.h"
 #include "view.h"
 
-#include "../signal.h"
+#include "signal.h"
 #include "../sigsession.h"
 
 #include <assert.h>
@@ -64,18 +64,17 @@ void Header::paintEvent(QPaintEvent *event)
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
 
-       int offset = -_view.v_offset();
+       const int v_offset = _view.v_offset();
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
        {
                assert(s);
 
                const QRect signal_heading_rect(
-                       0, offset, w, View::SignalHeight);
+                       0, s->get_v_offset() - v_offset,
+                       w, View::SignalHeight);
 
                s->paint_label(painter, signal_heading_rect,
                        s->pt_in_label_rect(signal_heading_rect, _mouse_point));
-
-               offset += View::SignalHeight;
        }
 
        painter.end();
@@ -100,13 +99,14 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
        const vector< shared_ptr<Signal> > &sigs =
                _view.session().get_signals();
 
-       int offset = -_view.v_offset();
+       const int v_offset = _view.v_offset();
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
        {
                assert(s);
 
                const QRect signal_heading_rect(
-                       0, offset, w, View::SignalHeight);
+                       0, s->get_v_offset() - v_offset,
+                       w, View::SignalHeight);
 
                if(s->pt_in_label_rect(signal_heading_rect, _mouse_point)) {
                        QMenu menu(this);
@@ -119,14 +119,12 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
                        break;
                }
-
-               offset += View::SignalHeight;
        }
 }
 
 void Header::on_action_set_name_triggered()
 {
-       boost::shared_ptr<Signal> context_signal = _context_signal;
+       shared_ptr<view::Signal> context_signal = _context_signal;
        if(!context_signal)
                return;
 
@@ -139,7 +137,7 @@ void Header::on_action_set_name_triggered()
 
 void Header::on_action_set_colour_triggered()
 {
-       boost::shared_ptr<Signal> context_signal = _context_signal;
+       shared_ptr<view::Signal> context_signal = _context_signal;
        if(!context_signal)
                return;