X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=39ca26f7ad64437da3ca3f163982c0dafe2fa8f2;hp=14870285fd144da5314ce914bd87b5935d846ef8;hb=0a952555b9d153f42912e47f35fac5dd4643fca9;hpb=0cbadf1c6a80ec37481ae11ee3cb709eeffda3e7 diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index 14870285..39ca26f7 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -51,7 +51,8 @@ using std::deque; using std::div; using std::div_t; -using std::isnan; +// 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; @@ -61,6 +62,7 @@ using std::pair; using std::shared_ptr; using std::vector; +using pv::data::LogicSegment; using pv::data::SignalBase; using pv::util::SIPrefix; @@ -103,8 +105,8 @@ AnalogSignal::AnalogSignal( pv::Session &session, shared_ptr base) : Signal(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), @@ -119,58 +121,70 @@ AnalogSignal::AnalogSignal( connect(analog_data, SIGNAL(min_max_changed(float, float)), this, SLOT(on_min_max_changed(float, float))); - 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_color(SignalColors[base_->index() % countof(SignalColors)]); update_scale(); } -AnalogSignal::~AnalogSignal() -{ - GlobalSettings::remove_change_handler(this); -} - shared_ptr AnalogSignal::data() const { return base_->analog_data(); } -void AnalogSignal::save_settings(QSettings &settings) const +std::map AnalogSignal::save_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"] = pos_vdivs_; + 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(); + auto entry = settings.find("pos_vdivs"); + if (entry != settings.end()) + pos_vdivs_ = settings["pos_vdivs"].toInt(); - if (settings.contains("neg_vdivs")) - neg_vdivs_ = settings.value("neg_vdivs").toInt(); + entry = settings.find("neg_vdivs"); + if (entry != settings.end()) + neg_vdivs_ = settings["neg_vdivs"].toInt(); - if (settings.contains("scale_index")) { - scale_index_ = settings.value("scale_index").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(); if ((div_height_ != old_height) && owner_) { // Call order is important, otherwise the lazy event handler won't work @@ -187,36 +201,6 @@ pair AnalogSignal::v_extents() const 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(); -} - -void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value) -{ - Signal::on_setting_changed(key, value); - - if (key == GlobalSettings::Key_View_ConversionThresholdDispMode) - on_settingViewConversionThresholdDispMode_changed(value); -} - void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) { if (!base_->enabled()) @@ -261,7 +245,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()); } } @@ -321,9 +305,9 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp) // 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_ && !isnan(value_at_hover_pos_)) { + if (show_hover_marker_ && !std::isnan(value_at_hover_pos_)) { infotext = QString("[%1] %2 V/div") - .arg(format_value_si(value_at_hover_pos_, SIPrefix::unspecified, 0, "V", false)) + .arg(format_value_si(value_at_hover_pos_, SIPrefix::unspecified, 2, "V", false)) .arg(resolution_); } else infotext = QString("%1 V/div").arg(resolution_); @@ -345,12 +329,9 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &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++) { @@ -359,7 +340,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_; @@ -380,7 +361,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_; @@ -393,7 +374,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, @@ -415,8 +396,7 @@ void AnalogSignal::paint_trace(QPainter &p, // Calculate and paint the sampling points if enabled and useful GlobalSettings settings; const bool show_sampling_points = - (settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() || - paint_thr_dots) && (samples_per_pixel < 0.25); + (show_sampling_points_ || paint_thr_dots) && (samples_per_pixel < 0.25); p.setPen(base_->color()); @@ -474,7 +454,9 @@ void AnalogSignal::paint_trace(QPainter &p, } 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) { if (paint_thr_dots) { @@ -562,6 +544,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) 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 float signal_height = low_offset - high_offset; shared_ptr segment = get_logic_segment_to_paint(); if (!segment || (segment->get_sample_count() == 0)) @@ -590,32 +573,62 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) 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); + const float first_sample_x = + pp.left() + (edges.front().first / samples_per_pixel - pixels_offset); + const float last_sample_x = + pp.left() + (edges.back().first / samples_per_pixel - pixels_offset); + // Check whether we need to paint the sampling points + const bool show_sampling_points = show_sampling_points_ && (samples_per_pixel < 0.25); vector sampling_points; - float sampling_point_x = 0.0f; + float sampling_point_x = first_sample_x; int64_t sampling_point_sample = start_sample; const int w = 2; - if (show_sampling_points) { + 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(); - } + + vector high_rects; + float rising_edge_x; + bool rising_edge_seen = false; // Paint the edges const unsigned int edge_count = edges.size() - 2; QLineF *const edge_lines = new QLineF[edge_count]; line = edge_lines; + if (edges.front().second) { + // Beginning of trace is high + rising_edge_x = first_sample_x; + rising_edge_seen = true; + } + for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) { - const float x = ((*i).first / samples_per_pixel - - pixels_offset) + pp.left(); + // Note: multiple edges occupying a single pixel are represented by an edge + // with undefined logic level. This means that only the first falling edge + // after a rising edge corresponds to said rising edge - and vice versa. If + // more edges with the same logic level follow, they denote multiple edges. + + const float x = pp.left() + ((*i).first / samples_per_pixel - pixels_offset); *line++ = QLineF(x, high_offset, x, low_offset); + if (fill_high_areas_) { + // Any edge terminates a high area + if (rising_edge_seen) { + const int width = x - rising_edge_x; + if (width > 0) + high_rects.emplace_back(rising_edge_x, high_offset, + width, signal_height); + rising_edge_seen = false; + } + + // Only rising edges start high areas + if ((*i).second) { + rising_edge_x = x; + rising_edge_seen = true; + } + } + if (show_sampling_points) while (sampling_point_sample < (*i).first) { const float y = (*i).second ? low_offset : high_offset; @@ -637,6 +650,17 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) sampling_point_x += pixels_per_sample; }; + if (fill_high_areas_) { + // Add last high rectangle if the signal is still high at the end of the trace + if (rising_edge_seen && (edges.cend() - 1)->second) + high_rects.emplace_back(rising_edge_x, high_offset, + last_sample_x - rising_edge_x, signal_height); + + p.setPen(high_fill_color_); + p.setBrush(high_fill_color_); + p.drawRects((const QRectF*)(high_rects.data()), high_rects.size()); + } + p.setPen(LogicSignal::EdgeColor); p.drawLines(edge_lines, edge_count); delete[] edge_lines; @@ -762,7 +786,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(); @@ -789,6 +813,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 = @@ -797,20 +852,20 @@ void AnalogSignal::perform_autoranging(bool keep_divs, bool force_update) if (segments.empty()) return; - static double prev_min = 0, prev_max = 0; + double signal_min_ = 0, signal_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) { @@ -870,7 +925,7 @@ 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 (isnan(prev_value_at_pixel_)) { + if (std::isnan(prev_value_at_pixel_)) { if (x < 0) { min_value_at_pixel_ = value; max_value_at_pixel_ = value; @@ -884,7 +939,7 @@ void AnalogSignal::process_next_sample_value(float x, float value) if (pixel_pos > current_pixel_pos_) { if (pixel_pos - current_pixel_pos_ == 1) { - if (isnan(prev_value_at_pixel_)) { + 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 @@ -1004,7 +1059,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form) 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 @@ -1038,11 +1093,34 @@ void AnalogSignal::hover_point_changed(const QPoint &hp) if (hp.x() <= 0) { value_at_hover_pos_ = std::numeric_limits::quiet_NaN(); } else { - try { + if ((size_t)hp.x() < value_at_pixel_pos_.size()) value_at_hover_pos_ = value_at_pixel_pos_.at(hp.x()); - } catch (out_of_range) { + else value_at_hover_pos_ = std::numeric_limits::quiet_NaN(); - } + } +} + +void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value) +{ + 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); } } @@ -1259,14 +1337,6 @@ void AnalogSignal::on_display_type_changed(int index) owner_->row_item_appearance_changed(false, true); } -void AnalogSignal::on_settingViewConversionThresholdDispMode_changed(const QVariant new_value) -{ - conversion_threshold_disp_mode_ = new_value.toInt(); - - if (owner_) - owner_->row_item_appearance_changed(false, true); -} - } // namespace trace } // namespace views } // namespace pv