X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=96b17fdaf25a9a791bf675e97c387b985d849b69;hp=d559b0af5f6bcde346d3cef0b84f31fd80278505;hb=2795de2e7fdaeb6e9f672e0dc73dea328f35e585;hpb=5a20644617a727e5893cd1df3f105135c1ebdedd diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index d559b0af..96b17fda 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -246,7 +246,7 @@ void View::reset_view_state() suppress_zoom_to_fit_after_acq_ = false; show_cursors_ = false; - cursors_.reset(); + cursor_state_changed(show_cursors_); flags_.clear(); // Update the zoom state @@ -619,8 +619,6 @@ Trace::SegmentDisplayMode View::segment_display_mode() const void View::set_segment_display_mode(Trace::SegmentDisplayMode mode) { - trigger_markers_.clear(); - segment_display_mode_ = mode; for (shared_ptr signal : signals_) @@ -700,23 +698,6 @@ void View::zoom_fit(bool gui_state) set_scale_offset(scale.convert_to(), extents.first); } -void View::zoom_one_to_one() -{ - using pv::data::SignalData; - - // Make a set of all the visible data objects - set< shared_ptr > visible_data = get_visible_data(); - if (visible_data.empty()) - return; - - assert(viewport_); - const int w = viewport_->width(); - if (w <= 0) - return; - - set_zoom(1.0 / session_.get_samplerate(), w / 2); -} - void View::set_scale_offset(double scale, const Timestamp& offset) { // Disable sticky scrolling / always zoom to fit when acquisition runs @@ -816,6 +797,7 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { show_cursors_ = show; + cursor_state_changed(show); ruler_->update(); viewport_->update(); }