X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=0e3fa98fffc4b91b8f94af291c179ed20314724c;hp=9e2aeaa87af8c4319447e564009cd4332915aca8;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hpb=83b1c8d251386ac1980284c4668cbdd8e425550f diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 9e2aeaa..0e3fa98 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -36,9 +36,9 @@ #include #include -#include #include #include +#include #include #include @@ -54,18 +54,17 @@ #include "view.hpp" #include "viewport.hpp" -#include "pv/session.hpp" -#include "pv/globalsettings.hpp" -#include "pv/devices/device.hpp" #include "pv/data/logic.hpp" #include "pv/data/logicsegment.hpp" +#include "pv/devices/device.hpp" +#include "pv/globalsettings.hpp" +#include "pv/session.hpp" #include "pv/util.hpp" #ifdef ENABLE_DECODE #include "decodetrace.hpp" #endif - using pv::data::SignalData; using pv::data::Segment; using pv::util::TimeUnit; @@ -444,7 +443,7 @@ void View::zoom(double steps) void View::zoom(double steps, int offset) { - set_zoom(scale_ * pow(3.0/2.0, -steps), offset); + set_zoom(scale_ * pow(3.0 / 2.0, -steps), offset); } void View::zoom_fit(bool gui_state) @@ -533,8 +532,7 @@ pair View::get_time_extents() const boost::optional left_time, right_time; const set< shared_ptr > visible_data = get_visible_data(); for (const shared_ptr d : visible_data) { - const vector< shared_ptr > segments = - d->segments(); + const vector< shared_ptr > segments = d->segments(); for (const shared_ptr &s : segments) { double samplerate = s->samplerate(); samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;