X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=5e7081d61145e0555dc8a048cc65c850c5f49de0;hp=81dd551b91d33b3913ccb53cb7c81b9e2ba12d56;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=932bc2461d7b84b084d3a77ccfeb3bdb1a2d0d6c diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index 81dd551b..5e7081d6 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -46,6 +46,7 @@ #include +using std::bind; using std::deque; using std::div; using std::div_t; @@ -54,6 +55,7 @@ using std::make_pair; using std::min; using std::numeric_limits; using std::pair; +using std::placeholders::_1; using std::shared_ptr; using std::vector; @@ -77,6 +79,9 @@ const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20 * 256 / 100); const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77); const QColor AnalogSignal::ThresholdColor = QColor(0, 0, 0, 30 * 256 / 100); +const QColor AnalogSignal::ThresholdColorLo = QColor(255, 0, 0, 8 * 256 / 100); +const QColor AnalogSignal::ThresholdColorNe = QColor(0, 0, 0, 6 * 256 / 100); +const QColor AnalogSignal::ThresholdColorHi = QColor(0, 255, 0, 8 * 256 / 100); const int64_t AnalogSignal::TracePaintBlockSize = 1024 * 1024; // 4 MiB (due to float) const float AnalogSignal::EnvelopeThreshold = 64.0f; @@ -105,10 +110,16 @@ AnalogSignal::AnalogSignal( pv::data::Analog* analog_data = dynamic_cast(data().get()); - connect(analog_data, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), - this, SLOT(on_samples_added())); + 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 gs; + show_conversion_thresholds_ = + gs.value(GlobalSettings::Key_View_ShowConversionThresholds).toBool(); + div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]); @@ -192,7 +203,42 @@ void AnalogSignal::scale_handle_drag_release() void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) { - if (base_->enabled()) { + if (!base_->enabled()) + return; + + 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_ && + ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth))) { + + const int visual_y = get_visual_y(); + const pair extents = v_extents(); + const int top = visual_y + extents.first; + const int btm = visual_y + extents.second; + + // 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_; + + p.fillRect(QRectF(pp.left(), top, pp.width(), thr_hi - top), + QBrush(ThresholdColorHi)); + p.fillRect(QRectF(pp.left(), thr_hi, pp.width(), thr_lo - thr_hi), + QBrush(ThresholdColorNe)); + p.fillRect(QRectF(pp.left(), thr_lo, pp.width(), btm - thr_lo), + QBrush(ThresholdColorLo)); + } else { + const double thr = visual_y - thresholds[0] * scale_; + + p.fillRect(QRectF(pp.left(), top, pp.width(), thr - top), + QBrush(ThresholdColorHi)); + p.fillRect(QRectF(pp.left(), thr, pp.width(), btm - thr), + QBrush(ThresholdColorLo)); + } + + paint_axis(p, pp, get_visual_y()); + } else { Trace::paint_back(p, pp); paint_axis(p, pp, get_visual_y()); } @@ -242,17 +288,8 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) pixels_offset, samples_per_pixel); } - const SignalBase::ConversionType conv_type = base_->get_conversion_type(); - - if (((conv_type == SignalBase::A2LConversionByThreshold) || - (conv_type == SignalBase::A2LConversionBySchmittTrigger))) { - - if ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth)) - paint_conversion_thresholds(p, pp); - - if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) - paint_logic_mid(p, pp); - } + if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) + paint_logic_mid(p, pp); } void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp) @@ -438,44 +475,6 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } -void AnalogSignal::paint_conversion_thresholds(QPainter &p, - ViewItemPaintParams &pp) -{ - if (!base_->enabled() || !base_->logic_data()) - return; - - // TODO Register a change handler instead of querying this with every repaint - GlobalSettings settings; - const bool show_conversion_thresholds = - settings.value(GlobalSettings::Key_View_ShowConversionThresholds).toBool(); - - if (!show_conversion_thresholds) - return; - - const vector thresholds = base_->get_conversion_thresholds(); - const int y = get_visual_y(); - - p.setRenderHint(QPainter::Antialiasing, false); - - p.setPen(ThresholdColor); - - if (thresholds.size() == 2) { - // Draw as hatched block because two thresholds denote lower/upper level - const double thr_y0 = y - thresholds[0] * scale_; - const double thr_y1 = y - thresholds[1] * scale_; - p.fillRect(QRect(pp.left(), thr_y0, pp.right(), thr_y1 - thr_y0), - QBrush(ThresholdColor, Qt::BDiagPattern)); - } else { - // Draw as individual lines - for (const double thr : thresholds) { - const double thr_y = y - thr * scale_; - p.drawLine(QPointF(pp.left(), thr_y), QPointF(pp.right(), thr_y)); - } - } - - p.setRenderHint(QPainter::Antialiasing, true); -} - void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) { QLineF *line; @@ -861,9 +860,13 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) form->addRow(layout); } -void AnalogSignal::on_samples_added() +void AnalogSignal::on_min_max_changed(float min, float max) { - perform_autoranging(false, false); + (void)min; + (void)max; + + if (autoranging_) + perform_autoranging(false, false); } void AnalogSignal::on_pos_vdivs_changed(int vdivs) @@ -1070,6 +1073,14 @@ void AnalogSignal::on_display_type_changed(int index) owner_->row_item_appearance_changed(false, true); } +void AnalogSignal::on_settingViewShowConversionThresholds_changed(const QVariant new_value) +{ + show_conversion_thresholds_ = new_value.toBool(); + + if (owner_) + owner_->row_item_appearance_changed(false, true); +} + } // namespace trace } // namespace views } // namespace pv