Finalize segment decoding

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

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 07919c28ac937d13b4767f5ccea297e2df5543df..f350459c500bdb9190d44fa0cad0e04a4e1200ad 100644 (file)
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -125,6 +125,8 @@ bool CustomScrollArea::viewportEvent(QEvent *event)
 View::View(Session &session, bool is_main_view, QWidget *parent) :
        ViewBase(session, is_main_view, parent),
        splitter_(new QSplitter()),
+       segment_display_mode_(Trace::ShowLastSegmentOnly),
+       segment_selectable_(false),
        scale_(1e-3),
        offset_(0),
        updating_scroll_(false),
@@ -227,6 +229,9 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 
        // Update the zoom state
        calculate_tick_spacing();
+
+       // Make sure the standard bar's segment selector is in sync
+       set_segment_display_mode(segment_display_mode_);
 }
 
 Session& View::session()
@@ -255,6 +260,9 @@ void View::add_signal(const shared_ptr<Signal> signal)
        ViewBase::add_signalbase(signal->base());
        signals_.insert(signal);
 
+       signal->set_segment_display_mode(segment_display_mode_);
+       signal->set_current_segment(current_segment_);
+
        connect(signal->base().get(), SIGNAL(name_changed(const QString&)),
                this, SLOT(on_signal_name_changed()));
 }
@@ -271,6 +279,9 @@ void View::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
                new DecodeTrace(session_, signal, decode_traces_.size()));
        decode_traces_.push_back(d);
 
+       d->set_segment_display_mode(segment_display_mode_);
+       d->set_current_segment(current_segment_);
+
        connect(signal.get(), SIGNAL(name_changed(const QString&)),
                this, SLOT(on_signal_name_changed()));
 }
@@ -477,6 +488,26 @@ void View::set_time_unit(pv::util::TimeUnit time_unit)
        }
 }
 
+bool View::segment_is_selectable() const
+{
+       return segment_selectable_;
+}
+
+void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
+{
+       for (shared_ptr<Signal> signal : signals_)
+               signal->set_segment_display_mode(mode);
+
+       viewport_->update();
+
+       segment_selectable_ = true;
+
+       if (mode == Trace::ShowLastSegmentOnly)
+               segment_selectable_ = false;
+
+       segment_display_mode_changed(segment_selectable_);
+}
+
 void View::zoom(double steps)
 {
        zoom(steps, viewport_->width() / 2);
@@ -1386,16 +1417,27 @@ void View::capture_state_updated(int state)
 void View::on_new_segment(int new_segment_id)
 {
        on_segment_changed(new_segment_id);
+       segment_changed(new_segment_id);
 }
 
 void View::on_segment_changed(int segment)
 {
-       current_segment_ = segment - 1;
-
-       for (shared_ptr<Signal> signal : signals_)
-               signal->set_current_segment(current_segment_);
+       switch (segment_display_mode_) {
+       case Trace::ShowLastSegmentOnly:
+       case Trace::ShowSingleSegmentOnly:
+               current_segment_ = segment;
+               for (shared_ptr<Signal> signal : signals_)
+                       signal->set_current_segment(current_segment_);
+               for (shared_ptr<DecodeTrace> dt : decode_traces_)
+                       dt->set_current_segment(current_segment_);
+               viewport_->update();
+               break;
 
-       viewport_->update();
+       case Trace::ShowAllSegments:
+       case Trace::ShowAccumulatedIntensity:
+       default:
+               break;
+       }
 }
 
 void View::perform_delayed_view_update()