X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=f1de3b20e9faeab2c2ac10e3665b5b38d897d1ae;hp=df58967523e2e692b9b64b60df0a2564f10cc2ad;hb=HEAD;hpb=0bb3dd25421a8638afb881d46799a13378d3f00b

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index df589675..33d8b0a4 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -41,27 +41,28 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-#include "analogsignal.hpp"
-#include "header.hpp"
-#include "logicsignal.hpp"
-#include "ruler.hpp"
-#include "signal.hpp"
-#include "tracegroup.hpp"
-#include "triggermarker.hpp"
 #include "view.hpp"
-#include "viewport.hpp"
 
+#include "pv/globalsettings.hpp"
 #include "pv/metadata_obj.hpp"
+#include "pv/session.hpp"
+#include "pv/util.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/data/signalbase.hpp"
 #include "pv/devices/device.hpp"
-#include "pv/globalsettings.hpp"
-#include "pv/session.hpp"
-#include "pv/util.hpp"
+#include "pv/views/trace/mathsignal.hpp"
+#include "pv/views/trace/analogsignal.hpp"
+#include "pv/views/trace/header.hpp"
+#include "pv/views/trace/logicsignal.hpp"
+#include "pv/views/trace/ruler.hpp"
+#include "pv/views/trace/signal.hpp"
+#include "pv/views/trace/tracegroup.hpp"
+#include "pv/views/trace/triggermarker.hpp"
+#include "pv/views/trace/viewport.hpp"
 
 #ifdef ENABLE_DECODE
-#include "decodetrace.hpp"
+#include "pv/views/trace/decodetrace.hpp"
 #endif
 
 using pv::data::SignalBase;
@@ -91,7 +92,7 @@ namespace views {
 namespace trace {
 
 const Timestamp View::MaxScale("1e9");
-const Timestamp View::MinScale("1e-12");
+const Timestamp View::MinScale("1e-14");
 
 const int View::MaxScrollValue = INT_MAX / 2;
 
@@ -358,13 +359,17 @@ void View::add_signalbase(const shared_ptr<data::SignalBase> signalbase)
 
 	switch (signalbase->type()) {
 	case SignalBase::LogicChannel:
-		signal = shared_ptr<Signal>(new LogicSignal(session_, session_.device(), signalbase));
+		signal = shared_ptr<Signal>(new LogicSignal(session_, signalbase));
 		break;
 
 	case SignalBase::AnalogChannel:
 		signal = shared_ptr<Signal>(new AnalogSignal(session_, signalbase));
 		break;
 
+	case SignalBase::MathChannel:
+		signal = shared_ptr<Signal>(new MathSignal(session_, signalbase));
+		break;
+
 	default:
 		qDebug() << "Unknown signalbase type:" << signalbase->type();
 		assert(false);
@@ -578,6 +583,9 @@ void View::set_scale(double scale)
 {
 	if (scale_ != scale) {
 		scale_ = scale;
+
+		update_view_range_metaobject();
+
 		scale_changed();
 	}
 }
@@ -588,20 +596,7 @@ void View::set_offset(const pv::util::Timestamp& offset, bool force_update)
 		offset_ = offset;
 		ruler_offset_ = offset_ + zero_offset_;
 
-		const int w = viewport_->width();
-		if (w > 0) {
-			const double samplerate = session_.get_samplerate();
-			// Note: sample_num = time * samplerate
-			// Note: samples_per_pixel = samplerate * scale
-			int64_t start_sample = (offset_ * samplerate).convert_to<int64_t>();
-			int64_t end_sample = (offset_ * samplerate).convert_to<int64_t>() +
-				(w * session_.get_samplerate() * scale_);
-
-			MetadataObject* md_obj =
-				session_.metadata_obj_manager()->find_object_by_type(MetadataObjMainViewRange);
-			md_obj->set_value(MetadataValueStartSample, QVariant((qlonglong)start_sample));
-			md_obj->set_value(MetadataValueEndSample, QVariant((qlonglong)end_sample));
-		}
+		update_view_range_metaobject();
 
 		offset_changed();
 	}
@@ -787,7 +782,7 @@ void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
 	for (const shared_ptr<Signal>& signal : signals_)
 		signal->set_segment_display_mode(mode);
 
-	uint32_t last_segment = session_.get_segment_count() - 1;
+	uint32_t last_segment = session_.get_highest_segment_id();
 
 	switch (mode) {
 	case Trace::ShowLastSegmentOnly:
@@ -864,21 +859,31 @@ void View::zoom_fit(bool gui_state)
 void View::focus_on_range(uint64_t start_sample, uint64_t end_sample)
 {
 	assert(viewport_);
-	const int w = viewport_->width();
+	const uint64_t w = viewport_->width();
 	if (w <= 0)
 		return;
 
 	const double samplerate = session_.get_samplerate();
+	const double samples_per_pixel = samplerate * scale_;
+	const uint64_t viewport_samples = w * samples_per_pixel;
 
 	const uint64_t sample_delta = (end_sample - start_sample);
 
 	// Note: We add 20% margin on the left and 5% on the right
-	const Timestamp delta = (sample_delta * 1.25) / samplerate;
-
-	const Timestamp scale = max(min(delta / w, MaxScale), MinScale);
-	const Timestamp offset = (start_sample - sample_delta * 0.20) / samplerate;
-
-	set_scale_offset(scale.convert_to<double>(), offset);
+	const uint64_t ext_sample_delta = sample_delta * 1.25;
+
+	// Check if we can keep the zoom level and just center the supplied range
+	if (viewport_samples >= ext_sample_delta) {
+		// Note: offset is the left edge of the view so to center, we subtract half the view width
+		const int64_t sample_offset = (start_sample + (sample_delta / 2) - (viewport_samples / 2));
+		const Timestamp offset = sample_offset / samplerate;
+		set_scale_offset(scale_, offset);
+	} else {
+		const Timestamp offset = (start_sample - sample_delta * 0.20) / samplerate;
+		const Timestamp delta = ext_sample_delta / samplerate;
+		const Timestamp scale = max(min(delta / w, MaxScale), MinScale);
+		set_scale_offset(scale.convert_to<double>(), offset);
+	}
 }
 
 void View::set_scale_offset(double scale, const Timestamp& offset)
@@ -915,7 +920,7 @@ vector< shared_ptr<SignalData> > View::get_visible_data() const
 	vector< shared_ptr<SignalData> > visible_data;
 	for (const shared_ptr<Signal>& sig : signals_)
 		if (sig->enabled())
-			visible_data.push_back(sig->data());
+			visible_data.push_back(sig->base()->data());
 
 	return visible_data;
 }
@@ -928,9 +933,9 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
 	if (signals_.size() == 0)
 		return make_pair(0, 0);
 
-	for (shared_ptr<Signal> s : signals_)
-		if (s->data()->segments().size() > 0)
-			data.push_back(s->data());
+	for (const shared_ptr<Signal>& s : signals_)
+		if (s->base()->data() && (s->base()->data()->segments().size() > 0))
+			data.push_back(s->base()->data());
 
 	for (const shared_ptr<SignalData>& d : data) {
 		const vector< shared_ptr<Segment> > segments = d->segments();
@@ -1427,6 +1432,8 @@ void View::resize_header_to_fit()
 void View::update_layout()
 {
 	update_scroll();
+
+	update_view_range_metaobject();
 }
 
 TraceTreeItemOwner* View::find_prevalent_trace_group(
@@ -1495,7 +1502,7 @@ void View::determine_time_unit()
 	if (time_unit_ == util::TimeUnit::Samples) {
 		// Check all signals but...
 		for (const shared_ptr<Signal>& signal : signals_) {
-			const shared_ptr<SignalData> data = signal->data();
+			const shared_ptr<SignalData> data = signal->base()->data();
 
 			// ...only check first segment of each
 			const vector< shared_ptr<Segment> > segments = data->segments();
@@ -1523,7 +1530,11 @@ bool View::eventFilter(QObject *object, QEvent *event)
 		else if (object == ruler_)
 			hover_point_ = mouse_event->pos();
 		else if (object == header_)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+			hover_point_ = QPoint(0, mouse_event->pos().y());
+#else
 			hover_point_ = QPoint(0, mouse_event->y());
+#endif
 		else
 			hover_point_ = QPoint(-1, -1);
 
@@ -1587,10 +1598,22 @@ void View::contextMenuEvent(QContextMenuEvent *event)
 	QPoint pos = event->pos() - QPoint(0, ruler_->sizeHint().height());
 
 	const shared_ptr<ViewItem> r = viewport_->get_mouse_over_item(pos);
-	if (!r)
-		return;
 
-	QMenu *menu = r->create_view_context_menu(this, pos);
+	QMenu* menu = nullptr;
+
+	if (!r) {
+		context_menu_x_pos_ = pos.x();
+
+		// No view item under cursor, use generic menu
+		menu = new QMenu(this);
+
+		QAction *const create_marker_here = new QAction(tr("Create marker here"), this);
+		connect(create_marker_here, SIGNAL(triggered()), this, SLOT(on_create_marker_here()));
+		menu->addAction(create_marker_here);
+	} else {
+		menu = r->create_view_context_menu(this, pos);
+	}
+
 	if (menu)
 		menu->popup(event->globalPos());
 }
@@ -1604,6 +1627,31 @@ void View::resizeEvent(QResizeEvent* event)
 	update_layout();
 }
 
+void View::update_view_range_metaobject() const
+{
+	const int w = viewport_->width();
+	if (w > 0) {
+		const double samplerate = session_.get_samplerate();
+		// Note: sample_num = time * samplerate
+		// Note: samples_per_pixel = samplerate * scale
+		const int64_t start_sample = (offset_ * samplerate).convert_to<int64_t>();
+		const int64_t end_sample = (offset_ * samplerate).convert_to<int64_t>() +
+			(w * session_.get_samplerate() * scale_);
+
+		MetadataObject* md_obj =
+			session_.metadata_obj_manager()->find_object_by_type(MetadataObjMainViewRange);
+
+		const int64_t old_start_sample = md_obj->value(MetadataValueStartSample).toLongLong();
+		const int64_t old_end_sample = md_obj->value(MetadataValueEndSample).toLongLong();
+
+		if (start_sample != old_start_sample)
+			md_obj->set_value(MetadataValueStartSample, QVariant((qlonglong)start_sample));
+
+		if (end_sample != old_end_sample)
+			md_obj->set_value(MetadataValueEndSample, QVariant((qlonglong)end_sample));
+	}
+}
+
 void View::update_hover_point()
 {
 	// Determine signal that the mouse cursor is hovering over
@@ -2035,6 +2083,13 @@ void View::on_segment_changed(int segment)
 	}
 }
 
+void View::on_create_marker_here()
+{
+	const QPoint p = ruler_->mapFrom(this, QPoint(context_menu_x_pos_, 0));
+
+	add_flag(ruler_->get_absolute_time_from_x_pos(p.x()));
+}
+
 void View::on_settingViewTriggerIsZeroTime_changed(const QVariant new_value)
 {
 	(void)new_value;