X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=43d1175d3bb466c346dbbf1f1a65657fbd8bf203;hp=a78d65541ba6544713793d884bff0c8309002e1c;hb=4bd0ecb8d08b655a4e2a1d60b3166e97b290475c;hpb=78bf7ce5aaa1e02717973dc559c24973a313b541 diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index a78d6554..43d1175d 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -46,7 +47,6 @@ #include -using std::bind; using std::deque; using std::div; using std::div_t; @@ -54,8 +54,8 @@ using std::max; using std::make_pair; using std::min; using std::numeric_limits; +using std::out_of_range; using std::pair; -using std::placeholders::_1; using std::shared_ptr; using std::vector; @@ -77,6 +77,9 @@ const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40 * 256 / 100); const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20 * 256 / 100); const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77); +const QColor AnalogSignal::SamplingPointColourLo = QColor(200, 0, 0, 80 * 256 / 100); +const QColor AnalogSignal::SamplingPointColourNe = QColor(0, 0, 0, 80 * 256 / 100); +const QColor AnalogSignal::SamplingPointColourHi = QColor(0, 200, 0, 80 * 256 / 100); const QColor AnalogSignal::ThresholdColor = QColor(0, 0, 0, 30 * 256 / 100); const QColor AnalogSignal::ThresholdColorLo = QColor(255, 0, 0, 8 * 256 / 100); @@ -113,12 +116,11 @@ AnalogSignal::AnalogSignal( connect(analog_data, SIGNAL(min_max_changed(float, float)), this, SLOT(on_min_max_changed(float, float))); - GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowConversionThresholds, - bind(&AnalogSignal::on_settingViewShowConversionThresholds_changed, this, _1)); + GlobalSettings::add_change_handler(this); GlobalSettings gs; - show_conversion_thresholds_ = - gs.value(GlobalSettings::Key_View_ShowConversionThresholds).toBool(); + conversion_threshold_disp_mode_ = + gs.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt(); div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); @@ -126,6 +128,11 @@ AnalogSignal::AnalogSignal( update_scale(); } +AnalogSignal::~AnalogSignal() +{ + GlobalSettings::remove_change_handler(this); +} + shared_ptr AnalogSignal::data() const { return base_->analog_data(); @@ -201,15 +208,24 @@ void AnalogSignal::scale_handle_drag_release() update_scale(); } +void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value) +{ + if (key == GlobalSettings::Key_View_ConversionThresholdDispMode) + on_settingViewConversionThresholdDispMode_changed(value); +} + void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) { if (!base_->enabled()) return; + bool paint_thr_bg = + conversion_threshold_disp_mode_ == GlobalSettings::ConvThrDispMode_Background; + const vector thresholds = base_->get_conversion_thresholds(); // Only display thresholds if we have some and we show analog samples - if ((thresholds.size() > 0) && show_conversion_thresholds_ && + if ((thresholds.size() > 0) && paint_thr_bg && ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth))) { const int visual_y = get_visual_y(); @@ -219,8 +235,10 @@ void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) // Draw high/neutral/low areas if (thresholds.size() == 2) { - const double thr_lo = visual_y - thresholds[0] * scale_; - const double thr_hi = visual_y - thresholds[1] * scale_; + int thr_lo = visual_y - thresholds[0] * scale_; + int thr_hi = visual_y - thresholds[1] * scale_; + thr_lo = min(max(thr_lo, top), btm); + thr_hi = min(max(thr_hi, top), btm); p.fillRect(QRectF(pp.left(), top, pp.width(), thr_hi - top), QBrush(ThresholdColorHi)); @@ -229,7 +247,8 @@ void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) p.fillRect(QRectF(pp.left(), thr_lo, pp.width(), btm - thr_lo), QBrush(ThresholdColorLo)); } else { - const double thr = visual_y - thresholds[0] * scale_; + int thr = visual_y - thresholds[0] * scale_; + thr = min(max(thr, top), btm); p.fillRect(QRectF(pp.left(), top, pp.width(), thr - top), QBrush(ThresholdColorHi)); @@ -257,18 +276,14 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) if ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth)) { paint_grid(p, y, pp.left(), pp.right()); - const deque< shared_ptr > &segments = - base_->analog_data()->analog_segments(); - if (segments.empty()) + shared_ptr segment = get_analog_segment_to_paint(); + if (!segment || (segment->get_sample_count() == 0)) return; - const shared_ptr &segment = - segments.front(); - const double pixels_offset = pp.pixels_offset(); 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 int64_t last_sample = (int64_t)segment->get_sample_count() - 1; const double samples_per_pixel = samplerate * pp.scale(); const pv::util::Timestamp start = samplerate * (pp.offset() - start_time); const pv::util::Timestamp end = start + samples_per_pixel * pp.width(); @@ -376,11 +391,19 @@ void AnalogSignal::paint_trace(QPainter &p, if (end <= start) return; + bool paint_thr_dots = + (base_->get_conversion_type() != data::SignalBase::NoConversion) && + (conversion_threshold_disp_mode_ == GlobalSettings::ConvThrDispMode_Dots); + + vector thresholds; + if (paint_thr_dots) + thresholds = base_->get_conversion_thresholds(); + // Calculate and paint the sampling points if enabled and useful GlobalSettings settings; const bool show_sampling_points = - settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() && - (samples_per_pixel < 0.25); + (settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() || + paint_thr_dots) && (samples_per_pixel < 0.25); p.setPen(base_->colour()); @@ -389,10 +412,7 @@ void AnalogSignal::paint_trace(QPainter &p, QPointF *points = new QPointF[points_count]; QPointF *point = points; - QRectF *sampling_points = nullptr; - if (show_sampling_points) - sampling_points = new QRectF[points_count]; - QRectF *sampling_point = sampling_points; + vector sampling_points[3]; int64_t sample_count = min(points_count, TracePaintBlockSize); int64_t block_sample = 0; @@ -413,18 +433,39 @@ void AnalogSignal::paint_trace(QPainter &p, *point++ = QPointF(x, y - sample_block[block_sample] * scale_); - if (show_sampling_points) - *sampling_point++ = - QRectF(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w); + if (show_sampling_points) { + int idx = 0; // Neutral + + if (paint_thr_dots) { + if (thresholds.size() == 1) + idx = (sample_block[block_sample] >= thresholds[0]) ? 2 : 1; + else if (thresholds.size() == 2) { + if (sample_block[block_sample] > thresholds[1]) + idx = 2; // High + else if (sample_block[block_sample] < thresholds[0]) + idx = 1; // Low + } + } + + sampling_points[idx].emplace_back(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w); + } } delete[] sample_block; p.drawPolyline(points, points_count); if (show_sampling_points) { - p.setPen(SamplingPointColour); - p.drawRects(sampling_points, points_count); - delete[] sampling_points; + if (paint_thr_dots) { + p.setPen(SamplingPointColourNe); + p.drawRects(sampling_points[0].data(), sampling_points[0].size()); + p.setPen(SamplingPointColourLo); + p.drawRects(sampling_points[1].data(), sampling_points[1].size()); + p.setPen(SamplingPointColourHi); + p.drawRects(sampling_points[2].data(), sampling_points[2].size()); + } else { + p.setPen(SamplingPointColour); + p.drawRects(sampling_points[0].data(), sampling_points[0].size()); + } } delete[] points; @@ -496,15 +537,10 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) const float high_offset = y - ph + signal_margin + 0.5f; const float low_offset = y + nh - signal_margin - 0.5f; - const deque< shared_ptr > &segments = - base_->logic_data()->logic_segments(); - - if (segments.empty()) + shared_ptr segment = get_logic_segment_to_paint(); + if (!segment || (segment->get_sample_count() == 0)) return; - const shared_ptr &segment = - segments.front(); - double samplerate = segment->samplerate(); // Show sample rate as 1Hz when it is unknown @@ -513,7 +549,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) const double pixels_offset = pp.pixels_offset(); const pv::util::Timestamp& start_time = segment->start_time(); - const int64_t last_sample = segment->get_sample_count() - 1; + const int64_t last_sample = (int64_t)segment->get_sample_count() - 1; const double samples_per_pixel = samplerate * pp.scale(); const double pixels_per_sample = 1 / samples_per_pixel; const pv::util::Timestamp start = samplerate * (pp.offset() - start_time); @@ -618,6 +654,54 @@ void AnalogSignal::paint_logic_caps(QPainter &p, QLineF *const lines, p.drawLines(lines, line - lines); } +shared_ptr AnalogSignal::get_analog_segment_to_paint() const +{ + shared_ptr segment; + + const deque< shared_ptr > &segments = + base_->analog_data()->analog_segments(); + + if (!segments.empty()) { + if (segment_display_mode_ == ShowLastSegmentOnly) + segment = segments.back(); + + if ((segment_display_mode_ == ShowSingleSegmentOnly) || + (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { + try { + segment = segments.at(current_segment_); + } catch (out_of_range&) { + qDebug() << "Current analog segment out of range for signal" << base_->name() << ":" << current_segment_; + } + } + } + + return segment; +} + +shared_ptr AnalogSignal::get_logic_segment_to_paint() const +{ + shared_ptr segment; + + const deque< shared_ptr > &segments = + base_->logic_data()->logic_segments(); + + if (!segments.empty()) { + if (segment_display_mode_ == ShowLastSegmentOnly) + segment = segments.back(); + + if ((segment_display_mode_ == ShowSingleSegmentOnly) || + (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { + try { + segment = segments.at(current_segment_); + } catch (out_of_range&) { + qDebug() << "Current logic segment out of range for signal" << base_->name() << ":" << current_segment_; + } + } + } + + return segment; +} + float AnalogSignal::get_resolution(int scale_index) { const float seq[] = {1.0f, 2.0f, 5.0f}; @@ -1073,9 +1157,9 @@ void AnalogSignal::on_display_type_changed(int index) owner_->row_item_appearance_changed(false, true); } -void AnalogSignal::on_settingViewShowConversionThresholds_changed(const QVariant new_value) +void AnalogSignal::on_settingViewConversionThresholdDispMode_changed(const QVariant new_value) { - show_conversion_thresholds_ = new_value.toBool(); + conversion_threshold_disp_mode_ = new_value.toInt(); if (owner_) owner_->row_item_appearance_changed(false, true);