View: Fixes related to multi-segment display

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

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index 407551843bfdcaeaa633345108b69647c22fbc37..bbb00ef6ad862f6fa27a0e6c0cdb498080c921c7 100644 (file)
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -46,6 +46,7 @@ using std::max;
 using std::make_pair;
 using std::min;
 using std::none_of;
+using std::out_of_range;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
@@ -191,13 +192,10 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
        const float high_offset = y - signal_height_ + 0.5f;
        const float low_offset = y + 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
@@ -348,6 +346,30 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
        p.drawLines(lines, line - lines);
 }
 
+shared_ptr<pv::data::LogicSegment> LogicSignal::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) {
+                       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;
+}
+
 void LogicSignal::init_trigger_actions(QWidget *parent)
 {
        trigger_none_ = new QAction(*get_icon(":/icons/trigger-none.svg"),