Added zoom one-to-one

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index abf522c0dfbc39d11d43988cb08bdab0d46d4812..f727cc33b540b4fddc18b77f154a08051d3a78d4 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -148,11 +148,9 @@ 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()
@@ -177,7 +175,7 @@ void View::zoom_fit()
                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->get_samplerate());
+                       d->get_max_sample_count() / d->samplerate());
        }
 
        assert(left_time < right_time);
@@ -192,6 +190,39 @@ void View::zoom_fit()
        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)
 {
        _scale = scale;
@@ -216,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;
 }
 
@@ -305,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);