X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=1b4e32080e6107ea41041e37795333489d589fa5;hb=4cffac16f3fb0ced3450c7df9c02b2d35bcd01e1;hp=683757d1a52cffc1f781bee07d73ca3b16f8b43c;hpb=69e33a1b71599bbe35176ef7a77b58793a7d6ca2;p=pulseview.git diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 683757d..1b4e320 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -25,6 +25,10 @@ #include #include +#include +#include +#include + #include "analogsignal.hpp" #include "pv/data/analog.hpp" #include "pv/data/analogsegment.hpp" @@ -43,8 +47,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 @@ -52,22 +54,27 @@ 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; +const int AnalogSignal::MaximumVDivs = 10; + AnalogSignal::AnalogSignal( pv::Session &session, shared_ptr channel, shared_ptr data) : Signal(session, channel), data_(data), - scale_index_(0), - scale_index_drag_offset_(0) -{ - 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 @@ -82,31 +89,40 @@ shared_ptr AnalogSignal::analog_data() const std::pair AnalogSignal::v_extents() const { - const int h = NominalHeight / 2; + const int h = vdivs_ * div_height_; return make_pair(-h, h); } int AnalogSignal::scale_handle_offset() const { + const int h = vdivs_ * div_height_; + return ((scale_index_drag_offset_ - scale_index_) * - NominalHeight / 4) - NominalHeight / 2; + h / 4) - h / 2; } void AnalogSignal::scale_handle_dragged(int offset) { + const int h = vdivs_ * div_height_; + scale_index_ = scale_index_drag_offset_ - - (offset + NominalHeight / 2) / (NominalHeight / 4); + (offset + h / 2) / (h / 4); + + update_scale(); } void AnalogSignal::scale_handle_drag_release() { 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) @@ -119,6 +135,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()) @@ -150,12 +168,35 @@ 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, const double pixels_offset, const double samples_per_pixel) { - const float scale = this->scale(); const int64_t sample_count = end - start; const float *const samples = segment->get_samples(start, end); @@ -170,7 +211,7 @@ void AnalogSignal::paint_trace(QPainter &p, const float x = (sample / samples_per_pixel - pixels_offset) + left; *point++ = QPointF(x, - y - samples[sample - start] * scale); + y - samples[sample - start] * scale_); } p.drawPolyline(points, point - points); @@ -186,8 +227,6 @@ void AnalogSignal::paint_envelope(QPainter &p, { using pv::data::AnalogSegment; - const float scale = this->scale(); - AnalogSegment::EnvelopeSection e; segment->get_envelope_section(e, start, end, samples_per_pixel); @@ -208,8 +247,8 @@ void AnalogSignal::paint_envelope(QPainter &p, // We overlap this sample with the next so that vertical // gaps do not appear during steep rising or falling edges - const float b = y - max(s->max, (s+1)->min) * scale; - const float t = y - min(s->min, (s+1)->max) * scale; + const float b = y - max(s->max, (s+1)->min) * scale_; + const float t = y - min(s->min, (s+1)->max) * scale_; float h = b - t; if (h >= 0.0f && h <= 1.0f) @@ -226,15 +265,41 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } -float AnalogSignal::scale() const +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)); - return powf(10.0f, d.quot - offset) * seq[d.rem]; + + resolution_ = powf(10.0f, d.quot - offset) * seq[d.rem]; + scale_ = div_height_ / resolution_; +} + +void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) +{ + // Add the standard options + Signal::populate_popup_form(parent, form); + + // Add the vdiv settings + QSpinBox *vdiv_sb = new QSpinBox(parent); + vdiv_sb->setRange(1, MaximumVDivs); + vdiv_sb->setValue(vdivs_); + connect(vdiv_sb, SIGNAL(valueChanged(int)), + this, SLOT(on_vdivs_changed(int))); + form->addRow(tr("Number of vertical divs"), vdiv_sb); } +void AnalogSignal::on_vdivs_changed(int vdivs) +{ + vdivs_ = vdivs; + + if (owner_) + owner_->extents_changed(false, true); +} + + } // namespace view } // namespace pv