X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=2a50d5716af2aaf9f88c9468b1e00f50f7b76b63;hp=ef6581fc1dd90ba46edfa27a2a886d3da914f471;hb=HEAD;hpb=90ee1ed9a90bc0651f86ee4af07e0958572f86da diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index ef6581fc..2a50d571 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,7 @@ #include "logicsignal.hpp" #include "view.hpp" +#include "pv/util.hpp" #include "pv/data/analog.hpp" #include "pv/data/analogsegment.hpp" #include "pv/data/logic.hpp" @@ -46,37 +48,36 @@ #include -using std::bind; using std::deque; using std::div; using std::div_t; +// Note that "using std::isnan;" is _not_ put here since that would break +// compilation on some platforms. Use "std::isnan()" instead in checks below. 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; +using pv::data::LogicSegment; using pv::data::SignalBase; +using pv::util::SIPrefix; +using pv::util::determine_value_prefix; namespace pv { namespace views { namespace trace { -const QColor AnalogSignal::SignalColours[4] = { - QColor(0xC4, 0xA0, 0x00), // Yellow - QColor(0x87, 0x20, 0x7A), // Magenta - QColor(0x20, 0x4A, 0x87), // Blue - QColor(0x4E, 0x9A, 0x06) // Green -}; - const QPen AnalogSignal::AxisPen(QColor(0, 0, 0, 30 * 256 / 100), 2); 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::SamplingPointColorLo = QColor(200, 0, 0, 80 * 256 / 100); +const QColor AnalogSignal::SamplingPointColorNe = QColor(0, 0, 0, 80 * 256 / 100); +const QColor AnalogSignal::SamplingPointColorHi = 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); @@ -87,82 +88,96 @@ const int64_t AnalogSignal::TracePaintBlockSize = 1024 * 1024; // 4 MiB (due to const float AnalogSignal::EnvelopeThreshold = 64.0f; const int AnalogSignal::MaximumVDivs = 10; -const int AnalogSignal::MinScaleIndex = -6; -const int AnalogSignal::MaxScaleIndex = 7; +const int AnalogSignal::MinScaleIndex = -6; // 0.01 units/div +const int AnalogSignal::MaxScaleIndex = 10; // 1000 units/div const int AnalogSignal::InfoTextMarginRight = 20; const int AnalogSignal::InfoTextMarginBottom = 5; -AnalogSignal::AnalogSignal( - pv::Session &session, - shared_ptr base) : - Signal(session, base), +AnalogSignal::AnalogSignal(pv::Session &session, shared_ptr base) : + LogicSignal(session, base), + value_at_hover_pos_(std::numeric_limits::quiet_NaN()), scale_index_(4), // 20 per div - scale_index_drag_offset_(0), pos_vdivs_(1), neg_vdivs_(1), resolution_(0), - display_type_(DisplayBoth), + display_type_(DisplayAnalog), autoranging_(true) { axis_pen_ = AxisPen; pv::data::Analog* analog_data = - dynamic_cast(data().get()); + dynamic_cast(base_->analog_data().get()); connect(analog_data, SIGNAL(min_max_changed(float, float)), this, SLOT(on_min_max_changed(float, float))); - GlobalSettings::register_change_handler(GlobalSettings::Key_View_ConversionThresholdDispMode, - bind(&AnalogSignal::on_settingViewConversionThresholdDispMode_changed, this, _1)); - - GlobalSettings gs; + GlobalSettings settings; + show_sampling_points_ = + settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool(); + fill_high_areas_ = + settings.value(GlobalSettings::Key_View_FillSignalHighAreas).toBool(); + high_fill_color_ = QColor::fromRgba(settings.value( + GlobalSettings::Key_View_FillSignalHighAreaColor).value()); + show_analog_minor_grid_ = + settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool(); conversion_threshold_disp_mode_ = - gs.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt(); - - div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); + settings.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt(); + div_height_ = settings.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); - base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]); + update_logic_level_offsets(); update_scale(); } -shared_ptr AnalogSignal::data() const +std::map AnalogSignal::save_settings() const { - return base_->analog_data(); -} + LogicSignal::save_settings(); -void AnalogSignal::save_settings(QSettings &settings) const -{ - settings.setValue("pos_vdivs", pos_vdivs_); - settings.setValue("neg_vdivs", neg_vdivs_); - settings.setValue("scale_index", scale_index_); - settings.setValue("display_type", display_type_); - settings.setValue("autoranging", autoranging_); - settings.setValue("div_height", div_height_); + std::map result; + + result["pos_vdivs"] = pos_vdivs_; + result["neg_vdivs"] = neg_vdivs_; + result["scale_index"] = scale_index_; + result["display_type"] = display_type_; + result["autoranging"] = autoranging_; + result["div_height"] = div_height_; + + return result; } -void AnalogSignal::restore_settings(QSettings &settings) +void AnalogSignal::restore_settings(std::map settings) { - if (settings.contains("pos_vdivs")) - pos_vdivs_ = settings.value("pos_vdivs").toInt(); + LogicSignal::restore_settings(settings); - if (settings.contains("neg_vdivs")) - neg_vdivs_ = settings.value("neg_vdivs").toInt(); + auto entry = settings.find("pos_vdivs"); + if (entry != settings.end()) + pos_vdivs_ = settings["pos_vdivs"].toInt(); - if (settings.contains("scale_index")) { - scale_index_ = settings.value("scale_index").toInt(); + entry = settings.find("neg_vdivs"); + if (entry != settings.end()) + neg_vdivs_ = settings["neg_vdivs"].toInt(); + + entry = settings.find("scale_index"); + if (entry != settings.end()) { + scale_index_ = settings["scale_index"].toInt(); update_scale(); } - if (settings.contains("display_type")) - display_type_ = (DisplayType)(settings.value("display_type").toInt()); + entry = settings.find("display_type"); + if (entry != settings.end()) + display_type_ = (DisplayType)(settings["display_type"].toInt()); - if (settings.contains("autoranging")) - autoranging_ = settings.value("autoranging").toBool(); + entry = settings.find("autoranging"); + if (entry != settings.end()) + autoranging_ = settings["autoranging"].toBool(); - if (settings.contains("div_height")) { + entry = settings.find("div_height"); + if (entry != settings.end()) { const int old_height = div_height_; - div_height_ = settings.value("div_height").toInt(); + div_height_ = settings["div_height"].toInt(); + + update_logic_level_offsets(); + update_scale(); if ((div_height_ != old_height) && owner_) { // Call order is important, otherwise the lazy event handler won't work @@ -176,29 +191,8 @@ pair AnalogSignal::v_extents() const { const int ph = pos_vdivs_ * div_height_; const int nh = neg_vdivs_ * div_height_; - return make_pair(-ph, nh); -} - -int AnalogSignal::scale_handle_offset() const -{ - const int h = (pos_vdivs_ + neg_vdivs_) * div_height_; - - return ((scale_index_drag_offset_ - scale_index_) * h / 4) - h / 2; -} - -void AnalogSignal::scale_handle_dragged(int offset) -{ - const int h = (pos_vdivs_ + neg_vdivs_) * div_height_; - - scale_index_ = scale_index_drag_offset_ - (offset + h / 2) / (h / 4); - update_scale(); -} - -void AnalogSignal::scale_handle_drag_release() -{ - scale_index_drag_offset_ = scale_index_; - update_scale(); + return make_pair(-ph, nh); } void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) @@ -222,8 +216,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)); @@ -232,7 +228,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)); @@ -242,7 +239,7 @@ void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) paint_axis(p, pp, get_visual_y()); } else { - Trace::paint_back(p, pp); + Signal::paint_back(p, pp); paint_axis(p, pp, get_visual_y()); } } @@ -260,39 +257,38 @@ 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()) - 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 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(); - - const int64_t start_sample = min(max(floor(start).convert_to(), - (int64_t)0), last_sample); - 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, segment, y, pp.left(), - start_sample, end_sample, - pixels_offset, samples_per_pixel); - else - paint_envelope(p, segment, y, pp.left(), - start_sample, end_sample, - pixels_offset, samples_per_pixel); + shared_ptr segment = get_analog_segment_to_paint(); + + if (segment && (segment->get_sample_count() > 0)) { + 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 = (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(); + + const int64_t start_sample = min(max(floor(start).convert_to(), + (int64_t)0), last_sample); + 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, segment, y, pp.left(), start_sample, end_sample, + pixels_offset, samples_per_pixel); + else + paint_envelope(p, segment, y, pp.left(), start_sample, end_sample, + pixels_offset, samples_per_pixel); + } } if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) - paint_logic_mid(p, pp); + if (base_->logic_data()) + LogicSignal::paint_mid(p, pp); + + const QString err = base_->get_error_message(); + if (!err.isEmpty()) + paint_error(p, pp); } void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp) @@ -303,10 +299,25 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp) if ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth)) { 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_); + QString infotext; - p.setPen(base_->colour()); + SIPrefix prefix; + if (fabs(signal_max_) > fabs(signal_min_)) + prefix = determine_value_prefix(fabs(signal_max_)); + else + prefix = determine_value_prefix(fabs(signal_min_)); + + // Show the info section on the right side of the trace, including + // the value at the hover point when the hover marker is enabled + // and we have corresponding data available + if (show_hover_marker_ && !std::isnan(value_at_hover_pos_)) { + infotext = QString("[%1] %2 V/div") + .arg(format_value_si(value_at_hover_pos_, prefix, 3, "V", false)) + .arg(resolution_); + } else + infotext = QString("%1 V/div").arg(resolution_); + + p.setPen(base_->color()); p.setFont(QApplication::font()); const QRectF bounding_rect = QRectF(pp.left(), @@ -315,17 +326,20 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp) v_extents().second - v_extents().first - InfoTextMarginBottom); p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext); + + if (show_hover_marker_) + paint_hover_marker(p); } + + if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) + LogicSignal::paint_fore(p, pp); } void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) { + bool was_antialiased = p.testRenderHint(QPainter::Antialiasing); p.setRenderHint(QPainter::Antialiasing, false); - GlobalSettings settings; - const bool show_analog_minor_grid = - settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool(); - if (pos_vdivs_ > 0) { p.setPen(QPen(GridMajorColor, 1, Qt::DashLine)); for (int i = 1; i <= pos_vdivs_; i++) { @@ -334,7 +348,7 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) } } - if ((pos_vdivs_ > 0) && show_analog_minor_grid) { + if ((pos_vdivs_ > 0) && show_analog_minor_grid_) { p.setPen(QPen(GridMinorColor, 1, Qt::DashLine)); for (int i = 0; i < pos_vdivs_; i++) { const float dy = i * div_height_; @@ -355,7 +369,7 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) } } - if ((pos_vdivs_ > 0) && show_analog_minor_grid) { + if ((pos_vdivs_ > 0) && show_analog_minor_grid_) { p.setPen(QPen(GridMinorColor, 1, Qt::DashLine)); for (int i = 0; i < neg_vdivs_; i++) { const float dy = i * div_height_; @@ -368,7 +382,7 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) } } - p.setRenderHint(QPainter::Antialiasing, true); + p.setRenderHint(QPainter::Antialiasing, was_antialiased); } void AnalogSignal::paint_trace(QPainter &p, @@ -379,55 +393,91 @@ 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); + (show_sampling_points_ || paint_thr_dots) && (samples_per_pixel < 0.25); - p.setPen(base_->colour()); + p.setPen(base_->color()); - const int64_t points_count = end - start; + const int64_t points_count = end - start + 1; 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; float *sample_block = new float[TracePaintBlockSize]; segment->get_samples(start, start + sample_count, sample_block); + if (show_hover_marker_) + reset_pixel_values(); + const int w = 2; - for (int64_t sample = start; sample != end; sample++, block_sample++) { + for (int64_t sample = start; sample <= end; sample++, block_sample++) { + // Fetch next block of samples if we finished the current one if (block_sample == TracePaintBlockSize) { block_sample = 0; sample_count = min(points_count - sample, TracePaintBlockSize); segment->get_samples(sample, sample + sample_count, sample_block); } - const float x = (sample / samples_per_pixel - - pixels_offset) + left; + const float abs_x = sample / samples_per_pixel - pixels_offset; + const float x = left + abs_x; *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); + // Generate the pixel<->value lookup table for the mouse hover + if (show_hover_marker_) + process_next_sample_value(abs_x, sample_block[block_sample]); + + // Create the sampling points if needed + 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); + // QPainter::drawPolyline() is slow, let's paint the lines ourselves + for (int64_t i = 1; i < points_count; i++) + p.drawLine(points[i - 1], points[i]); if (show_sampling_points) { - p.setPen(SamplingPointColour); - p.drawRects(sampling_points, points_count); - delete[] sampling_points; + if (paint_thr_dots) { + p.setPen(SamplingPointColorNe); + p.drawRects(sampling_points[0].data(), sampling_points[0].size()); + p.setPen(SamplingPointColorLo); + p.drawRects(sampling_points[1].data(), sampling_points[1].size()); + p.setPen(SamplingPointColorHi); + p.drawRects(sampling_points[2].data(), sampling_points[2].size()); + } else { + p.setPen(SamplingPointColor); + p.drawRects(sampling_points[0].data(), sampling_points[0].size()); + } } delete[] points; @@ -440,6 +490,10 @@ void AnalogSignal::paint_envelope(QPainter &p, { using pv::data::AnalogSegment; + // Note: Envelope painting currently doesn't generate a pixel<->value lookup table + if (show_hover_marker_) + reset_pixel_values(); + AnalogSegment::EnvelopeSection e; segment->get_envelope_section(e, start, end, samples_per_pixel); @@ -447,7 +501,7 @@ void AnalogSignal::paint_envelope(QPainter &p, return; p.setPen(QPen(Qt::NoPen)); - p.setBrush(base_->colour()); + p.setBrush(base_->color()); QRectF *const rects = new QRectF[e.length]; QRectF *rect = rects; @@ -455,8 +509,8 @@ void AnalogSignal::paint_envelope(QPainter &p, 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 AnalogSegment::EnvelopeSample *const s = - e.samples + sample; + + const AnalogSegment::EnvelopeSample *const s = e.samples + sample; // We overlap this sample with the next so that vertical // gaps do not appear during steep rising or falling edges @@ -478,147 +532,28 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } -void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) +shared_ptr AnalogSignal::get_analog_segment_to_paint() const { - QLineF *line; - - vector< pair > edges; - - assert(base_); - - const int y = get_visual_y(); - - if (!base_->enabled() || !base_->logic_data()) - return; - - const int signal_margin = - QFontMetrics(QApplication::font()).height() / 2; - - const int ph = min(pos_vdivs_, 1) * div_height_; - const int nh = min(neg_vdivs_, 1) * div_height_; - 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()) - return; - - const shared_ptr &segment = - segments.front(); + shared_ptr segment; - double samplerate = segment->samplerate(); - - // Show sample rate as 1Hz when it is unknown - if (samplerate == 0.0) - samplerate = 1.0; - - 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 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); - const pv::util::Timestamp end = start + samples_per_pixel * pp.width(); - - const int64_t start_sample = min(max(floor(start).convert_to(), - (int64_t)0), last_sample); - const uint64_t end_sample = min(max(ceil(end).convert_to(), - (int64_t)0), last_sample); - - segment->get_subsampled_edges(edges, start_sample, end_sample, - samples_per_pixel / LogicSignal::Oversampling, 0); - assert(edges.size() >= 2); - - // Check whether we need to paint the sampling points - GlobalSettings settings; - const bool show_sampling_points = - settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() && - (samples_per_pixel < 0.25); - - vector sampling_points; - float sampling_point_x = 0.0f; - int64_t sampling_point_sample = start_sample; - const int w = 2; - - if (show_sampling_points) { - sampling_points.reserve(end_sample - start_sample + 1); - sampling_point_x = (edges.cbegin()->first / samples_per_pixel - pixels_offset) + pp.left(); - } - - // Paint the edges - const unsigned int edge_count = edges.size() - 2; - QLineF *const edge_lines = new QLineF[edge_count]; - line = edge_lines; - - for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) { - const float x = ((*i).first / samples_per_pixel - - pixels_offset) + pp.left(); - *line++ = QLineF(x, high_offset, x, low_offset); - - if (show_sampling_points) - while (sampling_point_sample < (*i).first) { - const float y = (*i).second ? low_offset : high_offset; - sampling_points.emplace_back( - QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w)); - sampling_point_sample++; - sampling_point_x += pixels_per_sample; - }; - } - - // Calculate the sample points from the last edge to the end of the trace - if (show_sampling_points) - while ((uint64_t)sampling_point_sample <= end_sample) { - // Signal changed after the last edge, so the level is inverted - const float y = (edges.cend() - 1)->second ? high_offset : low_offset; - sampling_points.emplace_back( - QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w)); - sampling_point_sample++; - sampling_point_x += pixels_per_sample; - }; - - p.setPen(LogicSignal::EdgeColour); - p.drawLines(edge_lines, edge_count); - delete[] edge_lines; - - // Paint the caps - const unsigned int max_cap_line_count = edges.size(); - QLineF *const cap_lines = new QLineF[max_cap_line_count]; - - p.setPen(LogicSignal::HighColour); - paint_logic_caps(p, cap_lines, edges, true, samples_per_pixel, - pixels_offset, pp.left(), high_offset); - p.setPen(LogicSignal::LowColour); - paint_logic_caps(p, cap_lines, edges, false, samples_per_pixel, - pixels_offset, pp.left(), low_offset); - - delete[] cap_lines; - - // Paint the sampling points - if (show_sampling_points) { - p.setPen(SamplingPointColour); - p.drawRects(sampling_points.data(), sampling_points.size()); - } -} + const deque< shared_ptr > &segments = + base_->analog_data()->analog_segments(); -void AnalogSignal::paint_logic_caps(QPainter &p, QLineF *const lines, - vector< pair > &edges, bool level, - double samples_per_pixel, double pixels_offset, float x_offset, - float y_offset) -{ - QLineF *line = lines; - - for (auto i = edges.begin(); i != (edges.end() - 1); i++) - if ((*i).second == level) { - *line++ = QLineF( - ((*i).first / samples_per_pixel - - pixels_offset) + x_offset, y_offset, - ((*(i+1)).first / samples_per_pixel - - pixels_offset) + x_offset, y_offset); + 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_; + } } + } - p.drawLines(lines, line - lines); + return segment; } float AnalogSignal::get_resolution(int scale_index) @@ -638,6 +573,17 @@ void AnalogSignal::update_scale() scale_ = div_height_ / resolution_; } +void AnalogSignal::update_logic_level_offsets() +{ + const int signal_margin = QFontMetrics(QApplication::font()).height() / 2; + + const int ph = min(pos_vdivs_, 1) * div_height_; + const int nh = min(neg_vdivs_, 1) * div_height_; + + high_level_offset_ = -ph + signal_margin + 0.5f; + low_level_offset_ = nh - signal_margin - 0.5f; +} + void AnalogSignal::update_conversion_widgets() { SignalBase::ConversionType conv_type = base_->get_conversion_type(); @@ -655,7 +601,7 @@ void AnalogSignal::update_conversion_widgets() conv_threshold_cb_->blockSignals(true); // Set available options depending on chosen conversion - for (pair preset : presets) + for (pair& preset : presets) conv_threshold_cb_->addItem(preset.first, preset.second); map < QString, QVariant > options = base_->get_conversion_options(); @@ -682,6 +628,37 @@ void AnalogSignal::update_conversion_widgets() conv_threshold_cb_->blockSignals(false); } +vector AnalogSignal::get_nearest_level_changes(uint64_t sample_pos) +{ + assert(base_); + assert(owner_); + + // Return if there's no logic data or we're showing only the analog trace + if (!base_->logic_data() || (display_type_ == DisplayAnalog)) + return vector(); + + if (sample_pos == 0) + return vector(); + + shared_ptr segment = get_logic_segment_to_paint(); + if (!segment || (segment->get_sample_count() == 0)) + return vector(); + + const View *view = owner_->view(); + assert(view); + const double samples_per_pixel = base_->get_samplerate() * view->scale(); + + vector edges; + + segment->get_surrounding_edges(edges, sample_pos, + samples_per_pixel / LogicSignal::Oversampling, 0); + + if (edges.empty()) + return vector(); + + return edges; +} + void AnalogSignal::perform_autoranging(bool keep_divs, bool force_update) { const deque< shared_ptr > &segments = @@ -690,20 +667,19 @@ void AnalogSignal::perform_autoranging(bool keep_divs, bool force_update) if (segments.empty()) return; - static double prev_min = 0, prev_max = 0; double min = 0, max = 0; - for (shared_ptr segment : segments) { + for (const shared_ptr& segment : segments) { pair mm = segment->get_min_max(); min = std::min(min, mm.first); max = std::max(max, mm.second); } - if ((min == prev_min) && (max == prev_max) && !force_update) + if ((min == signal_min_) && (max == signal_max_) && !force_update) return; - prev_min = min; - prev_max = max; + signal_min_ = min; + signal_max_ = max; // If we're allowed to alter the div assignment... if (!keep_divs) { @@ -720,16 +696,18 @@ void AnalogSignal::perform_autoranging(bool keep_divs, bool force_update) } } + const bool showing_logic = (display_type_ == DisplayConverted) || (display_type_ == DisplayBoth); + // If there is still no positive div when we need it, add one // (this can happen when pos_vdivs==neg_vdivs==0) - if ((max > 0) && (pos_vdivs_ == 0)) { + if (((max > 0) && (pos_vdivs_ == 0)) || showing_logic) { pos_vdivs_ = 1; owner_->extents_changed(false, true); } // If there is still no negative div when we need it, add one // (this can happen when pos_vdivs was 0 or 1 when trying to split) - if ((min < 0) && (neg_vdivs_ == 0)) { + if (((min < 0) && (neg_vdivs_ == 0)) || showing_logic) { neg_vdivs_ = 1; owner_->extents_changed(false, true); } @@ -752,27 +730,85 @@ void AnalogSignal::perform_autoranging(bool keep_divs, bool force_update) update_scale(); } +void AnalogSignal::reset_pixel_values() +{ + value_at_pixel_pos_.clear(); + current_pixel_pos_ = -1; + prev_value_at_pixel_ = std::numeric_limits::quiet_NaN(); +} + +void AnalogSignal::process_next_sample_value(float x, float value) +{ + // Note: NAN is used to indicate the non-existance of a value at this pixel + + if (std::isnan(prev_value_at_pixel_)) { + if (x < 0) { + min_value_at_pixel_ = value; + max_value_at_pixel_ = value; + prev_value_at_pixel_ = value; + current_pixel_pos_ = x; + } else + prev_value_at_pixel_ = std::numeric_limits::quiet_NaN(); + } + + const int pixel_pos = (int)(x + 0.5); + + if (pixel_pos > current_pixel_pos_) { + if (pixel_pos - current_pixel_pos_ == 1) { + if (std::isnan(prev_value_at_pixel_)) { + value_at_pixel_pos_.push_back(prev_value_at_pixel_); + } else { + // Average the min/max range to create one value for the previous pixel + const float avg = (min_value_at_pixel_ + max_value_at_pixel_) / 2; + value_at_pixel_pos_.push_back(avg); + } + } else { + // Interpolate values to create values for the intermediate pixels + const float start_value = prev_value_at_pixel_; + const float end_value = value; + const int steps = fabs(pixel_pos - current_pixel_pos_); + const double gradient = (end_value - start_value) / steps; + for (int i = 0; i < steps; i++) { + if (current_pixel_pos_ + i < 0) + continue; + value_at_pixel_pos_.push_back(start_value + i * gradient); + } + } + + min_value_at_pixel_ = value; + max_value_at_pixel_ = value; + prev_value_at_pixel_ = value; + current_pixel_pos_ = pixel_pos; + } else { + // Another sample for the same pixel + if (value < min_value_at_pixel_) + min_value_at_pixel_ = value; + if (value > max_value_at_pixel_) + max_value_at_pixel_ = value; + } +} + 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 div-related settings pvdiv_sb_ = new QSpinBox(parent); pvdiv_sb_->setRange(0, MaximumVDivs); pvdiv_sb_->setValue(pos_vdivs_); + pvdiv_sb_->setEnabled(!autoranging_); connect(pvdiv_sb_, SIGNAL(valueChanged(int)), this, SLOT(on_pos_vdivs_changed(int))); - layout->addRow(tr("Number of pos vertical divs"), pvdiv_sb_); + form->addRow(tr("Number of pos vertical divs"), pvdiv_sb_); nvdiv_sb_ = new QSpinBox(parent); nvdiv_sb_->setRange(0, MaximumVDivs); nvdiv_sb_->setValue(neg_vdivs_); + nvdiv_sb_->setEnabled(!autoranging_); connect(nvdiv_sb_, SIGNAL(valueChanged(int)), this, SLOT(on_neg_vdivs_changed(int))); - layout->addRow(tr("Number of neg vertical divs"), nvdiv_sb_); + form->addRow(tr("Number of neg vertical divs"), nvdiv_sb_); div_height_sb_ = new QSpinBox(parent); div_height_sb_->setRange(20, 1000); @@ -781,10 +817,11 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) div_height_sb_->setValue(div_height_); connect(div_height_sb_, SIGNAL(valueChanged(int)), this, SLOT(on_div_height_changed(int))); - layout->addRow(tr("Div height"), div_height_sb_); + form->addRow(tr("Div height"), div_height_sb_); // Add the vertical resolution resolution_cb_ = new QComboBox(parent); + resolution_cb_->setEnabled(!autoranging_); for (int i = MinScaleIndex; i < MaxScaleIndex; i++) { const QString label = QString("%1").arg(get_resolution(i)); @@ -802,7 +839,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) vdiv_layout->addWidget(resolution_cb_, 0, 0); vdiv_layout->addWidget(vdiv_unit, 0, 1); - layout->addRow(tr("Vertical resolution"), vdiv_layout); + form->addRow(tr("Vertical resolution"), vdiv_layout); // Add the autoranging checkbox QCheckBox* autoranging_cb = new QCheckBox(); @@ -811,7 +848,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) connect(autoranging_cb, SIGNAL(stateChanged(int)), this, SLOT(on_autoranging_changed(int))); - layout->addRow(tr("Autoranging"), autoranging_cb); + form->addRow(tr("Autoranging"), autoranging_cb); // Add the conversion type dropdown conversion_cb_ = new QComboBox(); @@ -826,7 +863,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) cur_idx = conversion_cb_->findData(QVariant(base_->get_conversion_type())); conversion_cb_->setCurrentIndex(cur_idx); - layout->addRow(tr("Conversion"), conversion_cb_); + form->addRow(tr("Conversion"), conversion_cb_); connect(conversion_cb_, SIGNAL(currentIndexChanged(int)), this, SLOT(on_conversion_changed(int))); @@ -835,11 +872,11 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) conv_threshold_cb_ = new QComboBox(); conv_threshold_cb_->setEditable(true); - layout->addRow(tr("Conversion threshold(s)"), conv_threshold_cb_); + form->addRow(tr("Conversion threshold(s)"), conv_threshold_cb_); connect(conv_threshold_cb_, SIGNAL(currentIndexChanged(int)), this, SLOT(on_conv_threshold_changed(int))); - connect(conv_threshold_cb_, SIGNAL(editTextChanged(const QString)), + connect(conv_threshold_cb_, SIGNAL(editTextChanged(const QString&)), this, SLOT(on_conv_threshold_changed())); // index will be -1 // Add the display type dropdown @@ -852,24 +889,64 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) cur_idx = display_type_cb_->findData(QVariant(display_type_)); display_type_cb_->setCurrentIndex(cur_idx); - layout->addRow(tr("Show traces for"), display_type_cb_); + form->addRow(tr("Show traces for"), display_type_cb_); connect(display_type_cb_, SIGNAL(currentIndexChanged(int)), this, SLOT(on_display_type_changed(int))); // Update the conversion widget contents and states update_conversion_widgets(); +} - form->addRow(layout); +void AnalogSignal::hover_point_changed(const QPoint &hp) +{ + Signal::hover_point_changed(hp); + + // Note: Even though the view area begins at 0, we exclude 0 because + // that's also the value given when the cursor is over the header to the + // left of the trace paint area + if (hp.x() <= 0) { + value_at_hover_pos_ = std::numeric_limits::quiet_NaN(); + } else { + if ((size_t)hp.x() < value_at_pixel_pos_.size()) + value_at_hover_pos_ = value_at_pixel_pos_.at(hp.x()); + else + value_at_hover_pos_ = std::numeric_limits::quiet_NaN(); + } } -void AnalogSignal::on_min_max_changed(float min, float max) +void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value) { - (void)min; - (void)max; + Signal::on_setting_changed(key, value); + + if (key == GlobalSettings::Key_View_ShowSamplingPoints) + show_sampling_points_ = value.toBool(); + + if (key == GlobalSettings::Key_View_FillSignalHighAreas) + fill_high_areas_ = value.toBool(); + + if (key == GlobalSettings::Key_View_FillSignalHighAreaColor) + high_fill_color_ = QColor::fromRgba(value.value()); + + if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid) + show_analog_minor_grid_ = value.toBool(); + if (key == GlobalSettings::Key_View_ConversionThresholdDispMode) { + conversion_threshold_disp_mode_ = value.toInt(); + + if (owner_) + owner_->row_item_appearance_changed(false, true); + } +} + +void AnalogSignal::on_min_max_changed(float min, float max) +{ if (autoranging_) perform_autoranging(false, false); + else { + if (min < signal_min_) signal_min_ = min; + if (max > signal_max_) signal_max_ = max; + } } void AnalogSignal::on_pos_vdivs_changed(int vdivs) @@ -896,6 +973,8 @@ void AnalogSignal::on_pos_vdivs_changed(int vdivs) } } + update_logic_level_offsets(); + if (owner_) { // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -927,6 +1006,8 @@ void AnalogSignal::on_neg_vdivs_changed(int vdivs) } } + update_logic_level_offsets(); + if (owner_) { // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -937,6 +1018,7 @@ void AnalogSignal::on_neg_vdivs_changed(int vdivs) void AnalogSignal::on_div_height_changed(int height) { div_height_ = height; + update_logic_level_offsets(); update_scale(); if (owner_) { @@ -959,6 +1041,13 @@ void AnalogSignal::on_autoranging_changed(int state) { autoranging_ = (state == Qt::Checked); + if (pvdiv_sb_) + pvdiv_sb_->setEnabled(!autoranging_); + if (nvdiv_sb_) + nvdiv_sb_->setEnabled(!autoranging_); + if (resolution_cb_) + resolution_cb_->setEnabled(!autoranging_); + if (autoranging_) perform_autoranging(false, true); @@ -980,6 +1069,11 @@ void AnalogSignal::on_conversion_changed(int index) base_->set_conversion_type(conv_type); update_conversion_widgets(); + if (conv_type == SignalBase::ConversionType::NoConversion) + on_display_type_changed(DisplayType::DisplayAnalog); + else + on_display_type_changed(DisplayType::DisplayBoth); + if (owner_) owner_->row_item_appearance_changed(false, true); } @@ -1007,13 +1101,20 @@ void AnalogSignal::on_conv_threshold_changed(int index) // https://txt2re.com/index-c++.php3?s=0.1V&1&-13 QString re1 = "([+-]?\\d*[\\.,]?\\d*)"; // Float value QString re2 = "([a-zA-Z]*)"; // SI unit - QRegExp regex(re1 + re2); - const QString text = conv_threshold_cb_->currentText(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QRegularExpression regex(re1 + re2); + if (!regex.match(text).hasMatch()) + return; // String doesn't match the regex + + QStringList tokens = regex.match(text).capturedTexts(); +#else + QRegExp regex(re1 + re2); if (!regex.exactMatch(text)) return; // String doesn't match the regex QStringList tokens = regex.capturedTexts(); +#endif // For now, we simply assume that the unit is volt without modifiers const double thr = tokens.at(1).toDouble(); @@ -1034,13 +1135,22 @@ void AnalogSignal::on_conv_threshold_changed(int index) QString re3 = "\\/"; // Forward slash, not captured QString re4 = "([+-]?\\d*[\\.,]?\\d*)"; // Float value QString re5 = "([a-zA-Z]*)"; // SI unit + const QString text = conv_threshold_cb_->currentText(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QRegularExpression regex(re1 + re2 + re3 + re4 + re5); + + if (!regex.match(text).hasMatch()) + return; // String doesn't match the regex + + QStringList tokens = regex.match(text).capturedTexts(); +#else QRegExp regex(re1 + re2 + re3 + re4 + re5); - const QString text = conv_threshold_cb_->currentText(); if (!regex.exactMatch(text)) return; // String doesn't match the regex QStringList tokens = regex.capturedTexts(); +#endif // For now, we simply assume that the unit is volt without modifiers const double low_thr = tokens.at(1).toDouble(); @@ -1070,15 +1180,20 @@ void AnalogSignal::on_delayed_conversion_starter() void AnalogSignal::on_display_type_changed(int index) { + const bool prev_showing_logic = (display_type_ == DisplayConverted) || (display_type_ == DisplayBoth); + display_type_ = (DisplayType)(display_type_cb_->itemData(index).toInt()); - if (owner_) - owner_->row_item_appearance_changed(false, true); -} + const bool showing_logic = (display_type_ == DisplayConverted) || (display_type_ == DisplayBoth); -void AnalogSignal::on_settingViewConversionThresholdDispMode_changed(const QVariant new_value) -{ - conversion_threshold_disp_mode_ = new_value.toInt(); + // If we show a logic trace, make sure we have at least one div for each + // polarity as that's where we paint it + if (showing_logic && !prev_showing_logic) { + if (pos_vdivs_ == 0) + on_pos_vdivs_changed(1); + if (neg_vdivs_ == 0) + on_neg_vdivs_changed(1); + } if (owner_) owner_->row_item_appearance_changed(false, true);