X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=ab458f26bf36e981d49a1992826dbddb41e3d6e1;hp=d47b4fd15315d61fe33d46ab9d11087954702114;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c diff --git a/pv/view/view.cpp b/pv/view/view.cpp index d47b4fd1..ab458f26 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -29,18 +29,16 @@ #include #include #include -#include #include #include #include #include -#include #include -#include #include #include +#include #include #include @@ -56,20 +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 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 > View::signals() const +unordered_set< shared_ptr > 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 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; @@ -562,38 +554,31 @@ pair 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; + + viewport_->update(); } -void View::enable_coloured_bg(bool state) +void View::enable_show_analog_minor_grid(bool state) { - const vector> items( - list_by_type()); + (void)state; - for (shared_ptr i : items) { - // Can't cast to Trace because it's abstract, so we need to - // check for any derived classes individually - - shared_ptr a = dynamic_pointer_cast(i); - if (a) - a->set_coloured_bg(state); - - shared_ptr l = dynamic_pointer_cast(i); - if (l) - l->set_coloured_bg(state); - -#ifdef ENABLE_DECODE - shared_ptr d = dynamic_pointer_cast(i); - if (d) - d->set_coloured_bg(state); -#endif - } + viewport_->update(); +} +void View::enable_coloured_bg(bool state) +{ + coloured_bg_ = state; viewport_->update(); } +bool View::coloured_bg() const +{ + return coloured_bg_; +} + bool View::cursors_shown() const { return show_cursors_; @@ -615,7 +600,7 @@ void View::centre_cursors() viewport_->update(); } -std::shared_ptr View::cursors() const +shared_ptr View::cursors() const { return cursors_; } @@ -631,15 +616,15 @@ void View::add_flag(const Timestamp& time) time_item_appearance_changed(true, true); } -void View::remove_flag(std::shared_ptr flag) +void View::remove_flag(shared_ptr flag) { flags_.remove(flag); time_item_appearance_changed(true, true); } -vector< std::shared_ptr > View::flags() const +vector< shared_ptr > View::flags() const { - vector< std::shared_ptr > flags(flags_.begin(), flags_.end()); + vector< shared_ptr > flags(flags_.begin(), flags_.end()); stable_sort(flags.begin(), flags.end(), [](const shared_ptr &a, const shared_ptr &b) { return a->time() < b->time(); @@ -753,7 +738,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(), 0); + tick_precision = max(ceil(log10(1 / tick_period)).convert_to(), 0); tick_period_width = (tick_period / scale_).convert_to(); @@ -885,7 +870,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) { @@ -1236,6 +1221,9 @@ void View::capture_state_updated(int 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) {