Fix #1125 by adding a missing typecast

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

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index 2c5c82a9d1d18c5609d9d7965d2a10f35a6e2149..11a73068b25c13bb7724971a57aad8775796e38b 100644 (file)
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -28,6 +28,7 @@
 #include <QApplication>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QDebug>
 #include <QFormLayout>
 #include <QGridLayout>
 #include <QLabel>
@@ -54,6 +55,7 @@ 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;
@@ -116,8 +118,7 @@ AnalogSignal::AnalogSignal(
        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::add_change_handler(this);
 
        GlobalSettings gs;
        conversion_threshold_disp_mode_ =
@@ -129,6 +130,11 @@ AnalogSignal::AnalogSignal(
        update_scale();
 }
 
+AnalogSignal::~AnalogSignal()
+{
+       GlobalSettings::remove_change_handler(this);
+}
+
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
        return base_->analog_data();
@@ -204,6 +210,12 @@ void AnalogSignal::scale_handle_drag_release()
        update_scale();
 }
 
+void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value)
+{
+       if (key == GlobalSettings::Key_View_ConversionThresholdDispMode)
+               on_settingViewConversionThresholdDispMode_changed(value);
+}
+
 void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp)
 {
        if (!base_->enabled())
@@ -225,8 +237,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));
@@ -235,7 +249,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));
@@ -263,18 +278,14 @@ 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<pv::data::AnalogSegment> > &segments =
-                       base_->analog_data()->analog_segments();
-               if (segments.empty())
+               shared_ptr<pv::data::AnalogSegment> segment = get_analog_segment_to_paint();
+               if (!segment)
                        return;
 
-               const shared_ptr<pv::data::AnalogSegment> &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 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();
@@ -529,15 +540,10 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
        const float high_offset = y - ph + signal_margin + 0.5f;
        const float low_offset = y + nh - signal_margin - 0.5f;
 
-       const deque< shared_ptr<pv::data::LogicSegment> > &segments =
-               base_->logic_data()->logic_segments();
-
-       if (segments.empty())
+       shared_ptr<pv::data::LogicSegment> segment = get_logic_segment_to_paint();
+       if (!segment)
                return;
 
-       const shared_ptr<pv::data::LogicSegment> &segment =
-               segments.front();
-
        double samplerate = segment->samplerate();
 
        // Show sample rate as 1Hz when it is unknown
@@ -546,7 +552,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 
        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 int64_t last_sample = (int64_t)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);
@@ -651,6 +657,54 @@ void AnalogSignal::paint_logic_caps(QPainter &p, QLineF *const lines,
        p.drawLines(lines, line - lines);
 }
 
+shared_ptr<pv::data::AnalogSegment> AnalogSignal::get_analog_segment_to_paint() const
+{
+       shared_ptr<pv::data::AnalogSegment> segment;
+
+       const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
+               base_->analog_data()->analog_segments();
+
+       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_;
+                       }
+               }
+       }
+
+       return segment;
+}
+
+shared_ptr<pv::data::LogicSegment> AnalogSignal::get_logic_segment_to_paint() const
+{
+       shared_ptr<pv::data::LogicSegment> segment;
+
+       const deque< shared_ptr<pv::data::LogicSegment> > &segments =
+               base_->logic_data()->logic_segments();
+
+       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 logic segment out of range for signal" << base_->name() << ":" << current_segment_;
+                       }
+               }
+       }
+
+       return segment;
+}
+
 float AnalogSignal::get_resolution(int scale_index)
 {
        const float seq[] = {1.0f, 2.0f, 5.0f};