Fix #1292/1294 by snapping to any edge when not hovering over a signal

[pulseview.git] / pv / views / trace / analogsignal.cpp

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index 14870285fd144da5314ce914bd87b5935d846ef8..0419b03b698eb208496e15b75957c2eb8b6d9663 100644 (file)
--- 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;
 
@@ -104,12 +106,12 @@ AnalogSignal::AnalogSignal(
        shared_ptr<data::SignalBase> base) :
        Signal(session, base),
        scale_index_(4), // 20 per div
-       scale_index_drag_offset_(0),
        pos_vdivs_(1),
        neg_vdivs_(1),
        resolution_(0),
        display_type_(DisplayBoth),
-       autoranging_(true)
+       autoranging_(true),
+       value_at_hover_pos_(std::numeric_limits<float>::quiet_NaN())
 {
        axis_pen_ = AxisPen;
 
@@ -129,11 +131,6 @@ AnalogSignal::AnalogSignal(
        update_scale();
 }
 
-AnalogSignal::~AnalogSignal()
-{
-       GlobalSettings::remove_change_handler(this);
-}
-
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
        return base_->analog_data();
@@ -187,28 +184,6 @@ pair<int, int> 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);
@@ -321,7 +296,7 @@ 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(resolution_);
@@ -789,6 +764,37 @@ void AnalogSignal::update_conversion_widgets()
        conv_threshold_cb_->blockSignals(false);
 }
 
+vector<data::LogicSegment::EdgePair> 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<data::LogicSegment::EdgePair>();
+
+       if (sample_pos == 0)
+               return vector<LogicSegment::EdgePair>();
+
+       shared_ptr<LogicSegment> segment = get_logic_segment_to_paint();
+       if (!segment || (segment->get_sample_count() == 0))
+               return vector<LogicSegment::EdgePair>();
+
+       const View *view = owner_->view();
+       assert(view);
+       const double samples_per_pixel = base_->get_samplerate() * view->scale();
+
+       vector<LogicSegment::EdgePair> edges;
+
+       segment->get_surrounding_edges(edges, sample_pos,
+               samples_per_pixel / LogicSignal::Oversampling, 0);
+
+       if (edges.empty())
+               return vector<LogicSegment::EdgePair>();
+
+       return edges;
+}
+
 void AnalogSignal::perform_autoranging(bool keep_divs, bool force_update)
 {
        const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
@@ -870,7 +876,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 +890,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 +1010,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
@@ -1040,7 +1046,7 @@ void AnalogSignal::hover_point_changed(const QPoint &hp)
        } else {
                try {
                        value_at_hover_pos_ = value_at_pixel_pos_.at(hp.x());
-               } catch (out_of_range) {
+               } catch (out_of_range&) {
                        value_at_hover_pos_ = std::numeric_limits<float>::quiet_NaN();
                }
        }