X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=717360b852fa65b9aedf5a513f578d47a45e1e40;hp=2967147f63a5145774df02aa7bcae1dae558865b;hb=303d6ea697468ee79f4c3f73afc57db0ce6319a8;hpb=f1626bb80080435e306c9a6c5d6ff20dd6dc9e57 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 2967147f..717360b8 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -60,8 +60,6 @@ using sigrok::TriggerMatchType; namespace pv { namespace view { -const int LogicSignal::SignalHeight = 30; - const float LogicSignal::Oversampling = 2.0f; const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80); @@ -103,6 +101,7 @@ LogicSignal::LogicSignal( shared_ptr channel, shared_ptr data) : Signal(session, channel), + signal_height_(QFontMetrics(QApplication::font()).height() * 2), device_(device), data_(data), trigger_none_(nullptr), @@ -149,17 +148,19 @@ std::pair LogicSignal::v_extents() const { const int signal_margin = QFontMetrics(QApplication::font()).height() / 2; - return make_pair(-SignalHeight - signal_margin, signal_margin); + return make_pair(-signal_height_ - signal_margin, signal_margin); } int LogicSignal::scale_handle_offset() const { - return SignalHeight; + return -signal_height_; } void LogicSignal::scale_handle_dragged(int offset) { - (void)offset; + const int font_height = QFontMetrics(QApplication::font()).height(); + const int units = (-offset / font_height); + signal_height_ = ((units < 1) ? 1 : units) * font_height; } void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) @@ -183,7 +184,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) if (!channel_->enabled()) return; - const float high_offset = y - SignalHeight + 0.5f; + const float high_offset = y - signal_height_ + 0.5f; const float low_offset = y + 0.5f; const deque< shared_ptr > &segments = @@ -270,7 +271,7 @@ void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp) const QSize size = pixmap->size(); const QPoint point( pp.right() - size.width() - pad * 2, - y - (SignalHeight + size.height()) / 2); + y - (signal_height_ + size.height()) / 2); p.setPen(QPen(TriggerMarkerBackgroundColour.darker())); p.setBrush(TriggerMarkerBackgroundColour);