view/analogsignal: set samplerate to 1.0 if samplerate is not known

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 7de1c792c06fa9880eee2d295e4cc8fc9672ef19..6a342915972312b96e29e731fd75fed59191df6e 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -48,6 +48,7 @@
 #include "ruler.hpp"
 #include "signal.hpp"
 #include "tracegroup.hpp"
+#include "triggermarker.hpp"
 #include "view.hpp"
 #include "viewport.hpp"
 
@@ -114,6 +115,7 @@ View::View(Session &session, QWidget *parent) :
        show_cursors_(false),
        cursors_(new CursorPair(*this)),
        next_flag_text_('A'),
+       trigger_markers_(),
        hover_point_(-1, -1)
 {
        connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -207,6 +209,10 @@ vector< shared_ptr<TimeItem> > View::time_items() const
        items.push_back(cursors_);
        items.push_back(cursors_->first());
        items.push_back(cursors_->second());
+
+       for (auto trigger_marker : trigger_markers_)
+               items.push_back(trigger_marker);
+
        return items;
 }
 
@@ -462,8 +468,10 @@ void View::add_flag(const Timestamp& time)
 {
        flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
                QString("%1").arg(next_flag_text_))));
+
        next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
                (next_flag_text_ + 1);
+
        time_item_appearance_changed(true, true);
 }
 
@@ -518,6 +526,12 @@ void View::restack_all_trace_tree_items()
                i->animate_to_layout_v_offset();
 }
 
+void View::trigger_event(util::Timestamp location)
+{
+       trigger_markers_.push_back(shared_ptr<TriggerMarker>(
+               new TriggerMarker(*this, location)));
+}
+
 void View::get_scroll_layout(double &length, Timestamp &offset) const
 {
        const pair<Timestamp, Timestamp> extents = get_time_extents();
@@ -1005,9 +1019,12 @@ void View::signals_changed()
 
 void View::capture_state_updated(int state)
 {
-       if (state == Session::Running)
+       if (state == Session::Running) {
                set_time_unit(util::TimeUnit::Samples);
 
+               trigger_markers_.clear();
+       }
+
        if (state == Session::Stopped) {
                // After acquisition has stopped we need to re-calculate the ticks once
                // as it's otherwise done when the user pans or zooms, which is too late