- 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(_scale * pow(3.0/2.0, -steps), offset);
+}
+
+void View::zoom_fit()
+{
+ const pair<double, double> extents = get_time_extents();
+ const double delta = extents.second - extents.first;
+ if (delta < 1e-12)
+ return;
+
+ assert(_viewport);
+ const int w = _viewport->width();
+ if (w <= 0)
+ return;
+
+ const double scale = max(min(delta / w, MaxScale), MinScale);
+ set_scale_offset(scale, extents.first);
+}
+
+void View::zoom_one_to_one()
+{
+ using pv::data::SignalData;
+
+ // Make a set of all the visible data objects
+ set< shared_ptr<SignalData> > visible_data = get_visible_data();
+ if (visible_data.empty())
+ return;
+
+ double samplerate = 0.0;
+ for (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);