Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 9ca973a7ea9ca3b4227cde8973f2add6f284348a..dc545babf4d0147f87d6519498c6ea314339dfe1 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -29,13 +29,11 @@
 #include <cmath>
 #include <iostream>
 #include <iterator>
-#include <mutex>
 #include <unordered_set>
 
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/serialization/serialization.hpp>
-#include <boost/thread/locks.hpp>
 
 #include <QApplication>
 #include <QHBoxLayout>
@@ -67,9 +65,6 @@
 #include "decodetrace.hpp"
 #endif
 
-using boost::shared_lock;
-using boost::shared_mutex;
-
 using pv::data::SignalData;
 using pv::data::Segment;
 using pv::util::TimeUnit;
@@ -77,11 +72,9 @@ using pv::util::Timestamp;
 
 using std::back_inserter;
 using std::copy_if;
-using std::deque;
+using std::count_if;
 using std::dynamic_pointer_cast;
 using std::inserter;
-using std::list;
-using std::lock_guard;
 using std::max;
 using std::make_pair;
 using std::make_shared;
@@ -90,10 +83,10 @@ using std::pair;
 using std::set;
 using std::set_difference;
 using std::shared_ptr;
+using std::stringstream;
 using std::unordered_map;
 using std::unordered_set;
 using std::vector;
-using std::weak_ptr;
 
 namespace pv {
 namespace views {
@@ -224,7 +217,7 @@ const Session& View::session() const
        return session_;
 }
 
-std::unordered_set< std::shared_ptr<Signal> > View::signals() const
+unordered_set< shared_ptr<Signal> > View::signals() const
 {
        return signals_;
 }
@@ -289,7 +282,7 @@ void View::save_settings(QSettings &settings) const
        settings.setValue("v_offset",
                scrollarea_.verticalScrollBar()->sliderPosition());
 
-       std::stringstream ss;
+       stringstream ss;
        boost::archive::text_oarchive oa(ss);
        oa << boost::serialization::make_nvp("offset", offset_);
        settings.setValue("offset", QString::fromStdString(ss.str()));
@@ -311,7 +304,7 @@ void View::restore_settings(QSettings &settings)
 
        if (settings.contains("offset")) {
                util::Timestamp offset;
-               std::stringstream ss;
+               stringstream ss;
                ss << settings.value("offset").toString().toStdString();
 
                boost::archive::text_iarchive ia(ss);
@@ -450,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)
@@ -539,8 +532,7 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
        boost::optional<Timestamp> left_time, right_time;
        const set< shared_ptr<SignalData> > visible_data = get_visible_data();
        for (const shared_ptr<SignalData> d : visible_data) {
-               const vector< shared_ptr<Segment> > segments =
-                       d->segments();
+               const vector< shared_ptr<Segment> > segments = d->segments();
                for (const shared_ptr<Segment> &s : segments) {
                        double samplerate = s->samplerate();
                        samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
@@ -562,14 +554,11 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
        return make_pair(*left_time, *right_time);
 }
 
-void View::enable_sticky_scrolling(bool state)
+void View::enable_show_sampling_points(bool state)
 {
-       sticky_scrolling_ = state;
-}
+       (void)state;
 
-void View::toggle_sticky_scrolling(void)
-{
-       sticky_scrolling_ = !sticky_scrolling_;
+       viewport_->update();
 }
 
 void View::enable_coloured_bg(bool state)
@@ -620,15 +609,15 @@ void View::centre_cursors()
        viewport_->update();
 }
 
-std::shared_ptr<CursorPair> View::cursors() const
+shared_ptr<CursorPair> View::cursors() const
 {
        return cursors_;
 }
 
 void View::add_flag(const Timestamp& time)
 {
-       flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
-               QString("%1").arg(next_flag_text_))));
+       flags_.push_back(make_shared<Flag>(*this, time,
+               QString("%1").arg(next_flag_text_)));
 
        next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
                (next_flag_text_ + 1);
@@ -636,15 +625,15 @@ void View::add_flag(const Timestamp& time)
        time_item_appearance_changed(true, true);
 }
 
-void View::remove_flag(std::shared_ptr<Flag> flag)
+void View::remove_flag(shared_ptr<Flag> flag)
 {
        flags_.remove(flag);
        time_item_appearance_changed(true, true);
 }
 
-vector< std::shared_ptr<Flag> > View::flags() const
+vector< shared_ptr<Flag> > View::flags() const
 {
-       vector< std::shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
+       vector< shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
        stable_sort(flags.begin(), flags.end(),
                [](const shared_ptr<Flag> &a, const shared_ptr<Flag> &b) {
                        return a->time() < b->time();
@@ -676,7 +665,7 @@ void View::restack_all_trace_tree_items()
                o->restack_items();
 
        // Re-assign background colors
-       bool next_bgcolour_state = 0;
+       bool next_bgcolour_state = false;
 
        for (auto &o : sorted_owners)
                next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
@@ -688,8 +677,7 @@ void View::restack_all_trace_tree_items()
 
 void View::trigger_event(util::Timestamp location)
 {
-       trigger_markers_.push_back(shared_ptr<TriggerMarker>(
-               new TriggerMarker(*this, location)));
+       trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -759,7 +747,7 @@ void View::calculate_tick_spacing()
 
                // Precision is the number of fractional digits required, not
                // taking the prefix into account (and it must never be negative)
-               tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
+               tick_precision = max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
 
                tick_period_width = (tick_period / scale_).convert_to<double>();
 
@@ -891,7 +879,7 @@ TraceTreeItemOwner* View::find_prevalent_trace_group(
        size_t max_prevalence = 0;
        TraceTreeItemOwner *prevalent_owner = nullptr;
        for (TraceTreeItemOwner *owner : owners) {
-               const size_t prevalence = std::count_if(
+               const size_t prevalence = count_if(
                        owner_list.begin(), owner_list.end(),
                        [&](TraceTreeItemOwner *o) { return o == owner; });
                if (prevalence > max_prevalence) {
@@ -1233,13 +1221,18 @@ void View::capture_state_updated(int state)
 
                trigger_markers_.clear();
 
-               // Activate "always zoom to fit" if the setting is enabled
+               // Activate "always zoom to fit" if the setting is enabled and we're
+               // the main view of this session (other trace views may be used for
+               // zooming and we don't want to mess them up)
                GlobalSettings settings;
                bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
-               if (state) {
+               if (is_main_view_ && state) {
                        always_zoom_to_fit_ = true;
                        always_zoom_to_fit_changed(always_zoom_to_fit_);
                }
+
+               // Enable sticky scrolling if the setting is enabled
+               sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
        }
 
        if (state == Session::Stopped) {
@@ -1249,6 +1242,8 @@ void View::capture_state_updated(int state)
 
                // Reset "always zoom to fit", the acquisition has stopped
                if (always_zoom_to_fit_) {
+                       // Perform a final zoom-to-fit before disabling
+                       zoom_fit(always_zoom_to_fit_);
                        always_zoom_to_fit_ = false;
                        always_zoom_to_fit_changed(always_zoom_to_fit_);
                }
@@ -1270,10 +1265,9 @@ void View::data_updated()
 
 void View::perform_delayed_view_update()
 {
-       if (always_zoom_to_fit_)
+       if (always_zoom_to_fit_) {
                zoom_fit(true);
-
-       if (sticky_scrolling_) {
+       } else if (sticky_scrolling_) {
                // Make right side of the view sticky
                double length = 0;
                Timestamp offset;