X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=96b17fdaf25a9a791bf675e97c387b985d849b69;hp=8922922aa1c1e939f747b15327545acc84c6379e;hb=6b197c700a2065941671c5ef557dc80ba3c978ac;hpb=e4cc0ee6270eb4d388a169438f58aa481f705261 diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index 8922922a..96b17fda 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -124,31 +124,11 @@ bool CustomScrollArea::viewportEvent(QEvent *event) View::View(Session &session, bool is_main_view, QWidget *parent) : ViewBase(session, is_main_view, parent), + + // Note: Place defaults in View::reset_view_state(), not here splitter_(new QSplitter()), - segment_display_mode_(Trace::ShowLastSegmentOnly), - segment_selectable_(false), - scale_(1e-3), - offset_(0), - ruler_offset_(0), - updating_scroll_(false), - settings_restored_(false), - header_was_shrunk_(false), - sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui() - always_zoom_to_fit_(false), - tick_period_(0), - tick_prefix_(pv::util::SIPrefix::yocto), - tick_precision_(0), - time_unit_(util::TimeUnit::Time), - show_cursors_(false), - cursors_(new CursorPair(*this)), - next_flag_text_('A'), - trigger_markers_(), - hover_point_(-1, -1), - scroll_needs_defaults_(true), - saved_v_offset_(0), - scale_at_acq_start_(0), - offset_at_acq_start_(0), - suppress_zoom_to_fit_after_acq_(false) + header_was_shrunk_(false), // The splitter remains unchanged after a reset, so this goes here + sticky_scrolling_(false) // Default setting is set in MainWindow::setup_ui() { QVBoxLayout *root_layout = new QVBoxLayout(this); root_layout->setContentsMargins(0, 0, 0, 0); @@ -196,7 +176,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : // Set up settings and event handlers GlobalSettings settings; - coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); + colored_bg_ = settings.value(GlobalSettings::Key_View_ColoredBG).toBool(); GlobalSettings::add_change_handler(this); @@ -230,11 +210,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : ruler_->raise(); header_->raise(); - // Update the zoom state - calculate_tick_spacing(); - - // Make sure the standard bar's segment selector is in sync - set_segment_display_mode(segment_display_mode_); + reset_view_state(); } View::~View() @@ -242,6 +218,44 @@ View::~View() GlobalSettings::remove_change_handler(this); } +void View::reset_view_state() +{ + ViewBase::reset_view_state(); + + segment_display_mode_ = Trace::ShowLastSegmentOnly; + segment_selectable_ = false; + scale_ = 1e-3; + offset_ = 0; + ruler_offset_ = 0; + updating_scroll_ = false; + settings_restored_ = false; + always_zoom_to_fit_ = false; + tick_period_ = 0; + tick_prefix_ = pv::util::SIPrefix::yocto; + tick_precision_ = 0; + time_unit_ = util::TimeUnit::Time; + show_cursors_ = false; + cursors_ = make_shared(*this); + next_flag_text_ = 'A'; + trigger_markers_.clear(); + hover_point_ = QPoint(-1, -1); + scroll_needs_defaults_ = true; + saved_v_offset_ = 0; + scale_at_acq_start_ = 0; + offset_at_acq_start_ = 0; + suppress_zoom_to_fit_after_acq_ = false; + + show_cursors_ = false; + cursor_state_changed(show_cursors_); + flags_.clear(); + + // Update the zoom state + calculate_tick_spacing(); + + // Make sure the standard bar's segment selector is in sync + set_segment_display_mode(segment_display_mode_); +} + Session& View::session() { return session_; @@ -367,10 +381,13 @@ void View::restore_settings(QSettings &settings) stringstream ss; ss << settings.value("ruler_shift").toString().toStdString(); - boost::archive::text_iarchive ia(ss); - ia >> boost::serialization::make_nvp("ruler_shift", shift); - - ruler_shift_ = shift; + try { + boost::archive::text_iarchive ia(ss); + ia >> boost::serialization::make_nvp("ruler_shift", shift); + ruler_shift_ = shift; + } catch (boost::archive::archive_exception) { + qDebug() << "Could not restore the view ruler shift"; + } } if (settings.contains("offset")) { @@ -378,11 +395,14 @@ void View::restore_settings(QSettings &settings) stringstream ss; ss << settings.value("offset").toString().toStdString(); - boost::archive::text_iarchive ia(ss); - ia >> boost::serialization::make_nvp("offset", offset); - - // This also updates ruler_offset_ - set_offset(offset); + try { + boost::archive::text_iarchive ia(ss); + ia >> boost::serialization::make_nvp("offset", offset); + // This also updates ruler_offset_ + set_offset(offset); + } catch (boost::archive::archive_exception) { + qDebug() << "Could not restore the view offset"; + } } if (settings.contains("splitter_state")) @@ -416,9 +436,12 @@ vector< shared_ptr > View::time_items() const { const vector> f(flags()); vector> items(f.begin(), f.end()); - items.push_back(cursors_); - items.push_back(cursors_->first()); - items.push_back(cursors_->second()); + + if (cursors_) { + items.push_back(cursors_); + items.push_back(cursors_->first()); + items.push_back(cursors_->second()); + } for (auto trigger_marker : trigger_markers_) items.push_back(trigger_marker); @@ -596,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_) @@ -677,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 @@ -774,15 +778,15 @@ void View::enable_show_analog_minor_grid(bool state) viewport_->update(); } -void View::enable_coloured_bg(bool state) +void View::enable_colored_bg(bool state) { - coloured_bg_ = state; + colored_bg_ = state; viewport_->update(); } -bool View::coloured_bg() const +bool View::colored_bg() const { - return coloured_bg_; + return colored_bg_; } bool View::cursors_shown() const @@ -793,17 +797,21 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { show_cursors_ = show; + cursor_state_changed(show); ruler_->update(); viewport_->update(); } void View::centre_cursors() { - const double time_width = scale_ * viewport_->width(); - cursors_->first()->set_time(offset_ + time_width * 0.4); - cursors_->second()->set_time(offset_ + time_width * 0.6); - ruler_->update(); - viewport_->update(); + if (cursors_) { + const double time_width = scale_ * viewport_->width(); + cursors_->first()->set_time(offset_ + time_width * 0.4); + cursors_->second()->set_time(offset_ + time_width * 0.6); + + ruler_->update(); + viewport_->update(); + } } shared_ptr View::cursors() const