#include "ruler.hpp"
#include "signal.hpp"
#include "tracegroup.hpp"
+#include "triggermarker.hpp"
#include "view.hpp"
#include "viewport.hpp"
show_cursors_(false),
cursors_(new CursorPair(*this)),
next_flag_text_('A'),
+ trigger_markers_(),
hover_point_(-1, -1)
{
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
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;
}
next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
(next_flag_text_ + 1);
- // Skip 'T' (for trigger) as it's treated special
- if (next_flag_text_ == 'T')
- next_flag_text_ += 1;
-
time_item_appearance_changed(true, true);
}
void View::trigger_event(util::Timestamp location)
{
- char next_flag_text = next_flag_text_;
-
- next_flag_text_ = 'T';
- add_flag(location);
-
- next_flag_text_ = next_flag_text;
+ trigger_markers_.push_back(shared_ptr<TriggerMarker>(
+ new TriggerMarker(*this, location)));
}
void View::get_scroll_layout(double &length, Timestamp &offset) const
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