X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=af15f1e49105f522e4eae124c9182623553c538b;hp=292933e7eefa70abb5753a0a3e66f9614292415a;hb=57c04e781e96020c7185d7b6e634629007497227;hpb=ffc00fdd5946593ad2a587078fd4ee9ba0a507ec

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 292933e7..af15f1e4 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -79,6 +79,7 @@ using std::make_pair;
 using std::make_shared;
 using std::min;
 using std::pair;
+using std::placeholders::_1;
 using std::set;
 using std::set_difference;
 using std::shared_ptr;
@@ -198,6 +199,8 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	GlobalSettings settings;
 	coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
 
+	GlobalSettings::add_change_handler(this);
+
 	connect(scrollarea_->horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
 	connect(scrollarea_->verticalScrollBar(), SIGNAL(valueChanged(int)),
@@ -235,6 +238,11 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	set_segment_display_mode(segment_display_mode_);
 }
 
+View::~View()
+{
+	GlobalSettings::remove_change_handler(this);
+}
+
 Session& View::session()
 {
 	return session_;
@@ -432,27 +440,43 @@ void View::set_scale(double scale)
 	}
 }
 
-void View::set_offset(const pv::util::Timestamp& offset)
+void View::set_offset(const pv::util::Timestamp& offset, bool force_update)
 {
-	if (offset_ != offset) {
+	if ((offset_ != offset) || force_update) {
 		offset_ = offset;
 		ruler_offset_ = offset_ + ruler_shift_;
 		offset_changed();
 	}
 }
 
-// Returns the internal version of the time offset
 const Timestamp& View::offset() const
 {
 	return offset_;
 }
 
-// Returns the ruler version of the time offset
 const Timestamp& View::ruler_offset() const
 {
 	return ruler_offset_;
 }
 
+void View::set_zero_position(pv::util::Timestamp& position)
+{
+	ruler_shift_ = -position;
+
+	// Force an immediate update of the offsets
+	set_offset(offset_, true);
+	ruler_->update();
+}
+
+void View::reset_zero_position()
+{
+	ruler_shift_ = 0;
+
+	// Force an immediate update of the offsets
+	set_offset(offset_, true);
+	ruler_->update();
+}
+
 int View::owner_visual_v_offset() const
 {
 	return -scrollarea_->verticalScrollBar()->sliderPosition();
@@ -506,6 +530,11 @@ const pv::util::Timestamp& View::tick_period() const
 	return tick_period_;
 }
 
+unsigned int View::minor_tick_count() const
+{
+	return minor_tick_count_;
+}
+
 void View::set_tick_period(const pv::util::Timestamp& tick_period)
 {
 	if (tick_period_ != tick_period) {
@@ -533,8 +562,23 @@ void View::set_current_segment(uint32_t segment_id)
 
 	for (shared_ptr<Signal> signal : signals_)
 		signal->set_current_segment(current_segment_);
+#ifdef ENABLE_DECODE
 	for (shared_ptr<DecodeTrace> dt : decode_traces_)
 		dt->set_current_segment(current_segment_);
+#endif
+
+	vector<util::Timestamp> triggers = session_.get_triggers(current_segment_);
+
+	trigger_markers_.clear();
+	for (util::Timestamp timestamp : triggers)
+		trigger_markers_.push_back(make_shared<TriggerMarker>(*this, timestamp));
+
+	// When enabled, the first trigger for this segment is used as the zero position
+	GlobalSettings settings;
+	bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool();
+
+	if (trigger_is_zero_time && (triggers.size() > 0))
+		set_zero_position(triggers.front());
 
 	viewport_->update();
 
@@ -553,6 +597,8 @@ Trace::SegmentDisplayMode View::segment_display_mode() const
 
 void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
 {
+	trigger_markers_.clear();
+
 	segment_display_mode_ = mode;
 
 	for (shared_ptr<Signal> signal : signals_)
@@ -821,16 +867,27 @@ void View::restack_all_trace_tree_items()
 		i->animate_to_layout_v_offset();
 }
 
-void View::trigger_event(util::Timestamp location)
+void View::on_setting_changed(const QString &key, const QVariant &value)
 {
-	// Set up ruler_shift if the Key_View_TriggerIsZeroTime option is set.
+	if (key == GlobalSettings::Key_View_TriggerIsZeroTime)
+		on_settingViewTriggerIsZeroTime_changed(value);
+}
+
+void View::trigger_event(int segment_id, util::Timestamp location)
+{
+	// TODO This doesn't work if we're showing multiple segments at once
+	if ((uint32_t)segment_id != current_segment_)
+		return;
+
+	// Set zero location if the Key_View_TriggerIsZeroTime setting is set and
+	// if this is the first trigger for this segment.
 	GlobalSettings settings;
 	bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool();
 
-	ruler_shift_ = (trigger_is_zero_time) ? (-location) : (0);
-	// Force an immediate update of both offsets
-	offset_ -= 0.001;
-	set_offset(offset_ + 0.001);
+	size_t trigger_count = session_.get_triggers(current_segment_).size();
+
+	if (trigger_is_zero_time && trigger_count == 1)
+		set_zero_position(location);
 
 	trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
@@ -896,6 +953,7 @@ void View::calculate_tick_spacing()
 				(ScaleUnits[unit++] + tp_margin);
 		} while (tp_with_margin < min_period && unit < countof(ScaleUnits));
 
+		minor_tick_count_ = (unit == 2) ? (4) : (5);
 		tick_period = order_decimal * ScaleUnits[unit - 1];
 		tick_prefix = static_cast<pv::util::SIPrefix>(
 			(order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3);
@@ -1547,6 +1605,17 @@ void View::on_segment_changed(int segment)
 	}
 }
 
+void View::on_settingViewTriggerIsZeroTime_changed(const QVariant new_value)
+{
+	if (new_value.toBool()) {
+		// The first trigger for this segment is used as the zero position
+		vector<util::Timestamp> triggers = session_.get_triggers(current_segment_);
+		if (triggers.size() > 0)
+			set_zero_position(triggers.front());
+	} else
+		reset_zero_position();
+}
+
 void View::perform_delayed_view_update()
 {
 	if (always_zoom_to_fit_) {