DecodeTrace: Use qreal instead of int for annotation drawing

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

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index bbc23fb70074bace6adc25e304d70d50583de3dd..8a055729e10d6305a2887e33cd87f660e516896f 100644 (file)
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -47,7 +47,6 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-using std::bind;
 using std::deque;
 using std::div;
 using std::div_t;
@@ -57,7 +56,6 @@ 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;
 
@@ -67,7 +65,7 @@ namespace pv {
 namespace views {
 namespace trace {
 
-const QColor AnalogSignal::SignalColours[4] = {
+const QColor AnalogSignal::SignalColors[4] = {
        QColor(0xC4, 0xA0, 0x00),       // Yellow
        QColor(0x87, 0x20, 0x7A),       // Magenta
        QColor(0x20, 0x4A, 0x87),       // Blue
@@ -78,10 +76,10 @@ 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::SamplingPointColourLo = QColor(200, 0, 0, 80 * 256 / 100);
-const QColor AnalogSignal::SamplingPointColourNe = QColor(0,   0, 0, 80 * 256 / 100);
-const QColor AnalogSignal::SamplingPointColourHi = QColor(0, 200, 0, 80 * 256 / 100);
+const QColor AnalogSignal::SamplingPointColor(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);
@@ -126,7 +124,7 @@ AnalogSignal::AnalogSignal(
 
        div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt();
 
-       base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
+       base_->set_color(SignalColors[base_->index() % countof(SignalColors)]);
        update_scale();
 }
 
@@ -279,13 +277,13 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
                paint_grid(p, y, pp.left(), pp.right());
 
                shared_ptr<pv::data::AnalogSegment> segment = get_analog_segment_to_paint();
-               if (!segment)
+               if (!segment || (segment->get_sample_count() == 0))
                        return;
 
                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();
@@ -320,7 +318,7 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
                // Show the info section on the right side of the trace
                const QString infotext = QString("%1 V/div").arg(resolution_);
 
-               p.setPen(base_->colour());
+               p.setPen(base_->color());
                p.setFont(QApplication::font());
 
                const QRectF bounding_rect = QRectF(pp.left(),
@@ -407,7 +405,7 @@ void AnalogSignal::paint_trace(QPainter &p,
                (settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() ||
                paint_thr_dots) && (samples_per_pixel < 0.25);
 
-       p.setPen(base_->colour());
+       p.setPen(base_->color());
 
        const int64_t points_count = end - start;
 
@@ -449,8 +447,7 @@ void AnalogSignal::paint_trace(QPainter &p,
                                }
                        }
 
-                       sampling_points[idx].push_back(
-                               QRectF(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w));
+                       sampling_points[idx].emplace_back(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w);
                }
        }
        delete[] sample_block;
@@ -459,14 +456,14 @@ void AnalogSignal::paint_trace(QPainter &p,
 
        if (show_sampling_points) {
                if (paint_thr_dots) {
-                       p.setPen(SamplingPointColourNe);
+                       p.setPen(SamplingPointColorNe);
                        p.drawRects(sampling_points[0].data(), sampling_points[0].size());
-                       p.setPen(SamplingPointColourLo);
+                       p.setPen(SamplingPointColorLo);
                        p.drawRects(sampling_points[1].data(), sampling_points[1].size());
-                       p.setPen(SamplingPointColourHi);
+                       p.setPen(SamplingPointColorHi);
                        p.drawRects(sampling_points[2].data(), sampling_points[2].size());
                } else {
-                       p.setPen(SamplingPointColour);
+                       p.setPen(SamplingPointColor);
                        p.drawRects(sampling_points[0].data(), sampling_points[0].size());
                }
        }
@@ -488,7 +485,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;
@@ -541,7 +538,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
        const float low_offset = y + nh - signal_margin - 0.5f;
 
        shared_ptr<pv::data::LogicSegment> segment = get_logic_segment_to_paint();
-       if (!segment)
+       if (!segment || (segment->get_sample_count() == 0))
                return;
 
        double samplerate = segment->samplerate();
@@ -552,7 +549,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);
@@ -614,7 +611,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
                        sampling_point_x += pixels_per_sample;
                };
 
-       p.setPen(LogicSignal::EdgeColour);
+       p.setPen(LogicSignal::EdgeColor);
        p.drawLines(edge_lines, edge_count);
        delete[] edge_lines;
 
@@ -622,10 +619,10 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
        const unsigned int max_cap_line_count = edges.size();
        QLineF *const cap_lines = new QLineF[max_cap_line_count];
 
-       p.setPen(LogicSignal::HighColour);
+       p.setPen(LogicSignal::HighColor);
        paint_logic_caps(p, cap_lines, edges, true, samples_per_pixel,
                pixels_offset, pp.left(), high_offset);
-       p.setPen(LogicSignal::LowColour);
+       p.setPen(LogicSignal::LowColor);
        paint_logic_caps(p, cap_lines, edges, false, samples_per_pixel,
                pixels_offset, pp.left(), low_offset);
 
@@ -633,7 +630,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 
        // Paint the sampling points
        if (show_sampling_points) {
-               p.setPen(SamplingPointColour);
+               p.setPen(SamplingPointColor);
                p.drawRects(sampling_points.data(), sampling_points.size());
        }
 }
@@ -672,7 +669,7 @@ shared_ptr<pv::data::AnalogSegment> AnalogSignal::get_analog_segment_to_paint()
                                (segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
                        try {
                                segment = segments.at(current_segment_);
-                       } catch (out_of_range) {
+                       } catch (out_of_range&) {
                                qDebug() << "Current analog segment out of range for signal" << base_->name() << ":" << current_segment_;
                        }
                }
@@ -696,7 +693,7 @@ shared_ptr<pv::data::LogicSegment> AnalogSignal::get_logic_segment_to_paint() co
                                (segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
                        try {
                                segment = segments.at(current_segment_);
-                       } catch (out_of_range) {
+                       } catch (out_of_range&) {
                                qDebug() << "Current logic segment out of range for signal" << base_->name() << ":" << current_segment_;
                        }
                }