Replaced duplicated code with Trace::get_y

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 38468942a79ad594d7854cd43029aea08e75a3a7..bba84caeaff2eef7444d4e59e8f2ed3b279e2765 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -90,8 +90,7 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
        assert(_data);
        assert(right >= left);
 
-       assert(_view);
-       const int y = _v_offset - _view->v_offset();
+       const int y = get_y();
 
        const double scale = _view->scale();
        assert(scale > 0);

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 700b221b3b9d12c94bc1f9b64cc4877743cc69c4..cb455c5ae3c5246f7111f5fc455032e979688002 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -181,7 +181,6 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
        }
 
        // Iterate through the rows
-       assert(_view);
        int y = get_y();
        pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
 

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 21bd5b95ec630a4b484c367ff8d9fd66ed3384ef..d9987170f06e1f18770fc6509310305196238beb 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -138,9 +138,8 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
        assert(_data);
        assert(right >= left);
 
-       assert(_view);
-       const int y = _v_offset - _view->v_offset();
-
+       const int y = get_y();
+       
        const double scale = _view->scale();
        assert(scale > 0);
 

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index e825337c6d4156fb4e430cfface2a5aab2d0cb08..1231eae4830b61ccc0429566963408e5bcbd175a 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -109,8 +109,7 @@ void Trace::paint_fore(QPainter &p, int left, int right)
 
 void Trace::paint_label(QPainter &p, int right, bool hover)
 {
-       assert(_view);
-       const int y = _v_offset - _view->v_offset();
+       const int y = get_y();
 
        p.setBrush(_colour);
 
@@ -187,6 +186,7 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 
 int Trace::get_y() const
 {
+       assert(_view);
        return _v_offset - _view->v_offset();
 }
 
@@ -194,8 +194,6 @@ QRectF Trace::label_rect(int right)
 {
        using pv::view::View;
 
-       assert(_view);
-
        QFontMetrics m(QApplication::font());
        const QSize text_size(
                m.boundingRect(QRect(), 0, _name).width(),