X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=b92792d7f6e630f431f8c14430a20bcec89ea3f5;hp=0ac6311116610356b12f0663fa0fc933539f801e;hb=834a4f1bb78a4098c59954500698bdd13060c219;hpb=f32905530347e1020d5ce7959123cf797c9a4829 diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 0ac63111..b92792d7 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -22,6 +22,10 @@ #include #include +#include +#include + +#include #include "analogsignal.hpp" #include "pv/data/analog.hpp" @@ -41,8 +45,6 @@ using sigrok::Channel; namespace pv { namespace view { -const int AnalogSignal::NominalHeight = 80; - const QColor AnalogSignal::SignalColours[4] = { QColor(0xC4, 0xA0, 0x00), // Yellow QColor(0x87, 0x20, 0x7A), // Magenta @@ -50,6 +52,9 @@ const QColor AnalogSignal::SignalColours[4] = { QColor(0x4E, 0x9A, 0x06) // Green }; +const QColor AnalogSignal::GridMajorColor = QColor(0xB0, 0xB0, 0xB0); +const QColor AnalogSignal::GridMinorColor = QColor(0xD0, 0xD0, 0xD0); + const float AnalogSignal::EnvelopeThreshold = 256.0f; AnalogSignal::AnalogSignal( @@ -58,13 +63,14 @@ AnalogSignal::AnalogSignal( shared_ptr data) : Signal(session, channel), data_(data), - scale_(1.0f) -{ - colour_ = SignalColours[channel_->index() % countof(SignalColours)]; -} - -AnalogSignal::~AnalogSignal() + scale_index_(4), // 20 per div + scale_index_drag_offset_(0), + div_height_(3 * QFontMetrics(QApplication::font()).height()), + vdivs_(1), + resolution_(0) { + set_colour(SignalColours[channel_->index() % countof(SignalColours)]); + update_scale(); } shared_ptr AnalogSignal::data() const @@ -77,20 +83,42 @@ shared_ptr AnalogSignal::analog_data() const return data_; } -void AnalogSignal::set_scale(float scale) +std::pair AnalogSignal::v_extents() const { - scale_ = scale; + const int h = vdivs_ * div_height_; + return make_pair(-h, h); } -std::pair AnalogSignal::v_extents() const +int AnalogSignal::scale_handle_offset() const +{ + const int h = vdivs_ * div_height_; + + return ((scale_index_drag_offset_ - scale_index_) * + h / 4) - h / 2; +} + +void AnalogSignal::scale_handle_dragged(int offset) +{ + const int h = vdivs_ * div_height_; + + scale_index_ = scale_index_drag_offset_ - + (offset + h / 2) / (h / 4); + + update_scale(); +} + +void AnalogSignal::scale_handle_drag_release() { - return make_pair(-NominalHeight / 2, NominalHeight / 2); + scale_index_drag_offset_ = scale_index_; + update_scale(); } void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - if (channel_->enabled()) + if (channel_->enabled()) { + Trace::paint_back(p, pp); paint_axis(p, pp, get_visual_y()); + } } void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) @@ -103,6 +131,8 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) if (!channel_->enabled()) return; + paint_grid(p, y, pp.left(), pp.right()); + const deque< shared_ptr > &segments = data_->analog_segments(); if (segments.empty()) @@ -112,16 +142,16 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) segments.front(); const double pixels_offset = pp.pixels_offset(); - const double samplerate = segment->samplerate(); - const double start_time = segment->start_time(); + const double samplerate = max(1.0, segment->samplerate()); + const pv::util::Timestamp& start_time = segment->start_time(); const int64_t last_sample = segment->get_sample_count() - 1; const double samples_per_pixel = samplerate * pp.scale(); - const double start = samplerate * (pp.offset() - start_time); - const double end = start + samples_per_pixel * pp.width(); + const pv::util::Timestamp start = samplerate * (pp.offset() - start_time); + const pv::util::Timestamp end = start + samples_per_pixel * pp.width(); - const int64_t start_sample = min(max((int64_t)floor(start), + const int64_t start_sample = min(max(floor(start).convert_to(), (int64_t)0), last_sample); - const int64_t end_sample = min(max((int64_t)ceil(end) + 1, + const int64_t end_sample = min(max((ceil(end) + 1).convert_to(), (int64_t)0), last_sample); if (samples_per_pixel < EnvelopeThreshold) @@ -134,6 +164,30 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) pixels_offset, samples_per_pixel); } +void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) +{ + p.setPen(QPen(GridMajorColor, 0.5, Qt::DashLine)); + for (int i = 1; i <= vdivs_; i++) { + const int dy = i * div_height_; + p.drawLine(QLineF(left, y - dy, right, y - dy)); + p.drawLine(QLineF(left, y + dy, right, y + dy)); + } + + p.setPen(QPen(GridMinorColor, 0.5, Qt::DashLine)); + for (int i = 0; i < vdivs_; i++) { + const int dy = i * div_height_; + const float dy25 = dy + (0.25 * div_height_); + const float dy50 = dy + (0.50 * div_height_); + const float dy75 = dy + (0.75 * div_height_); + p.drawLine(QLineF(left, y - dy25, right, y - dy25)); + p.drawLine(QLineF(left, y + dy25, right, y + dy25)); + p.drawLine(QLineF(left, y - dy50, right, y - dy50)); + p.drawLine(QLineF(left, y + dy50, right, y + dy50)); + p.drawLine(QLineF(left, y - dy75, right, y - dy75)); + p.drawLine(QLineF(left, y + dy75, right, y + dy75)); + } +} + void AnalogSignal::paint_trace(QPainter &p, const shared_ptr &segment, int y, int left, const int64_t start, const int64_t end, @@ -207,5 +261,18 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } +void AnalogSignal::update_scale() +{ + const float seq[] = {1.0f, 2.0f, 5.0f}; + + const int offset = std::numeric_limits::max() / (2 * countof(seq)); + const std::div_t d = std::div( + (int)(scale_index_ + countof(seq) * offset), + countof(seq)); + + resolution_ = powf(10.0f, d.quot - offset) * seq[d.rem]; + scale_ = div_height_ / resolution_; +} + } // namespace view } // namespace pv