Moved signal margin out of signal rendering into initial layout

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index cf3f3e5a58dd076b1a58a9bfd39a3e93bf092de4..b2302e9e8cc75be8dd9a0aaca05d24a0b02e62d2 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -32,7 +32,6 @@ using namespace std;
 namespace pv {
 namespace view {
 
-const float LogicSignal::Margin = 10.0f;
 const float LogicSignal::Oversampling = 2.0f;
 
 const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
@@ -73,8 +72,8 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
        assert(scale > 0);
        assert(_data);
 
-       const float high_offset = rect.top() + Margin + 0.5f;
-       const float low_offset = rect.bottom() - Margin + 0.5f;
+       const float high_offset = rect.top() + 0.5f;
+       const float low_offset = rect.bottom() + 0.5f;
 
        const deque< shared_ptr<pv::LogicDataSnapshot> > &snapshots =
                _data->get_snapshots();
@@ -151,7 +150,7 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 
 int LogicSignal::get_nominal_offset(const QRect &rect) const
 {
-       return rect.bottom() - Margin;
+       return rect.bottom();
 }
 
 } // namespace view