X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=37445d96072133e64fe3d90d1798e4840a7d2f9d;hp=69c495e609fafd84b8113e274b3d270305240ff8;hb=a5d93c27b5bd6b95000e29c6cddac56ab254b289;hpb=dc747705ac06c9e9ab582b6b8b7cfc31003128e0 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 69c495e..37445d9 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -41,6 +41,7 @@ using std::deque; using std::max; +using std::make_pair; using std::min; using std::pair; using std::shared_ptr; @@ -58,6 +59,9 @@ using sigrok::TriggerMatchType; namespace pv { namespace view { +const int LogicSignal::SignalHeight = 30; +const int LogicSignal::SignalMargin = 10; + const float LogicSignal::Oversampling = 2.0f; const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80); @@ -120,6 +124,11 @@ shared_ptr LogicSignal::logic_data() const return _data; } +std::pair LogicSignal::v_extents() const +{ + return make_pair(-SignalHeight - SignalMargin, SignalMargin); +} + void LogicSignal::paint_back(QPainter &p, int left, int right) { if (_channel->enabled()) @@ -152,7 +161,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right) if (!_channel->enabled()) return; - const float high_offset = y - View::SignalHeight + 0.5f; + const float high_offset = y - SignalHeight + 0.5f; const float low_offset = y + 0.5f; const deque< shared_ptr > &snapshots =