X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=58a186ecf0229cd28e7a2bd134f9e76613205667;hb=1d150cd6ea6d9c465d607377bba435a065f104cd;hp=323a2434ec79083f00db203a9c23ae37031ac790;hpb=561ba3ae052a93fe150a2161fcdc361144e68e4f;p=pulseview.git diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index 323a2434..58a186ec 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -77,6 +77,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,13 +108,8 @@ 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(&delayed_conversion_starter_, SIGNAL(timeout()), - this, SLOT(on_delayed_conversion_starter())); - delayed_conversion_starter_.setSingleShot(true); - delayed_conversion_starter_.setInterval(1000); // 1s timeout + connect(analog_data, SIGNAL(min_max_changed(float, float)), + this, SLOT(on_min_max_changed(float, float))); GlobalSettings gs; div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); @@ -197,7 +195,47 @@ void AnalogSignal::scale_handle_drag_release() void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) { - if (base_->enabled()) { + if (!base_->enabled()) + 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(); + + 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()); } @@ -247,17 +285,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) @@ -443,44 +472,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; @@ -866,9 +857,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) @@ -1017,9 +1012,11 @@ void AnalogSignal::on_conv_threshold_changed(int index) // For now, we simply assume that the unit is volt without modifiers const double thr = tokens.at(1).toDouble(); - // Only restart the conversion if the threshold was updated + // Only restart the conversion if the threshold was updated. + // We're starting a delayed conversion because the user may still be + // typing and the UI would lag if we kept on restarting it immediately if (base_->set_conversion_option("threshold_value", thr)) - delayed_conversion_starter_.start(); + base_->start_conversion(true); } if (conv_type == SignalBase::A2LConversionBySchmittTrigger && use_custom_thr) { @@ -1043,17 +1040,20 @@ void AnalogSignal::on_conv_threshold_changed(int index) const double low_thr = tokens.at(1).toDouble(); const double high_thr = tokens.at(3).toDouble(); - // Only restart the conversion if one of the options was updated + // Only restart the conversion if one of the options was updated. + // We're starting a delayed conversion because the user may still be + // typing and the UI would lag if we kept on restarting it immediately bool o1 = base_->set_conversion_option("threshold_value_low", low_thr); bool o2 = base_->set_conversion_option("threshold_value_high", high_thr); if (o1 || o2) - delayed_conversion_starter_.start(); + base_->start_conversion(true); // Start delayed conversion } - base_->set_conversion_preset(index); + base_->set_conversion_preset((SignalBase::ConversionPreset)index); - // Immediately start the conversion if we're not asking for a delayed reaction - if (!delayed_conversion_starter_.isActive()) + // Immediately start the conversion if we're not using custom values + // (i.e. we're using one of the presets) + if (!use_custom_thr) base_->start_conversion(); }