X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=f727cc33b540b4fddc18b77f154a08051d3a78d4;hb=d1e7d82c6327c15f38d66602e65c4d3abe114df7;hp=42a2f79f0b22e96b45340c67aef0eabaa0c8957d;hpb=4e5a4405482a296ebb6014e627298ad156c78d55;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 42a2f79..f727cc3 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -24,13 +24,15 @@
 #include <limits.h>
 #include <math.h>
 
+#include <set>
+
 #include <boost/foreach.hpp>
 
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
 
-#include "decodesignal.h"
+#include "decodetrace.h"
 #include "header.h"
 #include "ruler.h"
 #include "signal.h"
@@ -146,11 +148,79 @@ void View::zoom(double steps)
 
 void View::zoom(double steps, int offset)
 {
-	const double cursor_offset = _offset + _scale * offset;
 	const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
 		MaxScale), MinScale);
-	const double new_offset = cursor_offset - new_scale * offset;
-	set_scale_offset(new_scale, new_offset);
+	set_zoom(new_scale, offset);
+}
+
+void View::zoom_fit()
+{
+	using pv::data::SignalData;
+
+	const vector< shared_ptr<Signal> > sigs(
+		session().get_signals());
+
+	// Make a set of all the visible data objects
+	set< shared_ptr<SignalData> > visible_data;
+	BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
+		if (sig->enabled())
+			visible_data.insert(sig->data());
+
+	if (visible_data.empty())
+		return;
+
+	double left_time = DBL_MAX, right_time = DBL_MIN;
+	BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data)
+	{
+		const double start_time = d->get_start_time();
+		left_time = min(left_time, start_time);
+		right_time = max(right_time, start_time +
+			d->get_max_sample_count() / d->samplerate());
+	}
+
+	assert(left_time < right_time);
+	if (right_time - left_time < 1e-12)
+		return;
+
+	assert(_viewport);
+	const int w = _viewport->width();
+	if (w <= 0)
+		return;
+
+	set_scale_offset((right_time - left_time) / w, left_time);	
+}
+
+void View::zoom_one_to_one()
+{
+	using pv::data::SignalData;
+
+	const vector< shared_ptr<Signal> > sigs(
+		session().get_signals());
+
+	// Make a set of all the visible data objects
+	set< shared_ptr<SignalData> > visible_data;
+	BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
+		if (sig->enabled())
+			visible_data.insert(sig->data());
+
+	if (visible_data.empty())
+		return;
+
+	double samplerate = 0.0;
+	BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data) {
+		assert(d);
+		samplerate = max(samplerate, d->samplerate());
+	}
+
+	if (samplerate == 0.0)
+		return;
+
+	assert(_viewport);
+	const int w = _viewport->width();
+	if (w <= 0)
+		return;
+
+	set_zoom(1.0 / samplerate, w / 2);
 }
 
 void View::set_scale_offset(double scale, double offset)
@@ -168,7 +238,7 @@ vector< shared_ptr<Trace> > View::get_traces() const
 {
 	const vector< shared_ptr<Signal> > sigs(
 		session().get_signals());
-	const vector< shared_ptr<DecodeSignal> > decode_sigs(
+	const vector< shared_ptr<DecodeTrace> > decode_sigs(
 		session().get_decode_signals());
 	vector< shared_ptr<Trace> > traces(
 		sigs.size() + decode_sigs.size());
@@ -177,7 +247,7 @@ vector< shared_ptr<Trace> > View::get_traces() const
 	i = copy(sigs.begin(), sigs.end(), i);
 	i = copy(decode_sigs.begin(), decode_sigs.end(), i);
 
-	sort(traces.begin(), traces.end(), compare_trace_v_offsets);
+	stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
 	return traces;
 }
 
@@ -266,10 +336,18 @@ void View::get_scroll_layout(double &length, double &offset) const
 	if (!sig_data)
 		return;
 
-	length = _data_length / (sig_data->get_samplerate() * _scale);
+	length = _data_length / (sig_data->samplerate() * _scale);
 	offset = _offset / _scale;
 }
 
+void View::set_zoom(double scale, int offset)
+{
+	const double cursor_offset = _offset + _scale * offset;
+	const double new_scale = max(min(scale, MaxScale), MinScale);
+	const double new_offset = cursor_offset - new_scale * offset;
+	set_scale_offset(new_scale, new_offset);
+}
+
 void View::update_scroll()
 {
 	assert(_viewport);