X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=e0add7aaedc64e7a116ea2bc4229dd4e25ab6583;hp=e559a4a45c50da008bc8ab234c5f693e417c6f20;hb=46a0cadc74ca39a7bb8b3a4a4622ab7788a28f3b;hpb=ff008de665c7990d5f3408f918ff090d8e6c60b2 diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index e559a4a4..e0add7aa 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -22,13 +22,23 @@ #include #include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include "analogsignal.hpp" #include "pv/data/analog.hpp" -#include "pv/data/analogsnapshot.hpp" +#include "pv/data/analogsegment.hpp" #include "pv/view/view.hpp" -#include +#include using std::max; using std::make_pair; @@ -41,8 +51,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,21 +58,32 @@ const QColor AnalogSignal::SignalColours[4] = { QColor(0x4E, 0x9A, 0x06) // Green }; +const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100); +const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100); + const float AnalogSignal::EnvelopeThreshold = 256.0f; +const int AnalogSignal::MaximumVDivs = 10; +const int AnalogSignal::MinScaleIndex = -6; +const int AnalogSignal::MaxScaleIndex = 7; + +const int AnalogSignal::InfoTextMarginRight = 20; +const int AnalogSignal::InfoTextMarginBottom = 5; + AnalogSignal::AnalogSignal( pv::Session &session, shared_ptr channel, 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,23 +96,45 @@ shared_ptr AnalogSignal::analog_data() const return data_; } -void AnalogSignal::set_scale(float scale) +std::pair AnalogSignal::v_extents() const +{ + const int h = vdivs_ * div_height_; + return make_pair(-h, h); +} + +int AnalogSignal::scale_handle_offset() const { - scale_ = scale; + const int h = vdivs_ * div_height_; + + return ((scale_index_drag_offset_ - scale_index_) * + h / 4) - h / 2; } -std::pair AnalogSignal::v_extents() const +void AnalogSignal::scale_handle_dragged(int offset) { - return make_pair(-NominalHeight / 2, NominalHeight / 2); + const int h = vdivs_ * div_height_; + + scale_index_ = scale_index_drag_offset_ - + (offset + h / 2) / (h / 4); + + update_scale(); } -void AnalogSignal::paint_back(QPainter &p, const RowItemPaintParams &pp) +void AnalogSignal::scale_handle_drag_release() { - if (channel_->enabled()) + scale_index_drag_offset_ = scale_index_; + update_scale(); +} + +void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) +{ + if (channel_->enabled()) { + Trace::paint_back(p, pp); paint_axis(p, pp, get_visual_y()); + } } -void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) +void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { assert(data_); assert(owner_); @@ -103,45 +144,96 @@ void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) if (!channel_->enabled()) return; - const deque< shared_ptr > &snapshots = - data_->analog_snapshots(); - if (snapshots.empty()) + paint_grid(p, y, pp.left(), pp.right()); + + const deque< shared_ptr > &segments = + data_->analog_segments(); + if (segments.empty()) return; - const shared_ptr &snapshot = - snapshots.front(); + const shared_ptr &segment = + segments.front(); const double pixels_offset = pp.pixels_offset(); - const double samplerate = snapshot->samplerate(); - const double start_time = snapshot->start_time(); - const int64_t last_sample = snapshot->get_sample_count() - 1; + 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) - paint_trace(p, snapshot, y, pp.left(), + paint_trace(p, segment, y, pp.left(), start_sample, end_sample, pixels_offset, samples_per_pixel); else - paint_envelope(p, snapshot, y, pp.left(), + paint_envelope(p, segment, y, pp.left(), start_sample, end_sample, pixels_offset, samples_per_pixel); } +void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp) +{ + if (!enabled()) + return; + + const int y = get_visual_y(); + + // Show the info section on the right side of the trace + const QString infotext = QString("%1 V/div").arg(resolution_); + + p.setPen(colour_); + p.setFont(QApplication::font()); + + const QRectF bounding_rect = QRectF(pp.left(), + y + v_extents().first, + pp.width() - InfoTextMarginRight, + v_extents().second - v_extents().first - InfoTextMarginBottom); + + p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext); +} + +void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) +{ + p.setRenderHint(QPainter::Antialiasing, false); + + p.setPen(QPen(GridMajorColor, 1, Qt::DashLine)); + for (int i = 1; i <= vdivs_; i++) { + const float 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, 1, Qt::DashLine)); + for (int i = 0; i < vdivs_; i++) { + const float 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)); + } + + p.setRenderHint(QPainter::Antialiasing, true); +} + void AnalogSignal::paint_trace(QPainter &p, - const shared_ptr &snapshot, + 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 int64_t sample_count = end - start; - const float *const samples = snapshot->get_samples(start, end); + const float *const samples = segment->get_samples(start, end); assert(samples); p.setPen(colour_); @@ -163,14 +255,14 @@ void AnalogSignal::paint_trace(QPainter &p, } void AnalogSignal::paint_envelope(QPainter &p, - const shared_ptr &snapshot, + 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) { - using pv::data::AnalogSnapshot; + using pv::data::AnalogSegment; - AnalogSnapshot::EnvelopeSection e; - snapshot->get_envelope_section(e, start, end, samples_per_pixel); + AnalogSegment::EnvelopeSection e; + segment->get_envelope_section(e, start, end, samples_per_pixel); if (e.length < 2) return; @@ -181,10 +273,10 @@ void AnalogSignal::paint_envelope(QPainter &p, QRectF *const rects = new QRectF[e.length]; QRectF *rect = rects; - for(uint64_t sample = 0; sample < e.length-1; sample++) { + for (uint64_t sample = 0; sample < e.length-1; sample++) { const float x = ((e.scale * sample + e.start) / samples_per_pixel - pixels_offset) + left; - const AnalogSnapshot::EnvelopeSample *const s = + const AnalogSegment::EnvelopeSample *const s = e.samples + sample; // We overlap this sample with the next so that vertical @@ -193,9 +285,9 @@ void AnalogSignal::paint_envelope(QPainter &p, const float t = y - min(s->min, (s+1)->max) * scale_; float h = b - t; - if(h >= 0.0f && h <= 1.0f) + if (h >= 0.0f && h <= 1.0f) h = 1.0f; - if(h <= 0.0f && h >= -1.0f) + if (h <= 0.0f && h >= -1.0f) h = -1.0f; *rect++ = QRectF(x, t, 1.0f, h); @@ -207,5 +299,79 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } +float AnalogSignal::get_resolution(int scale_index) +{ + 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]; +} + +void AnalogSignal::update_scale() +{ + resolution_ = get_resolution(scale_index_); + scale_ = div_height_ / resolution_; +} + +void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) +{ + // Add the standard options + Signal::populate_popup_form(parent, form); + + QFormLayout *const layout = new QFormLayout; + + // Add the number of vdivs + 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))); + layout->addRow(tr("Number of vertical divs"), vdiv_sb); + + // Add the vertical resolution + resolution_cb_ = new QComboBox(parent); + + for (int i = MinScaleIndex; i < MaxScaleIndex; i++) { + const QString label = QString("%1").arg(get_resolution(i)); + resolution_cb_->insertItem(0, label, QVariant(i)); + } + + const int cur_idx = resolution_cb_->findData(QVariant(scale_index_)); + resolution_cb_->setCurrentIndex(cur_idx); + + connect(resolution_cb_, SIGNAL(currentIndexChanged(int)), + this, SLOT(on_resolution_changed(int))); + + QGridLayout *const vdiv_layout = new QGridLayout; + QLabel *const vdiv_unit = new QLabel(tr("V/div")); + vdiv_layout->addWidget(resolution_cb_, 0, 0); + vdiv_layout->addWidget(vdiv_unit, 0, 1); + + layout->addRow(tr("Vertical resolution"), vdiv_layout); + + form->addRow(layout); +} + +void AnalogSignal::on_vdivs_changed(int vdivs) +{ + vdivs_ = vdivs; + + if (owner_) + owner_->extents_changed(false, true); +} + +void AnalogSignal::on_resolution_changed(int index) +{ + scale_index_ = resolution_cb_->itemData(index).toInt(); + update_scale(); + + if (owner_) + owner_->row_item_appearance_changed(false, true); +} + } // namespace view } // namespace pv